Split CPU-optimized beep code into the firmware/asm tree.

For now due to current lack of an apps/asm, place the ASM/generic code in the
firmware/asm directory.

Additionally, make generic beep code more generic.

Change-Id: I4a69b6ffcbb97d9e6dfde2209c5a118de19e5638

3 files changed, 132 insertions, 0 deletions

diff --git a/firmware/asm/arm/beep.c b/firmware/asm/arm/beep.c
new file mode 100644
index 0000000000..f3c3e2e0d2
--- /dev/null
+++ b/firmware/asm/arm/beep.c
@@ -0,0 +1,39 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (c) 2011 Michael Sevakis
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+
+/* Actually output samples into beep_buf */
+static FORCE_INLINE void beep_generate(uint32_t *out, int count,
+                                       int32_t *phase, uint32_t step,
+                                       uint32_t amplitude)
+{
+    uint32_t s;
+
+    asm volatile (
+    "1:                            \n"
+        "eor   %3, %5, %1, asr #31 \n"
+        "subs  %2, %2, #1          \n"
+        "str   %3, [%0], #4        \n"
+        "add   %1, %1, %4          \n"
+        "bgt   1b                  \n"
+        : "+r"(out), "+r"(*phase), "+r"(count),
+          "=&r"(s)
+        : "r"(step), "r"(amplitude));
+}
diff --git a/firmware/asm/beep.c b/firmware/asm/beep.c
new file mode 100644
index 0000000000..0314e32715
--- /dev/null
+++ b/firmware/asm/beep.c
@@ -0,0 +1,51 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (c) 2011 Michael Sevakis
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+#if defined(CPU_ARM)
+#include "arm/beep.c"
+#elif defined (CPU_COLDFIRE)
+#include "m68k/beep.c"
+#else /* Generic */
+
+static FORCE_INLINE void beep_generate(int16_t *out, int count,
+                                       uint32_t *phase, uint32_t step,
+                                       int16_t amplitude)
+{
+    uint32_t ph = *phase;
+
+    do
+    {
+        int16_t amp = amplitude;
+
+        if (ph > UINT32_MAX / 2)
+            amp = -amp;
+
+        *out++ = amp;
+        *out++ = amp;
+
+        ph += step;
+    }
+    while (--count > 0);
+
+    *phase = ph;
+}
+
+#define BEEP_GENERIC
+#endif /* CPU_* */
diff --git a/firmware/asm/m68k/beep.c b/firmware/asm/m68k/beep.c
new file mode 100644
index 0000000000..5461a4ef20
--- /dev/null
+++ b/firmware/asm/m68k/beep.c
@@ -0,0 +1,42 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (c) 2011 Michael Sevakis
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+
+/* Actually output samples into beep_buf */
+static FORCE_INLINE void beep_generate(uint32_t *out, int count,
+                                       int32_t *phase, uint32_t step,
+                                       uint32_t amplitude)
+{
+    uint32_t s;
+
+    asm volatile (
+    "1:                   \n"
+        "move.l %1, %3    \n"
+        "add.l  %4, %1    \n"
+        "add.l  %3, %3    \n"
+        "subx.l %3, %3    \n"
+        "eor.l  %5, %3    \n"
+        "move.l %3, (%0)+ \n"
+        "subq.l #1, %2    \n"
+        "bgt.b  1b        \n"
+        : "+a"(out), "+d"(*phase), "+d"(count),
+          "=&d"(s)
+        : "r"(step), "d"(amplitude));
+}