Accept patch in FS#7751 by Catalin Patulea, move ifp port specific pcm code to a new file

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

3 files changed, 188 insertions, 162 deletions

diff --git a/firmware/SOURCES b/firmware/SOURCES
index 7a6e253a81..ab99167a8f 100644
--- a/firmware/SOURCES
+++ b/firmware/SOURCES
@@ -745,5 +745,9 @@ target/arm/pnx0101/iriver-ifp7xx/lcd-ifp7xx.c
 target/arm/pnx0101/iriver-ifp7xx/power-ifp7xx.c
 target/arm/pnx0101/iriver-ifp7xx/powermgmt-ifp7xx.c
 target/arm/pnx0101/iriver-ifp7xx/usb-ifp7xx.c
+#ifndef BOOTLOADER
+target/arm/pnx0101/pcm-pnx0101.c
+#endif
 #endif
 #endif
+
diff --git a/firmware/pcm_playback.c b/firmware/pcm_playback.c
index d81853e1cb..e6e59ca604 100644
--- a/firmware/pcm_playback.c
+++ b/firmware/pcm_playback.c
@@ -21,9 +21,6 @@
 #include "logf.h"
 #include "audio.h"
 #include "sound.h"
-#if CONFIG_CPU == PNX0101
-#include "string.h"
-#endif /* CONFIG_CPU == PNX0101 */
 
 /**
  * APIs implemented in the target-specific portion:
@@ -53,15 +50,29 @@ void pcm_play_pause_unpause(void);
 
 /** Functions that require targeted implementation **/
 
-#if !defined(CPU_COLDFIRE) && (CONFIG_CPU != S3C2440)
-
-#if (CONFIG_CPU == PNX0101)
-
-#define DMA_BUF_SAMPLES 0x100
+#if defined(CPU_COLDFIRE) || (CONFIG_CPU == S3C2440)
+/* Implemented in target/... */
+#else
+/* dummy functions for those not actually supporting all this yet */
+void pcm_apply_settings(void)
+{
+}
+/** **/
 
-short __attribute__((section(".dmabuf"))) dma_buf_left[DMA_BUF_SAMPLES];
-short __attribute__((section(".dmabuf"))) dma_buf_right[DMA_BUF_SAMPLES];
+void pcm_mute(bool mute)
+{
+#if defined(HAVE_WM8975) || defined(HAVE_WM8758) \
+   || defined(HAVE_WM8731) || defined(HAVE_WM8721)
+    audiohw_mute(mute);
+#endif
+    if (mute)
+        sleep(HZ/16);
+}
+#endif /* defined(CPU_COLDFIRE) || (CONFIG_CPU == S3C2440) */
 
+#if defined(CPU_COLDFIRE) || (CONFIG_CPU == S3C2440) || defined(CPU_PP)
+/* Implemented in target/... */
+#else
 static int pcm_freq = HW_SAMPR_DEFAULT; /* 44.1 is default */
 
 unsigned short* p IBSS_ATTR;
@@ -90,136 +101,6 @@ void pcm_play_pause_unpause(void)
 {
 }
 
-static inline void fill_dma_buf(int offset)
-{
-    short *l, *r, *lend;
-
-    l = dma_buf_left + offset;
-    lend = l + DMA_BUF_SAMPLES / 2;
-    r = dma_buf_right + offset;
-
-    if (pcm_playing && !pcm_paused)
-    {
-        do
-        {
-            int count;
-            unsigned short *tmp_p;
-            count = MIN(p_size / 4, (size_t)(lend - l));
-            tmp_p = p;
-            p_size -= count * 4;
-
-            if ((int)l & 3)
-            {
-                *l++ = *tmp_p++;
-                *r++ = *tmp_p++;
-                count--;
-            }
-            while (count >= 4)
-            {
-                asm("ldmia %0!, {r0, r1, r2, r3}\n\t"
-                    "and   r4, r0, %3\n\t"
-                    "orr   r4, r4, r1, lsl #16\n\t"
-                    "and   r5, r2, %3\n\t"
-                    "orr   r5, r5, r3, lsl #16\n\t"
-                    "stmia %1!, {r4, r5}\n\t"
-                    "bic   r4, r1, %3\n\t"
-                    "orr   r4, r4, r0, lsr #16\n\t"
-                    "bic   r5, r3, %3\n\t"
-                    "orr   r5, r5, r2, lsr #16\n\t"
-                    "stmia %2!, {r4, r5}"
-                    : "+r" (tmp_p), "+r" (l), "+r" (r)
-                    : "r" (0xffff)
-                    : "r0", "r1", "r2", "r3", "r4", "r5", "memory");
-                count -= 4;
-            }
-            while (count > 0)
-            {
-                *l++ = *tmp_p++;
-                *r++ = *tmp_p++;
-                count--;
-            }
-            p = tmp_p;
-            if (l >= lend)
-                return;
-            else if (pcm_callback_for_more)
-                pcm_callback_for_more((unsigned char**)&p,
-                                  &p_size);
-        }
-        while (p_size);
-        pcm_playing = false;
-    }
-
-    if (l < lend)
-    {
-        memset(l, 0, sizeof(short) * (lend - l));
-        memset(r, 0, sizeof(short) * (lend - l));
-    }
-}
-
-static void audio_irq(void)
-{
-    unsigned long st = DMAINTSTAT & ~DMAINTEN;
-    int i;
-    for (i = 0; i < 2; i++)
-        if (st & (1 << i))
-        {
-            fill_dma_buf((i == 1) ? 0 : DMA_BUF_SAMPLES / 2);
-            DMAINTSTAT = 1 << i;
-        }
-}
-
-unsigned long physical_address(void *p)
-{
-    unsigned long adr = (unsigned long)p;
-    return (MMUBLOCK((adr >> 21) & 0xf) << 21) | (adr & ((1 << 21) - 1));
-}
-
-void pcm_init(void)
-{
-    int i;
-
-    pcm_playing = false;
-    pcm_paused = false;
-    pcm_callback_for_more = NULL;
-
-    memset(dma_buf_left, 0, sizeof(dma_buf_left));
-    memset(dma_buf_right, 0, sizeof(dma_buf_right));
-
-    for (i = 0; i < 8; i++)
-    {
-        DMASRC(i) = 0;
-        DMADEST(i) = 0;
-        DMALEN(i) = 0x1ffff;
-        DMAR0C(i) = 0;
-        DMAR10(i) = 0;
-        DMAR1C(i) = 0;
-    }
-
-    DMAINTSTAT = 0xc000ffff;
-    DMAINTEN = 0xc000ffff;
-    
-    DMASRC(0) = physical_address(dma_buf_left);
-    DMADEST(0) = 0x80200280;
-    DMALEN(0) = 0xff;
-    DMAR1C(0) = 0;
-    DMAR0C(0) = 0x40408;
-
-    DMASRC(1) = physical_address(dma_buf_right);
-    DMADEST(1) = 0x80200284;
-    DMALEN(1) = 0xff;
-    DMAR1C(1) = 0;
-    DMAR0C(1) = 0x40409;
-
-    irq_set_int_handler(0x1b, audio_irq);
-    irq_enable_int(0x1b);
-
-    DMAINTSTAT = 1;
-    DMAINTSTAT = 2;
-    DMAINTEN &= ~3;
-    DMAR10(0) |= 1;
-    DMAR10(1) |= 1;
-}
-
 void pcm_postinit(void)
 {
     audiohw_postinit();
@@ -234,24 +115,7 @@ size_t pcm_get_bytes_waiting(void)
 {
     return p_size;
 }
-#endif /* CONFIG_CPU == */
 
-/* dummy functions for those not actually supporting all this yet */
-void pcm_apply_settings(void)
-{
-}
-/** **/
-
-void pcm_mute(bool mute)
-{
-#if defined(HAVE_WM8975) || defined(HAVE_WM8758) \
-   || defined(HAVE_WM8731) || defined(HAVE_WM8721)
-    audiohw_mute(mute);
-#endif
-    if (mute)
-        sleep(HZ/16);
-}
-#if !defined(CPU_PP)
 /*
  * This function goes directly into the DMA buffer to calculate the left and
  * right peak values. To avoid missing peaks it tries to look forward two full
@@ -271,10 +135,8 @@ void pcm_calculate_peaks(int *left, int *right)
     short *addr;
     short *end;
     {
-#if CONFIG_CPU == PNX0101
         size_t samples = p_size / 4;
         addr = p;
-#endif /* CONFIG_CPU */.
 
         if (samples > PEAK_SAMPLES)
             samples = PEAK_SAMPLES - (PEAK_STRIDE - 1);
@@ -326,9 +188,7 @@ void pcm_calculate_peaks(int *left, int *right)
             *right = peak_value;
     }
 }
-#endif /* !defined(CPU_PP) */
-
-#endif /* !defined(CPU_COLDFIRE) && (CONFIG_CPU != S3C2440) */
+#endif /* defined(CPU_COLDFIRE) || (CONFIG_CPU == S3C2440) || defined(CPU_PP) */
 
 /****************************************************************************
  * Functions that do not require targeted implementation but only a targeted
@@ -418,3 +278,4 @@ bool pcm_is_paused(void)
 {
     return pcm_paused;
 }
+
diff --git a/firmware/target/arm/pnx0101/pcm-pnx0101.c b/firmware/target/arm/pnx0101/pcm-pnx0101.c
new file mode 100644
index 0000000000..8b076cc918
--- /dev/null
+++ b/firmware/target/arm/pnx0101/pcm-pnx0101.c
@@ -0,0 +1,161 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2006 by Tomek Malesinski
+ *
+ * All files in this archive are subject to the GNU General Public License.
+ * See the file COPYING in the source tree root for full license agreement.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+#include "system.h"
+#include "audio.h"
+#include "string.h"
+
+#define DMA_BUF_SAMPLES 0x100
+
+short __attribute__((section(".dmabuf"))) dma_buf_left[DMA_BUF_SAMPLES];
+short __attribute__((section(".dmabuf"))) dma_buf_right[DMA_BUF_SAMPLES];
+
+/* From pcm_playback.c */
+extern unsigned short* p;
+extern size_t p_size;
+
+static inline void fill_dma_buf(int offset)
+{
+    short *l, *r, *lend;
+
+    l = dma_buf_left + offset;
+    lend = l + DMA_BUF_SAMPLES / 2;
+    r = dma_buf_right + offset;
+
+    if (pcm_playing && !pcm_paused)
+    {
+        do
+        {
+            int count;
+            unsigned short *tmp_p;
+            count = MIN(p_size / 4, (size_t)(lend - l));
+            tmp_p = p;
+            p_size -= count * 4;
+
+            if ((int)l & 3)
+            {
+                *l++ = *tmp_p++;
+                *r++ = *tmp_p++;
+                count--;
+            }
+            while (count >= 4)
+            {
+                asm("ldmia %0!, {r0, r1, r2, r3}\n\t"
+                    "and   r4, r0, %3\n\t"
+                    "orr   r4, r4, r1, lsl #16\n\t"
+                    "and   r5, r2, %3\n\t"
+                    "orr   r5, r5, r3, lsl #16\n\t"
+                    "stmia %1!, {r4, r5}\n\t"
+                    "bic   r4, r1, %3\n\t"
+                    "orr   r4, r4, r0, lsr #16\n\t"
+                    "bic   r5, r3, %3\n\t"
+                    "orr   r5, r5, r2, lsr #16\n\t"
+                    "stmia %2!, {r4, r5}"
+                    : "+r" (tmp_p), "+r" (l), "+r" (r)
+                    : "r" (0xffff)
+                    : "r0", "r1", "r2", "r3", "r4", "r5", "memory");
+                count -= 4;
+            }
+            while (count > 0)
+            {
+                *l++ = *tmp_p++;
+                *r++ = *tmp_p++;
+                count--;
+            }
+            p = tmp_p;
+            if (l >= lend)
+                return;
+            else if (pcm_callback_for_more)
+                pcm_callback_for_more((unsigned char**)&p,
+                                  &p_size);
+        }
+        while (p_size);
+        pcm_playing = false;
+    }
+
+    if (l < lend)
+    {
+        memset(l, 0, sizeof(short) * (lend - l));
+        memset(r, 0, sizeof(short) * (lend - l));
+    }
+}
+
+static void audio_irq(void)
+{
+    unsigned long st = DMAINTSTAT & ~DMAINTEN;
+    int i;
+    for (i = 0; i < 2; i++)
+        if (st & (1 << i))
+        {
+            fill_dma_buf((i == 1) ? 0 : DMA_BUF_SAMPLES / 2);
+            DMAINTSTAT = 1 << i;
+        }
+}
+
+unsigned long physical_address(void *p)
+{
+    unsigned long adr = (unsigned long)p;
+    return (MMUBLOCK((adr >> 21) & 0xf) << 21) | (adr & ((1 << 21) - 1));
+}
+
+void pcm_init(void)
+{
+    int i;
+
+    pcm_playing = false;
+    pcm_paused = false;
+    pcm_callback_for_more = NULL;
+
+    memset(dma_buf_left, 0, sizeof(dma_buf_left));
+    memset(dma_buf_right, 0, sizeof(dma_buf_right));
+
+    for (i = 0; i < 8; i++)
+    {
+        DMASRC(i) = 0;
+        DMADEST(i) = 0;
+        DMALEN(i) = 0x1ffff;
+        DMAR0C(i) = 0;
+        DMAR10(i) = 0;
+        DMAR1C(i) = 0;
+    }
+
+    DMAINTSTAT = 0xc000ffff;
+    DMAINTEN = 0xc000ffff;
+    
+    DMASRC(0) = physical_address(dma_buf_left);
+    DMADEST(0) = 0x80200280;
+    DMALEN(0) = 0xff;
+    DMAR1C(0) = 0;
+    DMAR0C(0) = 0x40408;
+
+    DMASRC(1) = physical_address(dma_buf_right);
+    DMADEST(1) = 0x80200284;
+    DMALEN(1) = 0xff;
+    DMAR1C(1) = 0;
+    DMAR0C(1) = 0x40409;
+
+    irq_set_int_handler(0x1b, audio_irq);
+    irq_enable_int(0x1b);
+
+    DMAINTSTAT = 1;
+    DMAINTSTAT = 2;
+    DMAINTEN &= ~3;
+    DMAR10(0) |= 1;
+    DMAR10(1) |= 1;
+}
+