5 files changed, 17 insertions, 58 deletions

diff --git a/firmware/target/arm/as3525/pcm-as3525.c b/firmware/target/arm/as3525/pcm-as3525.c
index 53a3f0c9a3..4d78899398 100644
--- a/firmware/target/arm/as3525/pcm-as3525.c
+++ b/firmware/target/arm/as3525/pcm-as3525.c
@@ -202,7 +202,7 @@ void pcm_rec_unlock(void)
 }
 
 
-void pcm_record_more(void *start, size_t size)
+void pcm_rec_dma_record_more(void *start, size_t size)
 {
     rec_start_addr = start;
     rec_size = size;
@@ -331,16 +331,9 @@ void pcm_rec_dma_init(void)
 }
 
 
-const void * pcm_rec_dma_get_peak_buffer(int *count)
+const void * pcm_rec_dma_get_peak_buffer(void)
 {
-    const void *peak_buffer;
-
-    pcm_rec_lock();
-    *count = rec_size >> 2;
-    peak_buffer = (const void*)rec_start_addr;
-    pcm_rec_unlock();
-
-    return peak_buffer;
+    return (const void*)rec_start_addr;
 }
 
 #endif /* HAVE_RECORDING */
diff --git a/firmware/target/arm/imx31/gigabeat-s/pcm-gigabeat-s.c b/firmware/target/arm/imx31/gigabeat-s/pcm-gigabeat-s.c
index c0651caf51..02051fad90 100644
--- a/firmware/target/arm/imx31/gigabeat-s/pcm-gigabeat-s.c
+++ b/firmware/target/arm/imx31/gigabeat-s/pcm-gigabeat-s.c
@@ -432,17 +432,13 @@ void pcm_rec_unlock(void)
     }
 }
 
-void pcm_record_more(void *start, size_t size)
+void pcm_rec_dma_record_more(void *start, size_t size)
 {
-    start = (void *)(((unsigned long)start + 3) & ~3);
-    size &= ~3;
-
     /* Invalidate - buffer must be coherent */
     dump_dcache_range(start, size);
 
     start = (void *)addr_virt_to_phys((unsigned long)start);
 
-    pcm_rec_peak_addr = start;
     dma_rec_bd.buf_addr = start;
     dma_rec_bd.mode.count = size;
     dma_rec_bd.mode.command = TRANSFER_16BIT;
@@ -469,12 +465,6 @@ void pcm_rec_dma_start(void *addr, size_t size)
 {
     pcm_rec_dma_stop();
 
-    addr = (void *)(((unsigned long)addr + 3) & ~3);
-    size &= ~3;
-
-    if (size <= 0)
-        return;
-
     if (!sdma_channel_reset(DMA_REC_CH_NUM))
         return;
     
@@ -482,7 +472,6 @@ void pcm_rec_dma_start(void *addr, size_t size)
     dump_dcache_range(addr, size);
 
     addr = (void *)addr_virt_to_phys((unsigned long)addr);
-    pcm_rec_peak_addr = addr;
     dma_rec_bd.buf_addr = addr;
     dma_rec_bd.mode.count = size;
     dma_rec_bd.mode.command = TRANSFER_16BIT;
@@ -524,10 +513,10 @@ void pcm_rec_dma_init(void)
     sdma_channel_set_priority(DMA_REC_CH_NUM, DMA_REC_CH_PRIORITY);
 }
 
-const void * pcm_rec_dma_get_peak_buffer(int *count)
+const void * pcm_rec_dma_get_peak_buffer(void)
 {
     static unsigned long pda NOCACHEBSS_ATTR;
-    unsigned long buf, addr, end, bufend;
+    unsigned long buf, end, bufend;
     int oldstatus;
 
     /* read burst dma destination address register in channel context */
@@ -536,19 +525,13 @@ const void * pcm_rec_dma_get_peak_buffer(int *count)
     oldstatus = disable_irq_save();
     end = pda;
     buf = (unsigned long)dma_rec_bd.buf_addr;
-    addr = (unsigned long)pcm_rec_peak_addr;
     bufend = buf + dma_rec_bd.mode.count;
     restore_irq(oldstatus);
 
     /* Be addresses are coherent (no buffer change during read) */
-    if (addr >= buf && addr < bufend &&
-        end >= buf && end < bufend)
-    {
-        *count = (end >> 2) - (addr >> 2);
-        return (void *)(addr & ~3);
-    }
+    if (end >= buf && end < bufend)
+        return (void *)(end & ~3);
 
-    *count = 0;
     return NULL;
 }
 
diff --git a/firmware/target/arm/pcm-pp.c b/firmware/target/arm/pcm-pp.c
index bd12b13032..bad3f593fe 100644
--- a/firmware/target/arm/pcm-pp.c
+++ b/firmware/target/arm/pcm-pp.c
@@ -431,9 +431,6 @@ static void play_stop_pcm(void)
 
 void pcm_play_dma_start(const void *addr, size_t size)
 {
-    addr = (void *)(((long)addr + 2) & ~3);
-    size &= ~3;
-
 #if NUM_CORES > 1
     /* This will become more important later - and different ! */
     dma_play_data.core = processor_id(); /* save initiating core */
@@ -441,9 +438,6 @@ void pcm_play_dma_start(const void *addr, size_t size)
 
     pcm_play_dma_stop();
 
-    if (size == 0)
-        return;
-
 #ifdef CPU_PP502x
     if ((unsigned long)addr < UNCACHED_BASE_ADDR) {
         /* Flush any pending cache writes */
@@ -691,9 +685,8 @@ void fiq_record(void)
 #endif /* SANSA_E200 */
 
 /* Continue transferring data in */
-void pcm_record_more(void *start, size_t size)
+void pcm_rec_dma_record_more(void *start, size_t size)
 {
-    pcm_rec_peak_addr = start; /* Start peaking at dest */
     dma_rec_data.addr = (unsigned long)start; /* Start of RX buffer */
     dma_rec_data.size = size; /* Bytes to transfer */
 }
@@ -718,7 +711,6 @@ void pcm_rec_dma_start(void *addr, size_t size)
 {
     pcm_rec_dma_stop();
 
-    pcm_rec_peak_addr = addr;
     dma_rec_data.addr = (unsigned long)addr;
     dma_rec_data.size = size;
 #if NUM_CORES > 1
@@ -749,17 +741,9 @@ void pcm_rec_dma_init(void)
     pcm_rec_dma_stop();
 } /* pcm_init */
 
-const void * pcm_rec_dma_get_peak_buffer(int *count)
+const void * pcm_rec_dma_get_peak_buffer(void)
 {
-    unsigned long addr, end;
-
-    int status = disable_fiq_save();
-    addr = (unsigned long)pcm_rec_peak_addr;
-    end = dma_rec_data.addr;
-    restore_fiq(status);
-
-    *count = (end >> 2) - (addr >> 2);
-    return (void *)(addr & ~3);
+    return (void *)((unsigned long)dma_rec_data.addr & ~3);
 } /* pcm_rec_dma_get_peak_buffer */
 
 #endif /* HAVE_RECORDING */
diff --git a/firmware/target/arm/pcm-telechips.c b/firmware/target/arm/pcm-telechips.c
index f0ef667d4f..9d14fa5ed5 100644
--- a/firmware/target/arm/pcm-telechips.c
+++ b/firmware/target/arm/pcm-telechips.c
@@ -141,8 +141,8 @@ static void play_stop_pcm(void)
 
 void pcm_play_dma_start(const void *addr, size_t size)
 {
-    dma_play_data.p    = (void *)(((uintptr_t)addr + 2) & ~3);
-    dma_play_data.size = (size & ~3);
+    dma_play_data.p    = addr;
+    dma_play_data.size = size;
 
 #if NUM_CORES > 1
     /* This will become more important later - and different ! */
@@ -229,9 +229,8 @@ void pcm_rec_unlock(void)
 {
 }
 
-const void * pcm_rec_dma_get_peak_buffer(int *count)
+const void * pcm_rec_dma_get_peak_buffer(void)
 {
-    *count = 0;
     return NULL;
 }
 
diff --git a/firmware/target/arm/s5l8700/pcm-s5l8700.c b/firmware/target/arm/s5l8700/pcm-s5l8700.c
index 1edb05fd15..7798f41d11 100644
--- a/firmware/target/arm/s5l8700/pcm-s5l8700.c
+++ b/firmware/target/arm/s5l8700/pcm-s5l8700.c
@@ -367,7 +367,7 @@ void pcm_rec_unlock(void)
 {
 }
 
-void pcm_record_more(void *start, size_t size)
+void pcm_rec_dma_record_more(void *start, size_t size)
 {
     (void)start;
     (void)size;
@@ -393,9 +393,9 @@ void pcm_rec_dma_init(void)
 }
 
 
-const void * pcm_rec_dma_get_peak_buffer(int *count)
+const void * pcm_rec_dma_get_peak_buffer(void)
 {
-    (void)count;
+    return NULL;
 }
 
 #endif /* HAVE_RECORDING */