Separate running an SDMA channel from resetting it. It should make usage more flexible since resets are needed only before restarting if aborting transfers (because the script is left awaiting requests, not the next start) which PCM does alot of but other things likely won't.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20000 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 14 insertions, 3 deletions

diff --git a/firmware/target/arm/imx31/gigabeat-s/pcm-imx31.c b/firmware/target/arm/imx31/gigabeat-s/pcm-imx31.c
index 39c0bc4969..9d2503f4e6 100644
--- a/firmware/target/arm/imx31/gigabeat-s/pcm-imx31.c
+++ b/firmware/target/arm/imx31/gigabeat-s/pcm-imx31.c
@@ -272,6 +272,12 @@ void pcm_play_dma_start(const void *addr, size_t size)
     addr = (void *)(((unsigned long)addr + 3) & ~3);
     size &= ~3;
 
+    if (size <= 0)
+        return;
+
+    if (!sdma_channel_reset(DMA_PLAY_CH_NUM))
+        return;
+
     clean_dcache_range(addr, size);
     dma_play_bd.buf_addr =
         (void *)addr_virt_to_phys((unsigned long)(void *)addr);
@@ -280,7 +286,7 @@ void pcm_play_dma_start(const void *addr, size_t size)
     dma_play_bd.mode.status = BD_DONE | BD_WRAP | BD_INTR;
 
     play_start_pcm();
-    sdma_channel_start(DMA_PLAY_CH_NUM);
+    sdma_channel_run(DMA_PLAY_CH_NUM);
 }
 
 void pcm_play_dma_stop(void)
@@ -463,6 +469,12 @@ void pcm_rec_dma_start(void *addr, size_t size)
     addr = (void *)(((unsigned long)addr + 3) & ~3);
     size &= ~3;
 
+    if (size <= 0)
+        return;
+
+    if (!sdma_channel_reset(DMA_REC_CH_NUM))
+        return;
+    
     /* Invalidate - buffer must be coherent */
     dump_dcache_range(addr, size);
 
@@ -483,8 +495,7 @@ void pcm_rec_dma_start(void *addr, size_t size)
 
     /* Enable receive */
     SSI_SCR2 |= SSI_SCR_RE;
-
-    sdma_channel_start(DMA_REC_CH_NUM);
+    sdma_channel_run(DMA_REC_CH_NUM);
 }
 
 void pcm_rec_dma_close(void)