devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Fix audio on Onda VX747

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21097 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Maurus Cuelenaere 2009-05-26 22:57:49 +00:00
parent 83eb479732
commit a0458dac2b
7 changed files with 119 additions and 117 deletions
Download patch file Download diff file Expand all files Collapse all files

6
firmware/export/config-ondavx747.h
View file

@ -122,6 +122,9 @@
/* Define this if you have the Jz4740 internal codec */
#define HAVE_JZ4740_CODEC
/* has no tone controls, so we use the software ones */
#define HAVE_SW_TONE_CONTROLS
/* define the bitmask of hardware sample rates */
#define HW_SAMPR_CAPS (SAMPR_CAP_48 | SAMPR_CAP_44 | SAMPR_CAP_32 | \
SAMPR_CAP_24 | SAMPR_CAP_22 | SAMPR_CAP_16 | \
@ -131,9 +134,6 @@
#define NEED_ADC_CLOSE 1
/* has no tone controls, so we use the software ones */
//#define HAVE_SW_TONE_CONTROLS
#define BATTERY_CAPACITY_DEFAULT 1250 /* default battery capacity */
#define BATTERY_CAPACITY_MIN 500 /* min. capacity selectable */
#define BATTERY_CAPACITY_MAX 2500 /* max. capacity selectable */

4
firmware/export/jz4740-codec.h
View file

@ -21,11 +21,7 @@
#ifndef __JZ4740_CODEC_H_
#define __JZ4740_CODEC_H_
/* TODO */
#define VOLUME_MIN -730
#define VOLUME_MAX 60
int tenthdb2master(int db);
void audiohw_set_headphone_vol(int vol_l, int vol_r);
#endif /* __JZ4740_CODEC_H_ */

2
firmware/export/jz4740.h
View file

@ -1310,8 +1310,6 @@
#define ICDC_CDCCR2_MICBG(n) ((n & 0x3) << 4)
#define ICDC_CDCCR2_HPVOL(n) ((n & 0x3) << 0)
#define ICDC_CDCCR2_AINVOL_DB(n) ((n+34.5)/1.5)
#define ICDC_CDCCR2_SMPR_8 (0)
#define ICDC_CDCCR2_SMPR_11 (1)
#define ICDC_CDCCR2_SMPR_12 (2)

2
firmware/sound.c
View file

@ -264,6 +264,8 @@ static void set_prescaled_volume(void)
#elif defined(HAVE_TLV320) || defined(HAVE_WM8978) || defined(HAVE_WM8985)
audiohw_set_headphone_vol(tenthdb2master(l), tenthdb2master(r));
#elif defined(HAVE_JZ4740_CODEC)
audiohw_set_volume(current_volume);
#endif
}
#endif /* (CONFIG_CODEC == MAS3507D) || defined HAVE_UDA1380 */

73
firmware/target/mips/ingenic_jz47xx/codec-jz4740.c
View file

@ -26,7 +26,7 @@
/* TODO */
const struct sound_settings_info audiohw_settings[] = {
[SOUND_VOLUME] = {"dB", 0, 1, -73, 6, -20},
[SOUND_VOLUME] = {"dB", 0, 2, 0, 6, 0},
/* HAVE_SW_TONE_CONTROLS */
[SOUND_BASS] = {"dB", 0, 1, -24, 24, 0},
[SOUND_TREBLE] = {"dB", 0, 1, -24, 24, 0},
@ -76,12 +76,11 @@ static void i2s_codec_init(void)
i2s_codec_reset();
//REG_ICDC_CDCCR2 = (ICDC_CDCCR2_AINVOL(ICDC_CDCCR2_AINVOL_DB(0)) | ICDC_CDCCR2_SMPR(ICDC_CDCCR2_SMPR_48)
REG_ICDC_CDCCR1 &= ~(ICDC_CDCCR1_SUSPD | ICDC_CDCCR1_RST);
REG_ICDC_CDCCR2 = ( ICDC_CDCCR2_AINVOL(14) | ICDC_CDCCR2_SMPR(ICDC_CDCCR2_SMPR_44)
| ICDC_CDCCR2_HPVOL(ICDC_CDCCR2_HPVOL_0));
REG_ICDC_CDCCR1 &= ~(ICDC_CDCCR1_SUSPD | ICDC_CDCCR1_RST);
mdelay(15);
REG_ICDC_CDCCR1 &= ~(ICDC_CDCCR1_PDVR | ICDC_CDCCR1_VRCGL | ICDC_CDCCR1_VRCGH);
REG_ICDC_CDCCR1 |= (ICDC_CDCCR1_EDAC | ICDC_CDCCR1_HPCG);
@ -111,7 +110,7 @@ static void i2s_codec_set_mic(unsigned short v) /* 0 <= v <= 100 */
REG_ICDC_CDCCR2 = ((REG_ICDC_CDCCR2 & ~(0x1f << 16)) | (codec_mic_gain << 16));
}
static void i2s_codec_set_bass(unsigned short v) /* 0 <= v <= 100 */
static void i2s_codec_set_base(unsigned short v) /* 0 <= v <= 100 */
{
v &= 0xff;
@ -200,6 +199,7 @@ static unsigned short i2s_codec_get_volume(void)
return val;
}
static unsigned long HP_register_value;
static void HP_turn_on(void)
{
//see 1.3.4.1
@ -261,11 +261,41 @@ static void HP_turn_off(void)
}
#endif
static void i2s_codec_set_samplerate(unsigned int rate)
void audiohw_mute(bool mute)
{
if(mute)
REG_ICDC_CDCCR1 |= ICDC_CDCCR1_HPMUTE;
else
REG_ICDC_CDCCR1 &= ~ICDC_CDCCR1_HPMUTE;
}
void audiohw_preinit(void)
{
}
void audiohw_postinit(void)
{
audiohw_mute(false);
//HP_turn_on();
}
void audiohw_init(void)
{
i2s_codec_init();
}
void audiohw_set_volume(int v)
{
/* 0 <= v <= 60 */
unsigned int codec_volume = v / 20;
REG_ICDC_CDCCR2 = (REG_ICDC_CDCCR2 & ~ICDC_CDCCR2_HPVOL(0x3)) | ICDC_CDCCR2_HPVOL(codec_volume);
}
void audiohw_set_frequency(int freq)
{
unsigned int speed;
switch (rate)
switch(freq)
{
case 8000:
speed = ICDC_CDCCR2_SMPR(ICDC_CDCCR2_SMPR_8);
@ -297,33 +327,6 @@ static void i2s_codec_set_samplerate(unsigned int rate)
default:
return;
}
REG_ICDC_CDCCR2 &= ~ICDC_CDCCR2_SMPR(0xF);
REG_ICDC_CDCCR2 |= speed;
}
void audiohw_mute(bool mute)
{
if(mute)
REG_ICDC_CDCCR1 |= ICDC_CDCCR1_HPMUTE;
else
REG_ICDC_CDCCR1 &= ~ICDC_CDCCR1_HPMUTE;
}
void audiohw_preinit(void)
{
}
void audiohw_postinit(void)
{
audiohw_mute(false);
}
void audiohw_init(void)
{
i2s_codec_init();
}
void audiohw_set_frequency(int freq)
{
i2s_codec_set_samplerate(freq);
REG_ICDC_CDCCR2 = (REG_ICDC_CDCCR2 & ~ICDC_CDCCR2_SMPR(0xF)) | speed;
}

109
firmware/target/mips/ingenic_jz47xx/pcm-jz4740.c
View file

@ -41,8 +41,11 @@ void pcm_postinit(void)
/* playback sample: 16 bits burst: 16 bytes */
__i2s_set_iss_sample_size(16);
__i2s_set_oss_sample_size(16);
__i2s_set_transmit_trigger(16 - 4);
__i2s_set_receive_trigger(4);
__i2s_set_transmit_trigger(10);
__i2s_set_receive_trigger(1);
/* Flush FIFO */
__aic_flush_fifo();
}
void pcm_play_dma_init(void)
@ -63,29 +66,38 @@ void pcm_dma_apply_settings(void)
static void play_start_pcm(void)
{
/* Prefill FIFO */
REG_AIC_DR = 0;
REG_AIC_DR = 0;
REG_AIC_DR = 0;
REG_AIC_DR = 0;
__i2s_enable_transmit_dma();
__i2s_enable_replay();
__aic_enable_transmit_dma();
__aic_enable_replay();
REG_DMAC_DCCSR(DMA_AIC_TX_CHANNEL) |= DMAC_DCCSR_EN;
REG_DMAC_DCMD(DMA_AIC_TX_CHANNEL) |= DMAC_DCMD_TIE;
playback_started = true;
}
static inline void set_dma(const void *addr, size_t size)
{
logf("%x %x %d %d %x", (unsigned int)addr, size, (REG_AIC_SR>>24) & 0x20, (REG_AIC_SR>>8) & 0x20, REG_AIC_SR & 0xF);
//__dcache_writeback_all();
REG_DMAC_DCCSR(DMA_AIC_TX_CHANNEL) = DMAC_DCCSR_NDES;
REG_DMAC_DSAR(DMA_AIC_TX_CHANNEL) = PHYSADDR((unsigned long)addr);
REG_DMAC_DTAR(DMA_AIC_TX_CHANNEL) = PHYSADDR((unsigned long)AIC_DR);
REG_DMAC_DTCR(DMA_AIC_TX_CHANNEL) = size / 16;
REG_DMAC_DRSR(DMA_AIC_TX_CHANNEL) = DMAC_DRSR_RS_AICOUT;
REG_DMAC_DCMD(DMA_AIC_TX_CHANNEL) = (DMAC_DCMD_SAI | DMAC_DCMD_SWDH_32 | DMAC_DCMD_DS_16BYTE | DMAC_DCMD_DWDH_16 | DMAC_DCMD_TIE |
DMAC_DCMD_RDIL_IGN);
playback_address = (void*)addr;
}
static void play_stop_pcm(void)
{
REG_DMAC_DCCSR(DMA_AIC_TX_CHANNEL) = (REG_DMAC_DCCSR(DMA_AIC_TX_CHANNEL) | DMAC_DCCSR_HLT) & ~DMAC_DCCSR_EN;
dma_disable();
__i2s_disable_transmit_dma();
__i2s_disable_replay();
__aic_disable_transmit_dma();
__aic_disable_replay();
playback_started = false;
}
@ -94,56 +106,47 @@ void pcm_play_dma_start(const void *addr, size_t size)
{
dma_enable();
__dcache_writeback_all();
REG_DMAC_DCCSR(DMA_AIC_TX_CHANNEL) = DMAC_DCCSR_NDES;
REG_DMAC_DSAR(DMA_AIC_TX_CHANNEL) = PHYSADDR((unsigned long)addr);
REG_DMAC_DTAR(DMA_AIC_TX_CHANNEL) = PHYSADDR((unsigned long)AIC_DR);
REG_DMAC_DTCR(DMA_AIC_TX_CHANNEL) = size;
REG_DMAC_DRSR(DMA_AIC_TX_CHANNEL) = DMAC_DRSR_RS_AICOUT;
REG_DMAC_DCMD(DMA_AIC_TX_CHANNEL) = (DMAC_DCMD_SAI | DMAC_DCMD_SWDH_32 | DMAC_DCMD_DS_32BIT | DMAC_DCMD_DWDH_16);
playback_address = (void*)addr;
set_dma(addr, size);
play_start_pcm();
}
static void play_dma_callback(void)
static inline void play_dma_callback(void)
{
unsigned char *start;
size_t size = 0;
pcm_callback_for_more(&start, &size);
if(size != 0)
{
__dcache_writeback_all();
REG_DMAC_DCCSR(DMA_AIC_TX_CHANNEL) = DMAC_DCCSR_NDES;
REG_DMAC_DSAR(DMA_AIC_TX_CHANNEL) = PHYSADDR((unsigned long)start);
REG_DMAC_DTAR(DMA_AIC_TX_CHANNEL) = PHYSADDR((unsigned long)AIC_DR);
REG_DMAC_DTCR(DMA_AIC_TX_CHANNEL) = size;
REG_DMAC_DRSR(DMA_AIC_TX_CHANNEL) = DMAC_DRSR_RS_AICOUT;
REG_DMAC_DCMD(DMA_AIC_TX_CHANNEL) = (DMAC_DCMD_SAI | DMAC_DCMD_SWDH_32 | DMAC_DCMD_DS_32BIT | DMAC_DCMD_DWDH_16);
REG_DMAC_DCCSR(DMA_AIC_TX_CHANNEL) |= DMAC_DCCSR_EN;
REG_DMAC_DCMD(DMA_AIC_TX_CHANNEL) |= DMAC_DCMD_TIE;
return;
}
/* Error, callback missing or no more DMA to do */
pcm_play_dma_stop();
pcm_play_dma_stopped_callback();
if(LIKELY(size > 0))
{
set_dma(start, size);
REG_DMAC_DCCSR(DMA_AIC_TX_CHANNEL) |= DMAC_DCCSR_EN;
}
else
{
/* Error, callback missing or no more DMA to do */
pcm_play_dma_stop();
pcm_play_dma_stopped_callback();
}
}
void DMA_CALLBACK(DMA_AIC_TX_CHANNEL)(void)
{
if (REG_DMAC_DCCSR(DMA_AIC_TX_CHANNEL) & DMAC_DCCSR_AR)
REG_DMAC_DCCSR(DMA_AIC_TX_CHANNEL) &= ~DMAC_DCCSR_AR;
if (REG_DMAC_DCCSR(DMA_AIC_TX_CHANNEL) & DMAC_DCCSR_CT)
REG_DMAC_DCCSR(DMA_AIC_TX_CHANNEL) &= ~DMAC_DCCSR_CT;
if (REG_DMAC_DCCSR(DMA_AIC_TX_CHANNEL) & (DMAC_DCCSR_TT | DMAC_DCCSR_HLT))
{
REG_DMAC_DCCSR(DMA_AIC_TX_CHANNEL) &= ~(DMAC_DCCSR_TT | DMAC_DCCSR_HLT);
REG_DMAC_DCCSR(DMA_AIC_TX_CHANNEL) &= ~DMAC_DCCSR_EN;
logf("PCM DMA address error");
REG_DMAC_DCCSR(DMA_AIC_TX_CHANNEL) &= ~DMAC_DCCSR_AR;
}
if (REG_DMAC_DCCSR(DMA_AIC_TX_CHANNEL) & DMAC_DCCSR_HLT)
{
logf("PCM DMA halt");
REG_DMAC_DCCSR(DMA_AIC_TX_CHANNEL) &= ~DMAC_DCCSR_HLT;
}
if (REG_DMAC_DCCSR(DMA_AIC_TX_CHANNEL) & DMAC_DCCSR_TT)
{
REG_DMAC_DCCSR(DMA_AIC_TX_CHANNEL) &= ~DMAC_DCCSR_TT;
play_dma_callback();
}
}
@ -151,7 +154,7 @@ void DMA_CALLBACK(DMA_AIC_TX_CHANNEL)(void)
size_t pcm_get_bytes_waiting(void)
{
if(playback_started)
return REG_DMAC_DTCR(DMA_AIC_TX_CHANNEL) & ~3;
return (REG_DMAC_DTCR(DMA_AIC_TX_CHANNEL) * 16) & ~3;
else
return 0;
}
@ -161,8 +164,8 @@ const void * pcm_play_dma_get_peak_buffer(int *count)
/* TODO */
if(playback_started)
{
*count = REG_DMAC_DTCR(DMA_AIC_TX_CHANNEL);
return (void*)(playback_address + ((REG_DMAC_DTCR(DMA_AIC_TX_CHANNEL) + 2) & ~3));
*count = REG_DMAC_DTCR(DMA_AIC_TX_CHANNEL) >> 2;
return (void*)(playback_address + ((REG_DMAC_DTCR(DMA_AIC_TX_CHANNEL)*16 + 2) & ~3));
}
else
{
@ -191,9 +194,9 @@ void pcm_play_unlock(void)
void pcm_play_dma_pause(bool pause)
{
if(pause)
play_stop_pcm();
REG_DMAC_DCCSR(DMA_AIC_TX_CHANNEL) &= ~DMAC_DCCSR_EN;
else
play_start_pcm();
REG_DMAC_DCCSR(DMA_AIC_TX_CHANNEL) |= DMAC_DCCSR_EN;
}
void audiohw_close(void)

4
firmware/target/mips/ingenic_jz47xx/system-target.h
View file

@ -86,10 +86,10 @@ void mdelay(unsigned int msec);
void dma_enable(void);
void dma_disable(void);
#define DMA_LCD_CHANNEL 0
#define DMA_AIC_TX_CHANNEL 0
#define DMA_NAND_CHANNEL 1
#define DMA_USB_CHANNEL 2
#define DMA_AIC_TX_CHANNEL 3
#define DMA_LCD_CHANNEL 3
#define XDMA_CALLBACK(n) DMA ## n
#define DMA_CALLBACK(n) XDMA_CALLBACK(n)