1
0
Fork 0
forked from len0rd/rockbox

More M:Robe 500 work: PCM stopping and pausing roughly works, added some keymaps for the WPS screen, and peakmeter now works properly.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20511 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Karl Kurbjun 2009-03-24 16:40:31 +00:00
parent a5501d68cc
commit 2670e3f038
11 changed files with 210 additions and 117 deletions

View file

@ -52,38 +52,58 @@ unsigned short sdem_level=0;
unsigned short last_size;
/* This tells us which half of the DSP buffer (data) is free */
unsigned short dma0_unlocked;
unsigned short dma0_unlocked;
int waiting=0;
volatile unsigned short dma0_stopped=1;
short waiting=0;
/* rebuffer sets up the next SDRAM to SARAM transfer and tells the ARM when it
* is done with a buffer.
*/
/* Notes: Right now this can handle buffer sizes that are smaller even multiples
* of DSP_BUFFER_SIZE cleanly. It won't fail with buffers that are larger or
* non-multiples, but it won't sound right. The upper limit on larger buffers
* is the size of a short. If larger buffer sizes are needed the code on the
* ARM side needs to be changed to update a full long.
/* Notes: The upper limit on larger buffers is the size of a short. If larger
* buffer sizes are needed the code on the ARM side needs to be changed to
* update a full long.
*/
void rebuffer(void)
{
unsigned long sdem_addr;
if(dma0_stopped==1) /* Stop */
{
DMPREC&=0xFFFE; /* Stop MCBSP DMA0 */
audiohw_stop();
DMSFC0 = 2 << 12 | 1 << 11;
sdem_level=0;
return;
}
if(dsp_level==DSP_BUFFER_SIZE || sdem_level==sdem_dsp_size)
{
if(dma0_stopped==2) /* Pause */
{
DMPREC&=0xFFFE; /* Stop MCBSP DMA0 */
audiohw_stop();
return;
}
}
/* If the sdem_level is equal to the buffer size the ARM code gave
* (sdem_dsp_size) then reset the size and ask the arm for another buffer
*/
if(sdem_level==sdem_dsp_size)
{
{
sdem_level=0;
/* Get a new buffer (location and size) from ARM */
status.msg = MSG_REFILL;
waiting=1;
waiting=1;
startack();
}
if(!waiting)
{
{
/* Size is in bytes (but forced 32 bit transfers */
if( (dsp_level + (sdem_dsp_size - sdem_level) ) > DSP_BUFFER_SIZE)
{
@ -130,7 +150,7 @@ void rebuffer(void)
interrupt void handle_dma0(void)
{
/* Byte offset to half-buffer locked by DMA0.
0 for top, PCM_SIZE/2(0x4000) for bottom */
0 for top, PCM_SIZE/2 for bottom */
unsigned short dma0_locked;
IFR = 1 << 6;
@ -156,18 +176,18 @@ interrupt void handle_dmac(void) {
dsp_level+=last_size;
sdem_level+=last_size;
if(dsp_level<DSP_BUFFER_SIZE)
{
rebuffer();
}
}
}
void dma_init(void) {
/* Configure SARAM to McBSP DMA */
/* Event XEVT0, 32-bit transfers, 0 frame count */
DMSFC0 = 2 << 12 | 1 << 11;
DMSFC0 = 2 << 12 | 1 << 11;
/* Interrupts generated, Half and full buffer.
* ABU mode, From data space with postincrement, to data space with no
@ -183,8 +203,8 @@ void dma_init(void) {
DMDST0 = (unsigned short)&DXR20;
/* Set the size of the buffer */
DMCTR0 = sizeof(data);
DMCTR0 = sizeof(data);
/* Run, Rudolf, run! (with DMA0 interrupts) */
DMPREC = 2 << 6 | 1;
/* Setup DMA0 interrupts and start the transfer */
DMPREC = 2 << 6;
}