From 59e5a323f127423a39449e587f47c3ba0f9e7d4b Mon Sep 17 00:00:00 2001 From: Michael Sevakis Date: Sat, 3 Mar 2012 01:45:09 -0500 Subject: [PATCH] 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 --- firmware/target/arm/pcm-telechips.c | 2 +- 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 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 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) 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)