summaryrefslogtreecommitdiff
path: root/apps/codecs
diff options
context:
space:
mode:
authorDave Chapman <dave@dchapman.com>2007-07-04 20:27:26 +0000
committerDave Chapman <dave@dchapman.com>2007-07-04 20:27:26 +0000
commitba3f4ed565ed9fdfb696f44193958e68d6acc19f (patch)
treec032043a2e55adbf03d6298bb9f3115d3f1dea84 /apps/codecs
parente7cdd6cbc6040c3c6225580ba155edfdfd35efb1 (diff)
downloadrockbox-ba3f4ed565ed9fdfb696f44193958e68d6acc19f.zip
rockbox-ba3f4ed565ed9fdfb696f44193958e68d6acc19f.tar.gz
rockbox-ba3f4ed565ed9fdfb696f44193958e68d6acc19f.tar.bz2
rockbox-ba3f4ed565ed9fdfb696f44193958e68d6acc19f.tar.xz
Remove some unused code
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13788 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/codecs')
-rw-r--r--apps/codecs/libwma/bswap.h127
-rw-r--r--apps/codecs/libwma/wmadeci.c22
2 files changed, 0 insertions, 149 deletions
diff --git a/apps/codecs/libwma/bswap.h b/apps/codecs/libwma/bswap.h
deleted file mode 100644
index cacaac4..0000000
--- a/apps/codecs/libwma/bswap.h
+++ /dev/null
@@ -1,127 +0,0 @@
-/**
- * @file bswap.h
- * byte swap.
- */
-
-#ifndef __BSWAP_H__
-#define __BSWAP_H__
-
-#include <config.h>
-
-#ifdef ARCH_X86
-static inline unsigned short ByteSwap16(unsigned short x)
-{
- __asm("xchgb %b0,%h0" :
- "=q" (x) :
- "0" (x));
- return x;
-}
-#define bswap_16(x) ByteSwap16(x)
-
-static inline unsigned int ByteSwap32(unsigned int x)
-{
-#if __CPU__ > 386
- __asm("bswap %0":
- "=r" (x) :
-#else
- __asm("xchgb %b0,%h0\n"
- " rorl $16,%0\n"
- " xchgb %b0,%h0":
- "=q" (x) :
-#endif
- "0" (x));
- return x;
-}
-#define bswap_32(x) ByteSwap32(x)
-
-static inline unsigned long long int ByteSwap64(unsigned long long int x)
-{
- register union { __extension__ uint64_t __ll;
- uint32_t __l[2]; } __x;
- asm("xchgl %0,%1":
- "=r"(__x.__l[0]),"=r"(__x.__l[1]):
- "0"(bswap_32((unsigned long)x)),"1"(bswap_32((unsigned long)(x>>32))));
- return __x.__ll;
-}
-#define bswap_64(x) ByteSwap64(x)
-
-#elif defined(ARCH_SH4)
-
-static inline uint16_t ByteSwap16(uint16_t x) {
- __asm__("swap.b %0,%0":"=r"(x):"0"(x));
- return x;
-}
-
-static inline uint32_t ByteSwap32(uint32_t x) {
- __asm__(
- "swap.b %0,%0\n"
- "swap.w %0,%0\n"
- "swap.b %0,%0\n"
- :"=r"(x):"0"(x));
- return x;
-}
-
-#define bswap_16(x) ByteSwap16(x)
-#define bswap_32(x) ByteSwap32(x)
-
-static inline uint64_t ByteSwap64(uint64_t x)
-{
- union {
- uint64_t ll;
- struct {
- uint32_t l,h;
- } l;
- } r;
- r.l.l = bswap_32 (x);
- r.l.h = bswap_32 (x>>32);
- return r.ll;
-}
-#define bswap_64(x) ByteSwap64(x)
-
-#else
-
-#define bswap_16(x) (((x) & 0x00ff) << 8 | ((x) & 0xff00) >> 8)
-
-
-// code from bits/byteswap.h (C) 1997, 1998 Free Software Foundation, Inc.
-#define bswap_32(x) \
- ((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >> 8) | \
- (((x) & 0x0000ff00) << 8) | (((x) & 0x000000ff) << 24))
-
-static inline uint64_t ByteSwap64(uint64_t x)
-{
- union {
- uint64_t ll;
- uint32_t l[2];
- } w, r;
- w.ll = x;
- r.l[0] = bswap_32 (w.l[1]);
- r.l[1] = bswap_32 (w.l[0]);
- return r.ll;
-}
-#define bswap_64(x) ByteSwap64(x)
-
-#endif /* !ARCH_X86 */
-
-#endif /* !HAVE_BYTESWAP_H */
-
-// be2me ... BigEndian to MachineEndian
-// le2me ... LittleEndian to MachineEndian
-
-#ifdef ROCKBOX_BIG_ENDIAN
-#define be2me_16(x) (x)
-#define be2me_32(x) (x)
-#define be2me_64(x) (x)
-#define le2me_16(x) bswap_16(x)
-#define le2me_32(x) bswap_32(x)
-#define le2me_64(x) bswap_64(x)
-#else
-#define be2me_16(x) bswap_16(x)
-#define be2me_32(x) bswap_32(x)
-#define be2me_64(x) bswap_64(x)
-#define le2me_16(x) (x)
-#define le2me_32(x) (x)
-#define le2me_64(x) (x)
-#endif
-
-#endif /* __BSWAP_H__ */
diff --git a/apps/codecs/libwma/wmadeci.c b/apps/codecs/libwma/wmadeci.c
index 2965138..e48720c 100644
--- a/apps/codecs/libwma/wmadeci.c
+++ b/apps/codecs/libwma/wmadeci.c
@@ -28,28 +28,6 @@
#include "wmadec.h"
#include "wmafixed.c"
-
-
-#define ALT_BITSTREAM_READER
-
-#define unaligned32(a) (*(uint32_t*)(a))
-
-uint16_t bswap_16(uint16_t x)
-{
- uint16_t hi = x & 0xff00;
- uint16_t lo = x & 0x00ff;
- return (hi >> 8) | (lo << 8);
-}
-
-uint32_t bswap_32(uint32_t x)
-{
- uint32_t b1 = x & 0xff000000;
- uint32_t b2 = x & 0x00ff0000;
- uint32_t b3 = x & 0x0000ff00;
- uint32_t b4 = x & 0x000000ff;
- return (b1 >> 24) | (b2 >> 8) | (b3 << 8) | (b4 << 24);
-}
-
#ifdef CPU_ARM
static inline
void CMUL(fixed32 *x, fixed32 *y,