1 files changed, 53 insertions, 9 deletions

diff --git a/firmware/pcm.c b/firmware/pcm.c
index edd4113677..8d2ec2bf60 100644
--- a/firmware/pcm.c
+++ b/firmware/pcm.c
@@ -40,7 +40,6 @@
  *      pcm_play_unlock
  *   Semi-private -
  *      pcm_play_dma_init
- *      pcm_play_dma_init
  *      pcm_play_dma_start
  *      pcm_play_dma_stop
  *      pcm_play_dma_pause
@@ -66,10 +65,10 @@
  *      pcm_rec_dma_init
  *      pcm_rec_dma_close
  *      pcm_rec_dma_start
+ *      pcm_rec_dma_record_more
  *      pcm_rec_dma_stop
  *      pcm_rec_dma_get_peak_buffer
  *   Data Read/Written within TSP -
- *      pcm_rec_peak_addr (R/W)
  *      pcm_callback_more_ready (R)
  *      pcm_recording (R)
  *
@@ -210,6 +209,9 @@ void pcm_init(void)
 /* Common code to pcm_play_data and pcm_play_pause */
 static void pcm_play_data_start(unsigned char *start, size_t size)
 {
+    start = (unsigned char *)(((uintptr_t)start + 3) & ~3);
+    size &= ~3;
+
     if (!(start && size))
     {
         pcm_more_callback_type get_more = pcm_callback_for_more;
@@ -218,6 +220,9 @@ static void pcm_play_data_start(unsigned char *start, size_t size)
         {
             logf(" get_more");
             get_more(&start, &size);
+
+            start = (unsigned char *)(((uintptr_t)start + 3) & ~3);
+            size &= ~3;
         }
     }
 
@@ -359,7 +364,7 @@ bool pcm_is_paused(void)
 /** Low level pcm recording apis **/
 
 /* Next start for recording peaks */
-const volatile void *pcm_rec_peak_addr SHAREDBSS_ATTR = NULL;
+static const void * volatile pcm_rec_peak_addr SHAREDBSS_ATTR = NULL;
 /* the registered callback function for when more data is available */
 volatile pcm_more_callback_type2
     pcm_callback_more_ready SHAREDBSS_ATTR = NULL;
@@ -373,17 +378,23 @@ volatile bool pcm_recording SHAREDBSS_ATTR = false;
 void pcm_calculate_rec_peaks(int *left, int *right)
 {
     static int peaks[2];
-    int count;
-    const void *addr = pcm_rec_dma_get_peak_buffer(&count);
 
     if (pcm_recording)
     {
-        if (count > 0)
+        const void *peak_addr = pcm_rec_peak_addr;
+        const void *addr = pcm_rec_dma_get_peak_buffer();
+
+        if (addr != NULL)
         {
-            pcm_peak_peeker(addr, count, peaks);
+            int count = (int)(((intptr_t)addr - (intptr_t)peak_addr) >> 2);
 
-            if (addr == pcm_rec_peak_addr)
-                pcm_rec_peak_addr = (int32_t *)addr + count;
+            if (count > 0)
+            {
+                pcm_peak_peeker(peak_addr, count, peaks);
+
+                if (peak_addr == pcm_rec_peak_addr)
+                    pcm_rec_peak_addr = addr;
+            }
         }
         /* else keep previous peak values */
     }
@@ -443,6 +454,10 @@ void pcm_record_data(pcm_more_callback_type2 more_ready,
 {
     logf("pcm_record_data");
 
+    /* 32-bit aligned and sized data only */
+    start = (void *)(((uintptr_t)start + 3) & ~3);
+    size &= ~3;
+
     if (!(start && size))
     {
         logf(" no buffer");
@@ -453,6 +468,13 @@ void pcm_record_data(pcm_more_callback_type2 more_ready,
 
     pcm_callback_more_ready = more_ready;
 
+#ifdef HAVE_PCM_REC_DMA_ADDRESS
+    /* Need a physical DMA address translation, if not already physical. */
+    pcm_rec_peak_addr = pcm_dma_addr(start);
+#else
+    pcm_rec_peak_addr = start;
+#endif
+
     logf(" pcm_rec_dma_start");
     pcm_apply_settings();
     pcm_rec_dma_start(start, size);
@@ -477,6 +499,28 @@ void pcm_stop_recording(void)
     pcm_rec_unlock();
 } /* pcm_stop_recording */
 
+void pcm_record_more(void *start, size_t size)
+{
+    start = (void *)(((uintptr_t)start + 3) & ~3);
+    size = size & ~3;
+
+    if (!size)
+    {
+        pcm_rec_dma_stop();
+        pcm_rec_dma_stopped_callback();
+        return;
+    }
+
+#ifdef HAVE_PCM_REC_DMA_ADDRESS
+    /* Need a physical DMA address translation, if not already physical. */
+    pcm_rec_peak_addr = pcm_dma_addr(start);
+#else
+    pcm_rec_peak_addr = start;
+#endif
+
+    pcm_rec_dma_record_more(start, size);
+}
+
 bool pcm_is_recording(void)
 {
     return pcm_recording;