Make speex the new voice format for SWCODEC targets (non-Archos). Remove codec swapping and build speex voice decoding directly into the core binary.

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

2 files changed, 0 insertions, 94 deletions

diff --git a/firmware/target/arm/memswap128-arm.S b/firmware/target/arm/memswap128-arm.S
deleted file mode 100644
index f672def..0000000
--- a/firmware/target/arm/memswap128-arm.S
+++ /dev/null
@@ -1,44 +0,0 @@
-/***************************************************************************
- *             __________               __   ___.
- *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
- *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
- *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
- *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
- *                     \/            \/     \/    \/            \/
- * $Id$
- * 
- * Copyright (C) 2007 by Michael Sevakis
- *
- * 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.
- *
- ****************************************************************************/
-
-/****************************************************************************
- * void memswap128(void *buf1, void *buf2, size_t len)
- */
-    .section    .icode, "ax", %progbits
-    .align      2
-    .global     memswap128
-    .type       memswap128, %function
-memswap128:
-                                        @ r0 = buf1
-                                        @ r1 = buf2
-                                        @ r2 = len
-    movs        r2, r2, lsr #4          @ bytes => lines, len == 0?
-    moveq       pc, lr                  @ not at least a line? leave
-    stmdb       sp!, { r4-r10, lr }     @ save registers and return address
-.loop:                                  @
-    ldmia       r0, { r3-r6 }           @ read four longwords from buf1
-    ldmia       r1, { r7-r10 }          @ read four longwords from buf2
-    stmia       r0!, { r7-r10 }         @ write buf2 data to buf1, buf1 += 16
-    stmia       r1!, { r3-r6 }          @ write buf1 data to buf2, buf2 += 16
-    subs        r2, r2, #1              @ len -= 1, len > 0 ?
-    bhi         .loop                   @ yes? keep exchanging
-    ldmia       sp!, { r4-r10, pc }     @ restore registers and return
-.end:
-    .size       memswap128, .end-memswap128
-
diff --git a/firmware/target/coldfire/memswap128-coldfire.S b/firmware/target/coldfire/memswap128-coldfire.S
deleted file mode 100644
index 5de628d..0000000
--- a/firmware/target/coldfire/memswap128-coldfire.S
+++ /dev/null
@@ -1,50 +0,0 @@
-/***************************************************************************

- *             __________               __   ___.

- *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___

- *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /

- *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <

- *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \

- *                     \/            \/     \/    \/            \/

- * $Id$

- *

- * Copyright (C) 2007 by Michael Sevakis

- *

- * 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.

- *

- ****************************************************************************/

-

-/****************************************************************************

- * void memswap128(void *buf1, void *buf2, size_t len)

- */

-    .section    .icode, "ax", @progbits

-    .align      2

-    .global     memswap128

-    .type       memswap128, @function

-memswap128:

-    lea.l       -28(%sp), %sp           | save registers

-    movem.l     %d2-%d7/%a2, (%sp)      |

-    movem.l     32(%sp), %a0-%a2        | %a0 = buf1

-                                        | %a1 = buf2

-                                        | %a2 = len

-    lea.l       -15(%a0, %a2.l), %a2    | %a2 = end address - 15

-    cmp.l       %a0, %a2                | end address <= buf1?

-    bls.b       .no_lines               | not at least a line? leave

-.loop:                                  |

-    movem.l     (%a0), %d0-%d3          | read four longwords from buf1

-    movem.l     (%a1), %d4-%d7          | read four longwords from buf2

-    movem.l     %d4-%d7, (%a0)          | write buf2 data to buf1

-    movem.l     %d0-%d3, (%a1)          | write buf1 data to buf2

-    lea.l       16(%a0), %a0            | buf1 += 16

-    lea.l       16(%a1), %a1            | buf2 += 16

-    cmp.l       %a0, %a2                | %a0 < %d0?

-    bhi.b       .loop                   | yes? keep exchanging

-.no_lines:                              |

-    movem.l     (%sp), %d2-%d7/%a2      | restore registers

-    lea.l       28(%sp), %sp            |

-    rts                                 |

-.end:

-	.size       memswap128, .end-memswap128