len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-12-10 21:55:10 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Ingenic Jz4740 PCM driver: add some locking here and there (doesn't fix all PCM issues)

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21622 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Maurus Cuelenaere 2009-07-03 11:50:58 +00:00
parent 6dbf4cf827
commit 7f2ddc4923
1 changed files with 64 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -32,8 +32,6 @@
** Playback DMA transfer ** Playback DMA transfer
**/ **/
static bool playback_started = false;
static void* playback_address;
void pcm_postinit(void) void pcm_postinit(void)
{ {
audiohw_postinit(); audiohw_postinit();
@ -64,21 +62,12 @@ void pcm_dma_apply_settings(void)
audiohw_set_frequency(pcm_sampr); audiohw_set_frequency(pcm_sampr);
} }
static void play_start_pcm(void) static void* playback_address;
{
__aic_enable_transmit_dma();
__aic_enable_replay();
REG_DMAC_DCCSR(DMA_AIC_TX_CHANNEL) |= DMAC_DCCSR_EN;
playback_started = true;
}
static inline void set_dma(const void *addr, size_t size) 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); 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(); __dcache_writeback_all();
REG_DMAC_DCCSR(DMA_AIC_TX_CHANNEL) = DMAC_DCCSR_NDES; REG_DMAC_DCCSR(DMA_AIC_TX_CHANNEL) = DMAC_DCCSR_NDES;
REG_DMAC_DSAR(DMA_AIC_TX_CHANNEL) = PHYSADDR((unsigned long)addr); 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_DTAR(DMA_AIC_TX_CHANNEL) = PHYSADDR((unsigned long)AIC_DR);
@ -90,27 +79,6 @@ static inline void set_dma(const void *addr, size_t size)
playback_address = (void*)addr; 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();
__aic_disable_transmit_dma();
__aic_disable_replay();
playback_started = false;
}
void pcm_play_dma_start(const void *addr, size_t size)
{
dma_enable();
set_dma(addr, size);
play_start_pcm();
}
static inline void play_dma_callback(void) static inline void play_dma_callback(void)
{ {
unsigned char *start; unsigned char *start;
@ -130,6 +98,7 @@ static inline void play_dma_callback(void)
} }
} }
void DMA_CALLBACK(DMA_AIC_TX_CHANNEL)(void) __attribute__ ((section(".icode")));
void DMA_CALLBACK(DMA_AIC_TX_CHANNEL)(void) void DMA_CALLBACK(DMA_AIC_TX_CHANNEL)(void)
{ {
if (REG_DMAC_DCCSR(DMA_AIC_TX_CHANNEL) & DMAC_DCCSR_AR) if (REG_DMAC_DCCSR(DMA_AIC_TX_CHANNEL) & DMAC_DCCSR_AR)
@ -151,52 +120,90 @@ void DMA_CALLBACK(DMA_AIC_TX_CHANNEL)(void)
} }
} }
size_t pcm_get_bytes_waiting(void) void pcm_play_dma_start(const void *addr, size_t size)
{ {
if(playback_started) dma_enable();
return (REG_DMAC_DTCR(DMA_AIC_TX_CHANNEL) * 16) & ~3;
else
return 0;
}
const void * pcm_play_dma_get_peak_buffer(int *count) set_dma(addr, size);
{
/* TODO */ __aic_enable_transmit_dma();
if(playback_started) __aic_enable_replay();
{
*count = REG_DMAC_DTCR(DMA_AIC_TX_CHANNEL) >> 2; REG_DMAC_DCCSR(DMA_AIC_TX_CHANNEL) |= DMAC_DCCSR_EN;
return (void*)(playback_address + ((REG_DMAC_DTCR(DMA_AIC_TX_CHANNEL)*16 + 2) & ~3));
}
else
{
*count = 0;
return NULL;
}
} }
void pcm_play_dma_stop(void) void pcm_play_dma_stop(void)
{ {
play_stop_pcm(); int flags = disable_irq_save();
/* TODO */ REG_DMAC_DCCSR(DMA_AIC_TX_CHANNEL) = (REG_DMAC_DCCSR(DMA_AIC_TX_CHANNEL) | DMAC_DCCSR_HLT) & ~DMAC_DCCSR_EN;
dma_disable();
__aic_disable_transmit_dma();
__aic_disable_replay();
restore_irq(flags);
} }
static unsigned int play_lock = 0;
void pcm_play_lock(void) void pcm_play_lock(void)
{ {
/* TODO */ int flags = disable_irq_save();
if (++play_lock == 1)
__dmac_channel_disable_irq(DMA_AIC_TX_CHANNEL);
restore_irq(flags);
} }
void pcm_play_unlock(void) void pcm_play_unlock(void)
{ {
/* TODO */ int flags = disable_irq_save();
if (--play_lock == 0)
__dmac_channel_enable_irq(DMA_AIC_TX_CHANNEL);
restore_irq(flags);
} }
void pcm_play_dma_pause(bool pause) void pcm_play_dma_pause(bool pause)
{ {
int flags = disable_irq_save();
if(pause) if(pause)
REG_DMAC_DCCSR(DMA_AIC_TX_CHANNEL) &= ~DMAC_DCCSR_EN; REG_DMAC_DCCSR(DMA_AIC_TX_CHANNEL) &= ~DMAC_DCCSR_EN;
else else
REG_DMAC_DCCSR(DMA_AIC_TX_CHANNEL) |= DMAC_DCCSR_EN; REG_DMAC_DCCSR(DMA_AIC_TX_CHANNEL) |= DMAC_DCCSR_EN;
restore_irq(flags);
}
size_t pcm_get_bytes_waiting(void)
{
return REG_DMAC_DCCSR(DMA_AIC_TX_CHANNEL) & DMAC_DCCSR_EN ?
(REG_DMAC_DTCR(DMA_AIC_TX_CHANNEL) * 16) & ~3 : 0;
}
const void * pcm_play_dma_get_peak_buffer(int *count)
{
int flags = disable_irq_save();
const void* addr;
if(REG_DMAC_DCCSR(DMA_AIC_TX_CHANNEL) & DMAC_DCCSR_EN)
{
*count = REG_DMAC_DTCR(DMA_AIC_TX_CHANNEL)*16 >> 2;
addr = (const void*)(playback_address + ((REG_DMAC_DTCR(DMA_AIC_TX_CHANNEL)*16 + 2) & ~3));
}
else
{
*count = 0;
addr = NULL;
}
restore_irq(flags);
return addr;
} }
void audiohw_close(void) void audiohw_close(void)