Accept patch in FS#7751 by Catalin Patulea, move ifp port specific pcm code to a new file

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14670 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Nils Wallménius 2007-09-11 15:34:54 +00:00
parent c643692201
commit cab33b64a0
3 changed files with 188 additions and 162 deletions

View file

@ -0,0 +1,161 @@
/***************************************************************************
* __________ __ ___.
* Open \______ \ ____ ____ | | _\_ |__ _______ ___
* Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
* Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
* Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
* \/ \/ \/ \/ \/
* $Id$
*
* Copyright (C) 2006 by Tomek Malesinski
*
* All files in this archive are subject to the GNU General Public License.
* See the file COPYING in the source tree root for full license agreement.
*
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
* KIND, either express or implied.
*
****************************************************************************/
#include "system.h"
#include "audio.h"
#include "string.h"
#define DMA_BUF_SAMPLES 0x100
short __attribute__((section(".dmabuf"))) dma_buf_left[DMA_BUF_SAMPLES];
short __attribute__((section(".dmabuf"))) dma_buf_right[DMA_BUF_SAMPLES];
/* From pcm_playback.c */
extern unsigned short* p;
extern size_t p_size;
static inline void fill_dma_buf(int offset)
{
short *l, *r, *lend;
l = dma_buf_left + offset;
lend = l + DMA_BUF_SAMPLES / 2;
r = dma_buf_right + offset;
if (pcm_playing && !pcm_paused)
{
do
{
int count;
unsigned short *tmp_p;
count = MIN(p_size / 4, (size_t)(lend - l));
tmp_p = p;
p_size -= count * 4;
if ((int)l & 3)
{
*l++ = *tmp_p++;
*r++ = *tmp_p++;
count--;
}
while (count >= 4)
{
asm("ldmia %0!, {r0, r1, r2, r3}\n\t"
"and r4, r0, %3\n\t"
"orr r4, r4, r1, lsl #16\n\t"
"and r5, r2, %3\n\t"
"orr r5, r5, r3, lsl #16\n\t"
"stmia %1!, {r4, r5}\n\t"
"bic r4, r1, %3\n\t"
"orr r4, r4, r0, lsr #16\n\t"
"bic r5, r3, %3\n\t"
"orr r5, r5, r2, lsr #16\n\t"
"stmia %2!, {r4, r5}"
: "+r" (tmp_p), "+r" (l), "+r" (r)
: "r" (0xffff)
: "r0", "r1", "r2", "r3", "r4", "r5", "memory");
count -= 4;
}
while (count > 0)
{
*l++ = *tmp_p++;
*r++ = *tmp_p++;
count--;
}
p = tmp_p;
if (l >= lend)
return;
else if (pcm_callback_for_more)
pcm_callback_for_more((unsigned char**)&p,
&p_size);
}
while (p_size);
pcm_playing = false;
}
if (l < lend)
{
memset(l, 0, sizeof(short) * (lend - l));
memset(r, 0, sizeof(short) * (lend - l));
}
}
static void audio_irq(void)
{
unsigned long st = DMAINTSTAT & ~DMAINTEN;
int i;
for (i = 0; i < 2; i++)
if (st & (1 << i))
{
fill_dma_buf((i == 1) ? 0 : DMA_BUF_SAMPLES / 2);
DMAINTSTAT = 1 << i;
}
}
unsigned long physical_address(void *p)
{
unsigned long adr = (unsigned long)p;
return (MMUBLOCK((adr >> 21) & 0xf) << 21) | (adr & ((1 << 21) - 1));
}
void pcm_init(void)
{
int i;
pcm_playing = false;
pcm_paused = false;
pcm_callback_for_more = NULL;
memset(dma_buf_left, 0, sizeof(dma_buf_left));
memset(dma_buf_right, 0, sizeof(dma_buf_right));
for (i = 0; i < 8; i++)
{
DMASRC(i) = 0;
DMADEST(i) = 0;
DMALEN(i) = 0x1ffff;
DMAR0C(i) = 0;
DMAR10(i) = 0;
DMAR1C(i) = 0;
}
DMAINTSTAT = 0xc000ffff;
DMAINTEN = 0xc000ffff;
DMASRC(0) = physical_address(dma_buf_left);
DMADEST(0) = 0x80200280;
DMALEN(0) = 0xff;
DMAR1C(0) = 0;
DMAR0C(0) = 0x40408;
DMASRC(1) = physical_address(dma_buf_right);
DMADEST(1) = 0x80200284;
DMALEN(1) = 0xff;
DMAR1C(1) = 0;
DMAR0C(1) = 0x40409;
irq_set_int_handler(0x1b, audio_irq);
irq_enable_int(0x1b);
DMAINTSTAT = 1;
DMAINTSTAT = 2;
DMAINTEN &= ~3;
DMAR10(0) |= 1;
DMAR10(1) |= 1;
}