diff options
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 34a2a68818..5e76423abf 100644 --- a/apps/codecs/libmad/SOURCES +++ b/apps/codecs/libmad/SOURCES | |||
@@ -9,6 +9,6 @@ stream.c | |||
9 | synth.c | 9 | synth.c |
10 | timer.c | 10 | timer.c |
11 | version.c | 11 | version.c |
12 | #if CONFIG_CPU==MCF5249 && !defined(SIMULATOR) | 12 | #ifdef CPU_COLDFIRE && !defined(SIMULATOR) |
13 | imdct_mcf5249.S | 13 | imdct_mcf5249.S |
14 | #endif | 14 | #endif |
diff --git a/apps/codecs/libmad/global.h b/apps/codecs/libmad/global.h index bba9f062bf..17dd1dd804 100644 --- a/apps/codecs/libmad/global.h +++ b/apps/codecs/libmad/global.h | |||
@@ -24,7 +24,7 @@ | |||
24 | # ifndef LIBMAD_GLOBAL_H | 24 | # ifndef LIBMAD_GLOBAL_H |
25 | # define LIBMAD_GLOBAL_H | 25 | # define LIBMAD_GLOBAL_H |
26 | 26 | ||
27 | #if CONFIG_CPU==MCF5249 && !defined(SIMULATOR) | 27 | #ifdef CPU_COLDFIRE && !defined(SIMULATOR) |
28 | #define FPM_COLDFIRE_EMAC | 28 | #define FPM_COLDFIRE_EMAC |
29 | #else | 29 | #else |
30 | #define FPM_DEFAULT | 30 | #define FPM_DEFAULT |
diff --git a/apps/codecs/libmad/layer3.c b/apps/codecs/libmad/layer3.c index aa46a71c16..e8b80e7ce4 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]) | |||
1765 | * DESCRIPTION: perform X[18]->x[36] IMDCT | 1765 | * DESCRIPTION: perform X[18]->x[36] IMDCT |
1766 | */ | 1766 | */ |
1767 | 1767 | ||
1768 | # if CONFIG_CPU==MCF5249 && !defined(SIMULATOR) | 1768 | # ifdef CPU_COLDFIRE && !defined(SIMULATOR) |
1769 | /* emac optimized imdct36, it is very ugly and i hope to replace it soon. | 1769 | /* emac optimized imdct36, it is very ugly and i hope to replace it soon. |
1770 | * for now it is actually somewhat faster than the stock implementation. | 1770 | * for now it is actually somewhat faster than the stock implementation. |
1771 | */ | 1771 | */ |
@@ -2633,7 +2633,7 @@ void imdct36(mad_fixed_t const X[18], mad_fixed_t x[36]) | |||
2633 | 2633 | ||
2634 | x[26] = x[27] = MAD_F_MLZ(hi, lo) + t5; | 2634 | x[26] = x[27] = MAD_F_MLZ(hi, lo) + t5; |
2635 | } | 2635 | } |
2636 | #endif /* MCF5249 */ | 2636 | #endif /* CPU_COLDFIRE */ |
2637 | 2637 | ||
2638 | # endif | 2638 | # endif |
2639 | 2639 | ||
@@ -2729,7 +2729,7 @@ void III_imdct_l(mad_fixed_t const X[18], mad_fixed_t z[36], | |||
2729 | * DESCRIPTION: perform IMDCT and windowing for short blocks | 2729 | * DESCRIPTION: perform IMDCT and windowing for short blocks |
2730 | */ | 2730 | */ |
2731 | 2731 | ||
2732 | # if CONFIG_CPU==MCF5249 && !defined(SIMULATOR) | 2732 | # ifdef CPU_COLDFIRE && !defined(SIMULATOR) |
2733 | void III_imdct_s(mad_fixed_t const X[18], mad_fixed_t z[36]); | 2733 | void III_imdct_s(mad_fixed_t const X[18], mad_fixed_t z[36]); |
2734 | #else | 2734 | #else |
2735 | 2735 | ||