2 files changed, 6 insertions, 10 deletions

diff --git a/firmware/target/arm/s3c2440/gigabeat-fx/pcm-meg-fx.c b/firmware/target/arm/s3c2440/gigabeat-fx/pcm-meg-fx.c
index 35905645dd..a1c854a0df 100644
--- a/firmware/target/arm/s3c2440/gigabeat-fx/pcm-meg-fx.c
+++ b/firmware/target/arm/s3c2440/gigabeat-fx/pcm-meg-fx.c
@@ -215,16 +215,14 @@ void pcm_play_dma_pause(bool pause)
 
 void fiq_handler(void)
 {
-    static void *start;
+    static const void *start;
     static size_t size;
 
     /* clear any pending interrupt */
     SRCPND = DMA2_MASK;
 
     /* Buffer empty.  Try to get more. */
-    pcm_play_get_more_callback(&start, &size);
-
-    if (size == 0)
+    if (!pcm_play_dma_complete_callback(PCM_DMAST_OK, &start, &size))
         return;
 
     /* Flush any pending cache writes */
@@ -237,7 +235,7 @@ void fiq_handler(void)
     /* Re-Activate the channel */
     DMASKTRIG2 = 0x2;
 
-    pcm_play_dma_started_callback();
+    pcm_play_dma_status_callback(PCM_DMAST_STARTED);
 }
 
 size_t pcm_get_bytes_waiting(void)
diff --git a/firmware/target/arm/s3c2440/mini2440/pcm-mini2440.c b/firmware/target/arm/s3c2440/mini2440/pcm-mini2440.c
index a4f58a8e06..943cbb2ade 100644
--- a/firmware/target/arm/s3c2440/mini2440/pcm-mini2440.c
+++ b/firmware/target/arm/s3c2440/mini2440/pcm-mini2440.c
@@ -255,16 +255,14 @@ void pcm_play_dma_pause(bool pause)
 
 void fiq_handler(void)
 {
-    static void *start;
+    static const void *start;
     static size_t size;
 
     /* clear any pending interrupt */
     SRCPND = DMA2_MASK;
 
     /* Buffer empty.  Try to get more. */
-    pcm_play_get_more_callback(&start, &size);
-
-    if (size == 0)
+    if (!pcm_play_dma_complete_callback(PCM_DMAST_OK, &start, &size))
         return;
 
     /* Flush any pending cache writes */
@@ -277,7 +275,7 @@ void fiq_handler(void)
     /* Re-Activate the channel */
     DMASKTRIG2 = 0x2;
 
-    pcm_play_dma_started_callback();
+    pcm_play_dma_status_callback(PCM_DMAST_STARTED);
 }
 
 size_t pcm_get_bytes_waiting(void)