len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-14 02:27:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix errors in unintentionally merged gerrit commit.

Browse source 
It proved the system work as unintended, even if slightly prematurely.
It was almost ready anyway.

Change-Id: Ic4de2b925bd26b094eaf65a120591569923954d1
This commit is contained in:
Michael Sevakis 2012-03-03 01:45:09 -05:00
parent 286a4c5caa
commit 59e5a323f1
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
firmware/target/arm/pcm-telechips.c
View file

@ -53,7 +53,7 @@ struct dma_data
struct dma_data dma_play_data SHAREDBSS_ATTR = struct dma_data dma_play_data SHAREDBSS_ATTR =
{ {
/* Initialize to a locked, stopped state */ /* Initialize to a locked, stopped state */
.p = NULL, { .p = NULL },
.size = 0, .size = 0,
#if NUM_CORES > 1 #if NUM_CORES > 1
.core = 0x00, .core = 0x00,

3
firmware/target/arm/s5l8702/pcm-s5l8702.c
View file

@ -65,7 +65,8 @@ void INT_DMAC0C0(void)
DMAC0INTTCCLR = 1; DMAC0INTTCCLR = 1;
if (!pcm_remaining) if (!pcm_remaining)
{ {
pcm_play_dma_complete_callback((const void**)&dataptr, &pcm_remaining); pcm_play_dma_complete_callback(PCM_DMAST_OK, (const void**)&dataptr,
&pcm_remaining);
pcm_chunksize = pcm_remaining; pcm_chunksize = pcm_remaining;
} }
if (!pcm_remaining) if (!pcm_remaining)