diff options
| author | Michael Sevakis <jethead71@rockbox.org> | 2012-03-03 01:45:09 -0500 |
|---|---|---|
| committer | Michael Sevakis <jethead71@rockbox.org> | 2012-03-03 01:45:09 -0500 |
| commit | 59e5a323f127423a39449e587f47c3ba0f9e7d4b (patch) | |
| tree | dc303733835a4e26ae48762ca42259a69cd26a6e | |
| parent | 286a4c5caa1945c8d1cb365a3d90fb09d5700cb2 (diff) | |
| download | rockbox-59e5a323f127423a39449e587f47c3ba0f9e7d4b.zip rockbox-59e5a323f127423a39449e587f47c3ba0f9e7d4b.tar.gz rockbox-59e5a323f127423a39449e587f47c3ba0f9e7d4b.tar.bz2 rockbox-59e5a323f127423a39449e587f47c3ba0f9e7d4b.tar.xz | |
Fix errors in unintentionally merged gerrit commit.
It proved the system work as unintended, even if slightly prematurely.
It was almost ready anyway.
Change-Id: Ic4de2b925bd26b094eaf65a120591569923954d1
| -rw-r--r-- | firmware/target/arm/pcm-telechips.c | 2 | ||||
| -rw-r--r-- | firmware/target/arm/s5l8702/pcm-s5l8702.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/firmware/target/arm/pcm-telechips.c b/firmware/target/arm/pcm-telechips.c index 3d62fcd..ddd6908 100644 --- a/firmware/target/arm/pcm-telechips.c +++ b/firmware/target/arm/pcm-telechips.c @@ -53,7 +53,7 @@ struct dma_data struct dma_data dma_play_data SHAREDBSS_ATTR = { /* Initialize to a locked, stopped state */ - .p = NULL, + { .p = NULL }, .size = 0, #if NUM_CORES > 1 .core = 0x00, diff --git a/firmware/target/arm/s5l8702/pcm-s5l8702.c b/firmware/target/arm/s5l8702/pcm-s5l8702.c index 1442afa..ef404dd 100644 --- a/firmware/target/arm/s5l8702/pcm-s5l8702.c +++ b/firmware/target/arm/s5l8702/pcm-s5l8702.c @@ -65,7 +65,8 @@ void INT_DMAC0C0(void) DMAC0INTTCCLR = 1; 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; } if (!pcm_remaining) |