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.tar.gz rockbox-59e5a323f127423a39449e587f47c3ba0f9e7d4b.zip |
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 3d62fcd1a9..ddd69088cf 100644 --- a/firmware/target/arm/pcm-telechips.c +++ b/firmware/target/arm/pcm-telechips.c | |||
@@ -53,7 +53,7 @@ struct dma_data | |||
53 | struct dma_data dma_play_data SHAREDBSS_ATTR = | 53 | struct dma_data dma_play_data SHAREDBSS_ATTR = |
54 | { | 54 | { |
55 | /* Initialize to a locked, stopped state */ | 55 | /* Initialize to a locked, stopped state */ |
56 | .p = NULL, | 56 | { .p = NULL }, |
57 | .size = 0, | 57 | .size = 0, |
58 | #if NUM_CORES > 1 | 58 | #if NUM_CORES > 1 |
59 | .core = 0x00, | 59 | .core = 0x00, |
diff --git a/firmware/target/arm/s5l8702/pcm-s5l8702.c b/firmware/target/arm/s5l8702/pcm-s5l8702.c index 1442afa420..ef404ddd9c 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) | |||
65 | DMAC0INTTCCLR = 1; | 65 | DMAC0INTTCCLR = 1; |
66 | if (!pcm_remaining) | 66 | if (!pcm_remaining) |
67 | { | 67 | { |
68 | pcm_play_dma_complete_callback((const void**)&dataptr, &pcm_remaining); | 68 | pcm_play_dma_complete_callback(PCM_DMAST_OK, (const void**)&dataptr, |
69 | &pcm_remaining); | ||
69 | pcm_chunksize = pcm_remaining; | 70 | pcm_chunksize = pcm_remaining; |
70 | } | 71 | } |
71 | if (!pcm_remaining) | 72 | if (!pcm_remaining) |