diff options
| author | Dave Chapman <dave@dchapman.com> | 2007-05-10 13:16:08 +0000 |
|---|---|---|
| committer | Dave Chapman <dave@dchapman.com> | 2007-05-10 13:16:08 +0000 |
| commit | f02cba80967b7e42d03962625394bf5d1691a59c (patch) | |
| tree | ab752be0024ec544500eaf6fcba4207848c9a89e /apps/codecs/libmusepack | |
| parent | 1fc2d91a83f6154c11a203c8da993d647799691a (diff) | |
| download | rockbox-f02cba80967b7e42d03962625394bf5d1691a59c.zip rockbox-f02cba80967b7e42d03962625394bf5d1691a59c.tar.gz rockbox-f02cba80967b7e42d03962625394bf5d1691a59c.tar.bz2 rockbox-f02cba80967b7e42d03962625394bf5d1691a59c.tar.xz | |
Code cleaning - remove some unnecessary defined(SIMULATOR) checks
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13369 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/codecs/libmusepack')
| -rw-r--r-- | apps/codecs/libmusepack/math.h | 4 | ||||
| -rw-r--r-- | apps/codecs/libmusepack/mpc_decoder.c | 2 | ||||
| -rw-r--r-- | apps/codecs/libmusepack/synth_filter.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/apps/codecs/libmusepack/math.h b/apps/codecs/libmusepack/math.h index eb9b0e9..f9e9d08 100644 --- a/apps/codecs/libmusepack/math.h +++ b/apps/codecs/libmusepack/math.h @@ -68,7 +68,7 @@ typedef mpc_int64_t MPC_SAMPLE_FORMAT_MULTIPLY; #define MAKE_MPC_SAMPLE(X) (MPC_SAMPLE_FORMAT)((double)(X) * (double)(((mpc_int64_t)1)<<MPC_FIXED_POINT_FRACTPART)) #define MAKE_MPC_SAMPLE_EX(X,Y) (MPC_SAMPLE_FORMAT)((double)(X) * (double)(((mpc_int64_t)1)<<(Y))) -#if defined(CPU_COLDFIRE) && !defined(SIMULATOR) +#if defined(CPU_COLDFIRE) #define MPC_MULTIPLY(X,Y) mpc_multiply((X), (Y)) #define MPC_MULTIPLY_EX(X,Y,Z) mpc_multiply_ex((X), (Y), (Z)) @@ -158,7 +158,7 @@ static inline MPC_SAMPLE_FORMAT MPC_MULTIPLY_EX(MPC_SAMPLE_FORMAT item1,MPC_SAMP #ifdef MPC_HAVE_MULHIGH #define MPC_MULTIPLY_FRACT(X,Y) _MulHigh(X,Y) #else -#if defined(CPU_COLDFIRE) && !defined(SIMULATOR) +#if defined(CPU_COLDFIRE) /* loses one bit of accuracy. the rest of the macros won't be as easy as this... */ #define MPC_MULTIPLY_FRACT(X,Y) \ diff --git a/apps/codecs/libmusepack/mpc_decoder.c b/apps/codecs/libmusepack/mpc_decoder.c index 89d7254..a5a24d6 100644 --- a/apps/codecs/libmusepack/mpc_decoder.c +++ b/apps/codecs/libmusepack/mpc_decoder.c @@ -1492,7 +1492,7 @@ void mpc_decoder_setup(mpc_decoder *d, mpc_reader *r) d->Y_L = Y_L; d->Y_R = Y_R; - #if defined(CPU_COLDFIRE)&& !defined(SIMULATOR) + #if defined(CPU_COLDFIRE) coldfire_set_macsr(EMAC_FRACTIONAL | EMAC_SATURATE); #endif } diff --git a/apps/codecs/libmusepack/synth_filter.c b/apps/codecs/libmusepack/synth_filter.c index 2b14c26..0dabe59 100644 --- a/apps/codecs/libmusepack/synth_filter.c +++ b/apps/codecs/libmusepack/synth_filter.c @@ -343,7 +343,7 @@ static void Synthese_Filter_float_internal(MPC_SAMPLE_FORMAT * OutData,MPC_SAMPL - #if defined(CPU_COLDFIRE) && !defined(SIMULATOR) + #if defined(CPU_COLDFIRE) for ( k = 0; k < 32; k++, D += 16, V++ ) { asm volatile ( "movem.l (%[D]), %%d0-%%d3 \n\t" @@ -372,7 +372,7 @@ static void Synthese_Filter_float_internal(MPC_SAMPLE_FORMAT * OutData,MPC_SAMPL : [Data] "+a" (Data) : [V] "a" (V), [D] "a" (D) : "d0", "d1", "d2", "d3", "a5"); - #elif defined(CPU_ARM) && !defined(SIMULATOR) + #elif defined(CPU_ARM) for ( k = 0; k < 32; k++, V++ ) { asm volatile ( "ldmia %[D]!, { r0-r3 } \n\t" |