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/libmad | |
| parent | 1fc2d91a83f6154c11a203c8da993d647799691a (diff) | |
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/libmad')
| -rw-r--r-- | apps/codecs/libmad/global.h | 4 | ||||
| -rw-r--r-- | apps/codecs/libmad/layer3.c | 8 | ||||
| -rw-r--r-- | apps/codecs/libmad/synth.c | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/apps/codecs/libmad/global.h b/apps/codecs/libmad/global.h index 1ecfea1c14..38e4aade35 100644 --- a/apps/codecs/libmad/global.h +++ b/apps/codecs/libmad/global.h @@ -24,9 +24,9 @@ # ifndef LIBMAD_GLOBAL_H # define LIBMAD_GLOBAL_H -#if defined(CPU_COLDFIRE) && !defined(SIMULATOR) +#if defined(CPU_COLDFIRE) #define FPM_COLDFIRE_EMAC -#elif defined(CPU_ARM) && !defined(SIMULATOR) +#elif defined(CPU_ARM) #define FPM_ARM #define ASO_IMDCT #else diff --git a/apps/codecs/libmad/layer3.c b/apps/codecs/libmad/layer3.c index 64169a7cbd..38e488ddbb 100644 --- a/apps/codecs/libmad/layer3.c +++ b/apps/codecs/libmad/layer3.c @@ -46,7 +46,7 @@ # include "layer3.h" /* depending on the cpu "leftshift32" may be supported or not */ -# if defined(CPU_COLDFIRE) && !defined(SIMULATOR) +# if defined(CPU_COLDFIRE) #define MAXLSHIFT 32 #else #define MAXLSHIFT 31 @@ -1569,7 +1569,7 @@ void III_aliasreduce(mad_fixed_t xr[576], int lines) # if defined(ASO_ZEROCHECK) if (a | b) { # endif -# if defined(CPU_COLDFIRE) && !defined(SIMULATOR) +# if defined(CPU_COLDFIRE) (void)hi, (void)lo; asm volatile ("mac.l %[a], %[csi], %%acc0\n\t" "msac.l %[b], %[cai], %%acc0\n\t" @@ -1796,7 +1796,7 @@ void imdct36(mad_fixed_t const x[18], mad_fixed_t y[36]) * DESCRIPTION: perform X[18]->x[36] IMDCT */ -# if defined(CPU_COLDFIRE) && !defined(SIMULATOR) +# if defined(CPU_COLDFIRE) /* emac optimized imdct36, it is very ugly and i hope to replace it soon. * for now it is actually somewhat faster than the stock implementation. */ @@ -2813,7 +2813,7 @@ void III_imdct_l(mad_fixed_t const X[18], mad_fixed_t z[36], * DESCRIPTION: perform IMDCT and windowing for short blocks */ -# if defined(CPU_COLDFIRE) && !defined(SIMULATOR) +# if defined(CPU_COLDFIRE) void III_imdct_s(mad_fixed_t const X[18], mad_fixed_t z[36]); #else diff --git a/apps/codecs/libmad/synth.c b/apps/codecs/libmad/synth.c index 2da8f64db7..8613f77f79 100644 --- a/apps/codecs/libmad/synth.c +++ b/apps/codecs/libmad/synth.c @@ -42,7 +42,7 @@ void mad_synth_init(struct mad_synth *synth) synth->pcm.samplerate = 0; synth->pcm.channels = 0; synth->pcm.length = 0; - #if defined(CPU_COLDFIRE) && !defined(SIMULATOR) + #if defined(CPU_COLDFIRE) /* init the emac unit here, since this function should always be called before using libmad */ coldfire_set_macsr(EMAC_FRACTIONAL | EMAC_SATURATE | EMAC_ROUND); |