diff options
author | Mohamed Tarek <mt@rockbox.org> | 2009-08-14 17:31:08 +0000 |
---|---|---|
committer | Mohamed Tarek <mt@rockbox.org> | 2009-08-14 17:31:08 +0000 |
commit | 4f26112b1b50b644c3c3245906c996c16bb0c616 (patch) | |
tree | e81e88797b6c2deca412f2a1676530d778229b31 /apps/codecs/libatrac | |
parent | 3ee45ab7bed6447f09aaf1a24f5d35f212cd8b14 (diff) | |
download | rockbox-4f26112b1b50b644c3c3245906c996c16bb0c616.tar.gz rockbox-4f26112b1b50b644c3c3245906c996c16bb0c616.zip |
Revert the asm fixmul stuff for now.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22310 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/codecs/libatrac')
-rw-r--r-- | apps/codecs/libatrac/fixp_math.h | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/apps/codecs/libatrac/fixp_math.h b/apps/codecs/libatrac/fixp_math.h index ed72cf6a0f..b6621b6f1a 100644 --- a/apps/codecs/libatrac/fixp_math.h +++ b/apps/codecs/libatrac/fixp_math.h | |||
@@ -1,9 +1,5 @@ | |||
1 | #include <stdlib.h> | 1 | #include <stdlib.h> |
2 | #ifdef ROCKBOX | 2 | #include <inttypes.h> |
3 | #include "asm_arm.h" | ||
4 | #include "asm_mcf5249.h" | ||
5 | #include "codeclib_misc.h" | ||
6 | #endif | ||
7 | 3 | ||
8 | /* Macros for converting between various fixed-point representations and floating point. */ | 4 | /* Macros for converting between various fixed-point representations and floating point. */ |
9 | #define ONE_16 (1L << 16) | 5 | #define ONE_16 (1L << 16) |
@@ -13,12 +9,7 @@ | |||
13 | #define fix31tof64(x) (float)((float)(x) / (float)(1 << 31)) | 9 | #define fix31tof64(x) (float)((float)(x) / (float)(1 << 31)) |
14 | 10 | ||
15 | /* Fixed point math routines for use in atrac3.c */ | 11 | /* Fixed point math routines for use in atrac3.c */ |
16 | #ifdef ROCKBOX | ||
17 | #define fixmul31(x,y) (MULT31(x,y)) | ||
18 | #define fixmul16(x,y) (MULT32(x,y)) | ||
19 | #else | ||
20 | inline int32_t fixmul16(int32_t x, int32_t y); | 12 | inline int32_t fixmul16(int32_t x, int32_t y); |
21 | inline int32_t fixmul31(int32_t x, int32_t y); | 13 | inline int32_t fixmul31(int32_t x, int32_t y); |
22 | #endif /* ROCKBOX */ | ||
23 | inline int32_t fixdiv16(int32_t x, int32_t y); | 14 | inline int32_t fixdiv16(int32_t x, int32_t y); |
24 | inline int32_t fastSqrt(int32_t n); | 15 | inline int32_t fastSqrt(int32_t n); |