diff options
| author | Christian Gmeiner <christian.gmeiner@gmail.com> | 2005-07-18 12:40:29 +0000 |
|---|---|---|
| committer | Christian Gmeiner <christian.gmeiner@gmail.com> | 2005-07-18 12:40:29 +0000 |
| commit | c6ff1f5eb541f9557e7fbc1449df9c024fd59a03 (patch) | |
| tree | ae38d203a3fcc15b1d897afe31c5a4f9099ac247 /apps/codecs/libmad | |
| parent | f5df9cd81c685b01b5e72e4a05471d97ffa7d260 (diff) | |
| download | rockbox-c6ff1f5eb541f9557e7fbc1449df9c024fd59a03.zip rockbox-c6ff1f5eb541f9557e7fbc1449df9c024fd59a03.tar.gz rockbox-c6ff1f5eb541f9557e7fbc1449df9c024fd59a03.tar.bz2 rockbox-c6ff1f5eb541f9557e7fbc1449df9c024fd59a03.tar.xz | |
Added CPU_COLDFIRE define - one step closer to iAudio-port
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7186 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/codecs/libmad')
| -rw-r--r-- | apps/codecs/libmad/SOURCES | 2 | ||||
| -rw-r--r-- | apps/codecs/libmad/global.h | 2 | ||||
| -rw-r--r-- | apps/codecs/libmad/layer3.c | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/apps/codecs/libmad/SOURCES b/apps/codecs/libmad/SOURCES index 34a2a68..5e76423 100644 --- a/apps/codecs/libmad/SOURCES +++ b/apps/codecs/libmad/SOURCES @@ -9,6 +9,6 @@ stream.c synth.c timer.c version.c -#if CONFIG_CPU==MCF5249 && !defined(SIMULATOR) +#ifdef CPU_COLDFIRE && !defined(SIMULATOR) imdct_mcf5249.S #endif diff --git a/apps/codecs/libmad/global.h b/apps/codecs/libmad/global.h index bba9f06..17dd1dd 100644 --- a/apps/codecs/libmad/global.h +++ b/apps/codecs/libmad/global.h @@ -24,7 +24,7 @@ # ifndef LIBMAD_GLOBAL_H # define LIBMAD_GLOBAL_H -#if CONFIG_CPU==MCF5249 && !defined(SIMULATOR) +#ifdef CPU_COLDFIRE && !defined(SIMULATOR) #define FPM_COLDFIRE_EMAC #else #define FPM_DEFAULT diff --git a/apps/codecs/libmad/layer3.c b/apps/codecs/libmad/layer3.c index aa46a71..e8b80e7 100644 --- a/apps/codecs/libmad/layer3.c +++ b/apps/codecs/libmad/layer3.c @@ -1765,7 +1765,7 @@ void imdct36(mad_fixed_t const x[18], mad_fixed_t y[36]) * DESCRIPTION: perform X[18]->x[36] IMDCT */ -# if CONFIG_CPU==MCF5249 && !defined(SIMULATOR) +# ifdef CPU_COLDFIRE && !defined(SIMULATOR) /* 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. */ @@ -2633,7 +2633,7 @@ void imdct36(mad_fixed_t const X[18], mad_fixed_t x[36]) x[26] = x[27] = MAD_F_MLZ(hi, lo) + t5; } -#endif /* MCF5249 */ +#endif /* CPU_COLDFIRE */ # endif @@ -2729,7 +2729,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 CONFIG_CPU==MCF5249 && !defined(SIMULATOR) +# ifdef CPU_COLDFIRE && !defined(SIMULATOR) void III_imdct_s(mad_fixed_t const X[18], mad_fixed_t z[36]); #else |