diff options
30 files changed, 55 insertions, 50 deletions
diff --git a/apps/codecs/Tremor/asm_mcf5249.h b/apps/codecs/Tremor/asm_mcf5249.h index 3aaa66b4af..7b071f96c2 100644 --- a/apps/codecs/Tremor/asm_mcf5249.h +++ b/apps/codecs/Tremor/asm_mcf5249.h | |||
@@ -19,7 +19,7 @@ | |||
19 | 19 | ||
20 | #include "os_types.h" | 20 | #include "os_types.h" |
21 | 21 | ||
22 | #if CONFIG_CPU == MCF5249 && !defined(SIMULATOR) | 22 | #ifdef CPU_COLDFIRE && !defined(SIMULATOR) |
23 | 23 | ||
24 | /* attribute for 16-byte alignment */ | 24 | /* attribute for 16-byte alignment */ |
25 | #define LINE_ATTR __attribute__ ((aligned (16))) | 25 | #define LINE_ATTR __attribute__ ((aligned (16))) |
diff --git a/apps/codecs/Tremor/block.c b/apps/codecs/Tremor/block.c index f51622b5ed..fb451f6868 100644 --- a/apps/codecs/Tremor/block.c +++ b/apps/codecs/Tremor/block.c | |||
@@ -260,7 +260,7 @@ int vorbis_synthesis_blockin(vorbis_dsp_state *v,vorbis_block *vb){ | |||
260 | vorbis_info *vi=v->vi; | 260 | vorbis_info *vi=v->vi; |
261 | codec_setup_info *ci=(codec_setup_info *)vi->codec_setup; | 261 | codec_setup_info *ci=(codec_setup_info *)vi->codec_setup; |
262 | private_state *b=v->backend_state; | 262 | private_state *b=v->backend_state; |
263 | #if CONFIG_CPU == MCF5249 | 263 | #ifdef CPU_COLDFIRE |
264 | int j; | 264 | int j; |
265 | #else | 265 | #else |
266 | int i,j; | 266 | int i,j; |
@@ -310,7 +310,7 @@ int vorbis_synthesis_blockin(vorbis_dsp_state *v,vorbis_block *vb){ | |||
310 | /* large/large */ | 310 | /* large/large */ |
311 | ogg_int32_t *pcm=v->pcm[j]+prevCenter; | 311 | ogg_int32_t *pcm=v->pcm[j]+prevCenter; |
312 | ogg_int32_t *p=vb->pcm[j]; | 312 | ogg_int32_t *p=vb->pcm[j]; |
313 | #if CONFIG_CPU == MCF5249 | 313 | #ifdef CPU_COLDFIRE |
314 | mcf5249_vect_add(pcm, p, n1); | 314 | mcf5249_vect_add(pcm, p, n1); |
315 | #else | 315 | #else |
316 | for(i=0;i<n1;i++) | 316 | for(i=0;i<n1;i++) |
@@ -320,7 +320,7 @@ int vorbis_synthesis_blockin(vorbis_dsp_state *v,vorbis_block *vb){ | |||
320 | /* large/small */ | 320 | /* large/small */ |
321 | ogg_int32_t *pcm=v->pcm[j]+prevCenter+n1/2-n0/2; | 321 | ogg_int32_t *pcm=v->pcm[j]+prevCenter+n1/2-n0/2; |
322 | ogg_int32_t *p=vb->pcm[j]; | 322 | ogg_int32_t *p=vb->pcm[j]; |
323 | #if CONFIG_CPU == MCF5249 | 323 | #ifdef CPU_COLDFIRE |
324 | mcf5249_vect_add(pcm, p, n0); | 324 | mcf5249_vect_add(pcm, p, n0); |
325 | #else | 325 | #else |
326 | for(i=0;i<n0;i++) | 326 | for(i=0;i<n0;i++) |
@@ -332,7 +332,7 @@ int vorbis_synthesis_blockin(vorbis_dsp_state *v,vorbis_block *vb){ | |||
332 | /* small/large */ | 332 | /* small/large */ |
333 | ogg_int32_t *pcm=v->pcm[j]+prevCenter; | 333 | ogg_int32_t *pcm=v->pcm[j]+prevCenter; |
334 | ogg_int32_t *p=vb->pcm[j]+n1/2-n0/2; | 334 | ogg_int32_t *p=vb->pcm[j]+n1/2-n0/2; |
335 | #if CONFIG_CPU == MCF5249 | 335 | #ifdef CPU_COLDFIRE |
336 | mcf5249_vect_add(pcm, p, n0); | 336 | mcf5249_vect_add(pcm, p, n0); |
337 | mcf5249_vect_copy(&pcm[n0], &p[n0], n1/2-n0/2); | 337 | mcf5249_vect_copy(&pcm[n0], &p[n0], n1/2-n0/2); |
338 | #else | 338 | #else |
@@ -345,7 +345,7 @@ int vorbis_synthesis_blockin(vorbis_dsp_state *v,vorbis_block *vb){ | |||
345 | /* small/small */ | 345 | /* small/small */ |
346 | ogg_int32_t *pcm=v->pcm[j]+prevCenter; | 346 | ogg_int32_t *pcm=v->pcm[j]+prevCenter; |
347 | ogg_int32_t *p=vb->pcm[j]; | 347 | ogg_int32_t *p=vb->pcm[j]; |
348 | #if CONFIG_CPU == MCF5249 | 348 | #ifdef CPU_COLDFIRE |
349 | mcf5249_vect_add(pcm, p, n0); | 349 | mcf5249_vect_add(pcm, p, n0); |
350 | #else | 350 | #else |
351 | for(i=0;i<n0;i++) | 351 | for(i=0;i<n0;i++) |
@@ -358,7 +358,7 @@ int vorbis_synthesis_blockin(vorbis_dsp_state *v,vorbis_block *vb){ | |||
358 | { | 358 | { |
359 | ogg_int32_t *pcm=v->pcm[j]+thisCenter; | 359 | ogg_int32_t *pcm=v->pcm[j]+thisCenter; |
360 | ogg_int32_t *p=vb->pcm[j]+n; | 360 | ogg_int32_t *p=vb->pcm[j]+n; |
361 | #if CONFIG_CPU == MCF5249 | 361 | #ifdef CPU_COLDFIRE |
362 | mcf5249_vect_copy(pcm, p, n); | 362 | mcf5249_vect_copy(pcm, p, n); |
363 | #else | 363 | #else |
364 | for(i=0;i<n;i++) | 364 | for(i=0;i<n;i++) |
diff --git a/apps/codecs/Tremor/vorbisfile.c b/apps/codecs/Tremor/vorbisfile.c index c8fad7372b..060b0bac89 100644 --- a/apps/codecs/Tremor/vorbisfile.c +++ b/apps/codecs/Tremor/vorbisfile.c | |||
@@ -1291,7 +1291,7 @@ int ov_pcm_seek(OggVorbis_File *vf,ogg_int64_t pos){ | |||
1291 | if(ret<0)return(ret); | 1291 | if(ret<0)return(ret); |
1292 | _make_decode_ready(vf); | 1292 | _make_decode_ready(vf); |
1293 | 1293 | ||
1294 | #if CONFIG_CPU == MCF5249 && !defined(SIMULATOR) | 1294 | #ifdef CPU_COLDFIRE && !defined(SIMULATOR) |
1295 | mcf5249_init_mac(); | 1295 | mcf5249_init_mac(); |
1296 | #endif | 1296 | #endif |
1297 | 1297 | ||
@@ -1552,7 +1552,7 @@ long ov_read(OggVorbis_File *vf,char *buffer,int bytes_req,int *bitstream){ | |||
1552 | 1552 | ||
1553 | if(vf->ready_state<OPENED)return(OV_EINVAL); | 1553 | if(vf->ready_state<OPENED)return(OV_EINVAL); |
1554 | 1554 | ||
1555 | #if CONFIG_CPU == MCF5249 && !defined(SIMULATOR) | 1555 | #ifdef CPU_COLDFIRE && !defined(SIMULATOR) |
1556 | mcf5249_init_mac(); | 1556 | mcf5249_init_mac(); |
1557 | #endif | 1557 | #endif |
1558 | 1558 | ||
diff --git a/apps/codecs/Tremor/window.c b/apps/codecs/Tremor/window.c index 5a9f4ec6a6..5c7b83f4f2 100644 --- a/apps/codecs/Tremor/window.c +++ b/apps/codecs/Tremor/window.c | |||
@@ -68,7 +68,7 @@ void _vorbis_apply_window(ogg_int32_t *d,const void *window_p[2], | |||
68 | long rightbegin=n/2+n/4-rn/4; | 68 | long rightbegin=n/2+n/4-rn/4; |
69 | long rightend=rightbegin+rn/2; | 69 | long rightend=rightbegin+rn/2; |
70 | 70 | ||
71 | #if CONFIG_CPU == MCF5249 | 71 | #ifdef CPU_COLDFIRE |
72 | memset((void *)&d[0], 0, sizeof(ogg_int32_t)*leftbegin); | 72 | memset((void *)&d[0], 0, sizeof(ogg_int32_t)*leftbegin); |
73 | /* mcf5249_vect_zero(&d[0], leftbegin); */ | 73 | /* mcf5249_vect_zero(&d[0], leftbegin); */ |
74 | mcf5249_vect_mult_fw(&d[leftbegin], &window[lW][0], leftend-leftbegin); | 74 | mcf5249_vect_mult_fw(&d[leftbegin], &window[lW][0], leftend-leftbegin); |
diff --git a/apps/codecs/libFLAC/SOURCES b/apps/codecs/libFLAC/SOURCES index d3a1673c70..d4b6ab532a 100644 --- a/apps/codecs/libFLAC/SOURCES +++ b/apps/codecs/libFLAC/SOURCES | |||
@@ -10,6 +10,6 @@ md5.c | |||
10 | memory.c | 10 | memory.c |
11 | seekable_stream_decoder.c | 11 | seekable_stream_decoder.c |
12 | stream_decoder.c | 12 | stream_decoder.c |
13 | #if CONFIG_CPU==MCF5249 && !defined(SIMULATOR) | 13 | #ifdef CPU_COLDFIRE && !defined(SIMULATOR) |
14 | coldfire.S | 14 | coldfire.S |
15 | #endif | 15 | #endif |
diff --git a/apps/codecs/libFLAC/stream_decoder.c b/apps/codecs/libFLAC/stream_decoder.c index 8ff9c8bbd0..cb622a9695 100644 --- a/apps/codecs/libFLAC/stream_decoder.c +++ b/apps/codecs/libFLAC/stream_decoder.c | |||
@@ -43,7 +43,7 @@ | |||
43 | #include "private/lpc.h" | 43 | #include "private/lpc.h" |
44 | #include "private/memory.h" | 44 | #include "private/memory.h" |
45 | 45 | ||
46 | #if CONFIG_CPU==MCF5249 | 46 | #ifdef CPU_COLDFIRE |
47 | #include <private/coldfire.h> | 47 | #include <private/coldfire.h> |
48 | #endif | 48 | #endif |
49 | 49 | ||
@@ -299,7 +299,7 @@ FLAC_API FLAC__StreamDecoderState FLAC__stream_decoder_init(FLAC__StreamDecoder | |||
299 | */ | 299 | */ |
300 | FLAC__cpu_info(&decoder->private_->cpuinfo); | 300 | FLAC__cpu_info(&decoder->private_->cpuinfo); |
301 | /* first default to the non-asm routines */ | 301 | /* first default to the non-asm routines */ |
302 | #if CONFIG_CPU==MCF5249 && !defined(SIMULATOR) | 302 | #ifdef CPU_COLDFIRE && !defined(SIMULATOR) |
303 | decoder->private_->local_lpc_restore_signal = FLAC__lpc_restore_signal_mcf5249; | 303 | decoder->private_->local_lpc_restore_signal = FLAC__lpc_restore_signal_mcf5249; |
304 | decoder->private_->local_lpc_restore_signal_16bit = FLAC__lpc_restore_signal_mcf5249; | 304 | decoder->private_->local_lpc_restore_signal_16bit = FLAC__lpc_restore_signal_mcf5249; |
305 | decoder->private_->local_lpc_restore_signal_16bit_order8 = FLAC__lpc_restore_signal_mcf5249; | 305 | decoder->private_->local_lpc_restore_signal_16bit_order8 = FLAC__lpc_restore_signal_mcf5249; |
diff --git a/apps/codecs/liba52/a52_internal.h b/apps/codecs/liba52/a52_internal.h index 4de21d9dde..14e5795146 100644 --- a/apps/codecs/liba52/a52_internal.h +++ b/apps/codecs/liba52/a52_internal.h | |||
@@ -141,7 +141,7 @@ typedef int16_t quantizer_t; | |||
141 | #if 0 | 141 | #if 0 |
142 | #define MUL(a,b) ((int)(((int64_t)(a) * (b) + (1 << 29)) >> 30)) | 142 | #define MUL(a,b) ((int)(((int64_t)(a) * (b) + (1 << 29)) >> 30)) |
143 | #define MUL_L(a,b) ((int)(((int64_t)(a) * (b) + (1 << 25)) >> 26)) | 143 | #define MUL_L(a,b) ((int)(((int64_t)(a) * (b) + (1 << 25)) >> 26)) |
144 | #elif CONFIG_CPU==MCF5249 && !defined(SIMULATOR) | 144 | #elif defined(CPU_COLDFIRE) && !defined(SIMULATOR) |
145 | /* loses 1 bit of accuracy */ | 145 | /* loses 1 bit of accuracy */ |
146 | #define MUL(a, b) \ | 146 | #define MUL(a, b) \ |
147 | ({ \ | 147 | ({ \ |
diff --git a/apps/codecs/liba52/parse.c b/apps/codecs/liba52/parse.c index 3025fb54b6..c06381be9e 100644 --- a/apps/codecs/liba52/parse.c +++ b/apps/codecs/liba52/parse.c | |||
@@ -58,7 +58,7 @@ a52_state_t * a52_init (uint32_t mm_accel) | |||
58 | a52_state_t * state; | 58 | a52_state_t * state; |
59 | int i; | 59 | int i; |
60 | 60 | ||
61 | #if CONFIG_CPU==MCF5249 && !defined(SIMULATOR) | 61 | #ifdef CPU_COLDFIRE && !defined(SIMULATOR) |
62 | asm volatile ("move.l #0x30, %macsr"); /* frac. mode with rounding */ | 62 | asm volatile ("move.l #0x30, %macsr"); /* frac. mode with rounding */ |
63 | #endif | 63 | #endif |
64 | /* | 64 | /* |
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 | ||
diff --git a/apps/codecs/libmusepack/math.h b/apps/codecs/libmusepack/math.h index 8d1e50dda5..532f1350c4 100644 --- a/apps/codecs/libmusepack/math.h +++ b/apps/codecs/libmusepack/math.h | |||
@@ -99,7 +99,7 @@ static inline MPC_SAMPLE_FORMAT MPC_MULTIPLY_EX(MPC_SAMPLE_FORMAT item1,MPC_SAMP | |||
99 | #ifdef MPC_HAVE_MULHIGH | 99 | #ifdef MPC_HAVE_MULHIGH |
100 | #define MPC_MULTIPLY_FRACT(X,Y) _MulHigh(X,Y) | 100 | #define MPC_MULTIPLY_FRACT(X,Y) _MulHigh(X,Y) |
101 | #else | 101 | #else |
102 | #if CONFIG_CPU==MCF5249 && !defined(SIMULATOR) | 102 | #ifdef CPU_COLDFIRE && !defined(SIMULATOR) |
103 | /* loses one bit of accuracy. | 103 | /* loses one bit of accuracy. |
104 | the rest of the macros won't be as easy as this... */ | 104 | the rest of the macros won't be as easy as this... */ |
105 | #define MPC_MULTIPLY_FRACT(X,Y) \ | 105 | #define MPC_MULTIPLY_FRACT(X,Y) \ |
diff --git a/apps/codecs/libmusepack/synth_filter.c b/apps/codecs/libmusepack/synth_filter.c index 78cf4d1765..105dbb0008 100644 --- a/apps/codecs/libmusepack/synth_filter.c +++ b/apps/codecs/libmusepack/synth_filter.c | |||
@@ -335,7 +335,7 @@ static void Synthese_Filter_float_internal(MPC_SAMPLE_FORMAT * OutData,MPC_SAMPL | |||
335 | { | 335 | { |
336 | mpc_uint32_t n; | 336 | mpc_uint32_t n; |
337 | 337 | ||
338 | #if CONFIG_CPU==MCF5249 && !defined(SIMULATOR) | 338 | #ifdef CPU_COLDFIRE && !defined(SIMULATOR) |
339 | asm volatile ("move.l #0x20, %macsr"); /* fractional emac mode */ | 339 | asm volatile ("move.l #0x20, %macsr"); /* fractional emac mode */ |
340 | #endif | 340 | #endif |
341 | for ( n = 0; n < 36; n++, Y += 32 ) { | 341 | for ( n = 0; n < 36; n++, Y += 32 ) { |
@@ -350,7 +350,7 @@ static void Synthese_Filter_float_internal(MPC_SAMPLE_FORMAT * OutData,MPC_SAMPL | |||
350 | 350 | ||
351 | 351 | ||
352 | for ( k = 0; k < 32; k++, D += 16, V++ ) { | 352 | for ( k = 0; k < 32; k++, D += 16, V++ ) { |
353 | #if CONFIG_CPU==MCF5249 && !defined(SIMULATOR) | 353 | #ifdef CPU_COLDFIRE && !defined(SIMULATOR) |
354 | asm volatile ( | 354 | asm volatile ( |
355 | "movem.l (%[D]), %%d0-%%d3\n\t" | 355 | "movem.l (%[D]), %%d0-%%d3\n\t" |
356 | "move.l (%[V]), %%a5\n\t" | 356 | "move.l (%[V]), %%a5\n\t" |
diff --git a/apps/codecs/libwavpack/SOURCES b/apps/codecs/libwavpack/SOURCES index 17399351fd..28e8fb3584 100644 --- a/apps/codecs/libwavpack/SOURCES +++ b/apps/codecs/libwavpack/SOURCES | |||
@@ -5,7 +5,7 @@ unpack.c | |||
5 | pack.c | 5 | pack.c |
6 | words.c | 6 | words.c |
7 | wputils.c | 7 | wputils.c |
8 | #if CONFIG_CPU==MCF5249 && !defined(SIMULATOR) | 8 | #ifdef CPU_COLDFIRE && !defined(SIMULATOR) |
9 | coldfire.S | 9 | coldfire.S |
10 | #endif | 10 | #endif |
11 | 11 | ||
diff --git a/apps/codecs/libwavpack/unpack.c b/apps/codecs/libwavpack/unpack.c index aaab2aa928..dcc776e42a 100644 --- a/apps/codecs/libwavpack/unpack.c +++ b/apps/codecs/libwavpack/unpack.c | |||
@@ -286,7 +286,7 @@ int read_config_info (WavpackContext *wpc, WavpackMetadata *wpmd) | |||
286 | // samples unpacked, which can be less than the number requested if an error | 286 | // samples unpacked, which can be less than the number requested if an error |
287 | // occurs or the end of the block is reached. | 287 | // occurs or the end of the block is reached. |
288 | 288 | ||
289 | #if CONFIG_CPU==MCF5249 && !defined(SIMULATOR) | 289 | #ifdef CPU_COLDFIRE && !defined(SIMULATOR) |
290 | extern void decorr_stereo_pass_cont_mcf5249 (struct decorr_pass *dpp, long *buffer, long sample_count); | 290 | extern void decorr_stereo_pass_cont_mcf5249 (struct decorr_pass *dpp, long *buffer, long sample_count); |
291 | #else | 291 | #else |
292 | static void decorr_stereo_pass_cont (struct decorr_pass *dpp, long *buffer, long sample_count); | 292 | static void decorr_stereo_pass_cont (struct decorr_pass *dpp, long *buffer, long sample_count); |
@@ -348,7 +348,7 @@ long unpack_samples (WavpackContext *wpc, long *buffer, ulong sample_count) | |||
348 | else | 348 | else |
349 | for (tcount = wps->num_terms, dpp = wps->decorr_passes; tcount--; dpp++) { | 349 | for (tcount = wps->num_terms, dpp = wps->decorr_passes; tcount--; dpp++) { |
350 | decorr_stereo_pass (dpp, buffer, 8); | 350 | decorr_stereo_pass (dpp, buffer, 8); |
351 | #if CONFIG_CPU==MCF5249 && !defined(SIMULATOR) | 351 | #ifdef CPU_COLDFIRE && !defined(SIMULATOR) |
352 | decorr_stereo_pass_cont_mcf5249 (dpp, buffer + 16, sample_count - 8); | 352 | decorr_stereo_pass_cont_mcf5249 (dpp, buffer + 16, sample_count - 8); |
353 | #else | 353 | #else |
354 | decorr_stereo_pass_cont (dpp, buffer + 16, sample_count - 8); | 354 | decorr_stereo_pass_cont (dpp, buffer + 16, sample_count - 8); |
@@ -510,7 +510,7 @@ static void decorr_stereo_pass (struct decorr_pass *dpp, long *buffer, long samp | |||
510 | dpp->weight_B = weight_B; | 510 | dpp->weight_B = weight_B; |
511 | } | 511 | } |
512 | 512 | ||
513 | #if CONFIG_CPU != MCF5249 || defined(SIMULATOR) | 513 | #ifndef CPU_COLDFIRE || defined(SIMULATOR) |
514 | 514 | ||
515 | static void decorr_stereo_pass_cont (struct decorr_pass *dpp, long *buffer, long sample_count) | 515 | static void decorr_stereo_pass_cont (struct decorr_pass *dpp, long *buffer, long sample_count) |
516 | { | 516 | { |
diff --git a/apps/debug_menu.c b/apps/debug_menu.c index 1e88954434..39475dd94a 100644 --- a/apps/debug_menu.c +++ b/apps/debug_menu.c | |||
@@ -713,7 +713,7 @@ bool dbg_ports(void) | |||
713 | return false; | 713 | return false; |
714 | } | 714 | } |
715 | } | 715 | } |
716 | #elif CONFIG_CPU == MCF5249 | 716 | #elif defined(CPU_COLDFIRE) |
717 | unsigned int gpio_out; | 717 | unsigned int gpio_out; |
718 | unsigned int gpio1_out; | 718 | unsigned int gpio1_out; |
719 | unsigned int gpio_read; | 719 | unsigned int gpio_read; |
@@ -1563,7 +1563,7 @@ bool debug_menu(void) | |||
1563 | #if CONFIG_CPU == SH7034 | 1563 | #if CONFIG_CPU == SH7034 |
1564 | { "Dump ROM contents", dbg_save_roms }, | 1564 | { "Dump ROM contents", dbg_save_roms }, |
1565 | #endif | 1565 | #endif |
1566 | #if CONFIG_CPU == SH7034 || CONFIG_CPU == MCF5249 | 1566 | #if CONFIG_CPU == SH7034 || defined(CPU_COLDFIRE) |
1567 | { "View I/O ports", dbg_ports }, | 1567 | { "View I/O ports", dbg_ports }, |
1568 | #endif | 1568 | #endif |
1569 | #ifdef HAVE_ADJUSTABLE_CPU_FREQ | 1569 | #ifdef HAVE_ADJUSTABLE_CPU_FREQ |
diff --git a/apps/dsp.c b/apps/dsp.c index ee14b86973..8e20a68aed 100644 --- a/apps/dsp.c +++ b/apps/dsp.c | |||
@@ -36,7 +36,7 @@ | |||
36 | #define SAMPLE_BUF_SIZE 256 | 36 | #define SAMPLE_BUF_SIZE 256 |
37 | #define RESAMPLE_BUF_SIZE (256 * 4) /* Enough for 11,025 Hz -> 44,100 Hz*/ | 37 | #define RESAMPLE_BUF_SIZE (256 * 4) /* Enough for 11,025 Hz -> 44,100 Hz*/ |
38 | 38 | ||
39 | #if CONFIG_CPU == MCF5249 && !defined(SIMULATOR) | 39 | #ifdef CPU_COLDFIRE && !defined(SIMULATOR) |
40 | 40 | ||
41 | #define INIT() asm volatile ("move.l #0xb0, %macsr") /* frac, round, clip */ | 41 | #define INIT() asm volatile ("move.l #0xb0, %macsr") /* frac, round, clip */ |
42 | /* Multiply 2 32-bit integers and return the 32 most significant bits of the | 42 | /* Multiply 2 32-bit integers and return the 32 most significant bits of the |
diff --git a/apps/plugins/plugin.lds b/apps/plugins/plugin.lds index 41193d950c..8ac3410eeb 100644 --- a/apps/plugins/plugin.lds +++ b/apps/plugins/plugin.lds | |||
@@ -2,7 +2,7 @@ | |||
2 | 2 | ||
3 | /* These output formats should be in the config-files */ | 3 | /* These output formats should be in the config-files */ |
4 | 4 | ||
5 | #if CONFIG_CPU == MCF5249 | 5 | #ifdef CPU_COLDFIRE |
6 | OUTPUT_FORMAT(elf32-m68k) | 6 | OUTPUT_FORMAT(elf32-m68k) |
7 | #else | 7 | #else |
8 | OUTPUT_FORMAT(elf32-sh) | 8 | OUTPUT_FORMAT(elf32-sh) |
diff --git a/firmware/SOURCES b/firmware/SOURCES index 199c4cb80e..2fca3ffab5 100644 --- a/firmware/SOURCES +++ b/firmware/SOURCES | |||
@@ -37,7 +37,7 @@ common/timefuncs.c | |||
37 | #if CONFIG_CPU == SH7034 | 37 | #if CONFIG_CPU == SH7034 |
38 | common/memcpy_a.S | 38 | common/memcpy_a.S |
39 | common/memset_a.S | 39 | common/memset_a.S |
40 | #elif CONFIG_CPU == MCF5249 | 40 | #elif defined(CPU_COLDFIRE) |
41 | common/memcpy.c | 41 | common/memcpy.c |
42 | common/memset_a.S | 42 | common/memset_a.S |
43 | #else | 43 | #else |
diff --git a/firmware/app.lds b/firmware/app.lds index 135e521ef4..ef7cb19d33 100644 --- a/firmware/app.lds +++ b/firmware/app.lds | |||
@@ -1,7 +1,7 @@ | |||
1 | #include "config.h" | 1 | #include "config.h" |
2 | 2 | ||
3 | ENTRY(start) | 3 | ENTRY(start) |
4 | #if CONFIG_CPU == MCF5249 | 4 | #ifdef CPU_COLDFIRE |
5 | OUTPUT_FORMAT(elf32-m68k) | 5 | OUTPUT_FORMAT(elf32-m68k) |
6 | #elif CONFIG_CPU == TCC730 | 6 | #elif CONFIG_CPU == TCC730 |
7 | OUTPUT_FORMAT(elf32-calmrisc16) | 7 | OUTPUT_FORMAT(elf32-calmrisc16) |
@@ -187,7 +187,7 @@ SECTIONS | |||
187 | _iramend = .; | 187 | _iramend = .; |
188 | } > IRAM | 188 | } > IRAM |
189 | 189 | ||
190 | #if CONFIG_CPU == MCF5249 | 190 | #ifdef CPU_COLDFIRE |
191 | .stack : | 191 | .stack : |
192 | { | 192 | { |
193 | *(.stack) | 193 | *(.stack) |
@@ -207,7 +207,7 @@ SECTIONS | |||
207 | } > DRAM | 207 | } > DRAM |
208 | #endif | 208 | #endif |
209 | 209 | ||
210 | #if CONFIG_CPU == MCF5249 | 210 | #ifdef CPU_COLDFIRE |
211 | .bss ADDR(.data) + SIZEOF(.data) + SIZEOF(.iram): | 211 | .bss ADDR(.data) + SIZEOF(.data) + SIZEOF(.iram): |
212 | #else | 212 | #else |
213 | .bss : | 213 | .bss : |
diff --git a/firmware/boot.lds b/firmware/boot.lds index bdab6c9c97..4ce0eb974c 100644 --- a/firmware/boot.lds +++ b/firmware/boot.lds | |||
@@ -1,7 +1,7 @@ | |||
1 | #include "config.h" | 1 | #include "config.h" |
2 | 2 | ||
3 | ENTRY(start) | 3 | ENTRY(start) |
4 | #if CONFIG_CPU == MCF5249 | 4 | #ifdef CPU_COLDFIRE |
5 | OUTPUT_FORMAT(elf32-m68k) | 5 | OUTPUT_FORMAT(elf32-m68k) |
6 | #else | 6 | #else |
7 | OUTPUT_FORMAT(elf32-sh) | 7 | OUTPUT_FORMAT(elf32-sh) |
diff --git a/firmware/common/memcpy_a.S b/firmware/common/memcpy_a.S index e129b99442..3fd3f3f753 100644 --- a/firmware/common/memcpy_a.S +++ b/firmware/common/memcpy_a.S | |||
@@ -170,7 +170,7 @@ _memcpy: | |||
170 | mov r7,r0 /* return dest start address */ | 170 | mov r7,r0 /* return dest start address */ |
171 | .end: | 171 | .end: |
172 | .size _memcpy,.end-_memcpy | 172 | .size _memcpy,.end-_memcpy |
173 | #elif CONFIG_CPU == MCF5249 | 173 | #elif defined(CPU_COLDFIRE) |
174 | .align 2 | 174 | .align 2 |
175 | .global memcpy | 175 | .global memcpy |
176 | .type memcpy,@function | 176 | .type memcpy,@function |
diff --git a/firmware/common/memset_a.S b/firmware/common/memset_a.S index c3499c60c3..ba1e470a48 100644 --- a/firmware/common/memset_a.S +++ b/firmware/common/memset_a.S | |||
@@ -106,7 +106,7 @@ _memset: | |||
106 | 106 | ||
107 | .end: | 107 | .end: |
108 | .size _memset,.end-_memset | 108 | .size _memset,.end-_memset |
109 | #elif CONFIG_CPU == MCF5249 | 109 | #elif defined(CPU_COLDFIRE) |
110 | .global memset | 110 | .global memset |
111 | .type memset,@function | 111 | .type memset,@function |
112 | 112 | ||
diff --git a/firmware/export/config.h b/firmware/export/config.h index 1654072a3a..6b77f0dfc1 100644 --- a/firmware/export/config.h +++ b/firmware/export/config.h | |||
@@ -118,6 +118,11 @@ | |||
118 | /* no known platform */ | 118 | /* no known platform */ |
119 | #endif | 119 | #endif |
120 | 120 | ||
121 | /* define for all cpus from coldfire family */ | ||
122 | #if (CONFIG_CPU == MCF5249) || (CONFIG_CPU == MCF5250) | ||
123 | #define CPU_COLDFIRE | ||
124 | #endif | ||
125 | |||
121 | #ifndef CODEC_SIZE | 126 | #ifndef CODEC_SIZE |
122 | #define CODEC_SIZE 0 | 127 | #define CODEC_SIZE 0 |
123 | #endif | 128 | #endif |
diff --git a/firmware/export/system.h b/firmware/export/system.h index f379b325d3..39663f1087 100644 --- a/firmware/export/system.h +++ b/firmware/export/system.h | |||
@@ -103,7 +103,7 @@ enum { | |||
103 | : /* %0 */ I_CONSTRAINT((char)(mask)), \ | 103 | : /* %0 */ I_CONSTRAINT((char)(mask)), \ |
104 | /* %1 */ "z"(address-GBR)) | 104 | /* %1 */ "z"(address-GBR)) |
105 | 105 | ||
106 | #elif CONFIG_CPU == MCF5249 | 106 | #elif defined(CPU_COLDFIRE) |
107 | #define or_l(mask, address) \ | 107 | #define or_l(mask, address) \ |
108 | asm \ | 108 | asm \ |
109 | ("or.l %0,(%1)" \ | 109 | ("or.l %0,(%1)" \ |
@@ -182,7 +182,7 @@ static inline unsigned long SWAB32(unsigned long value) | |||
182 | 182 | ||
183 | #define invalidate_icache() | 183 | #define invalidate_icache() |
184 | 184 | ||
185 | #elif CONFIG_CPU == MCF5249 | 185 | #elif defined(CPU_COLDFIRE) |
186 | #define HIGHEST_IRQ_LEVEL (7<<8) | 186 | #define HIGHEST_IRQ_LEVEL (7<<8) |
187 | static inline int set_irq_level(int level) | 187 | static inline int set_irq_level(int level) |
188 | { | 188 | { |
diff --git a/firmware/kernel.c b/firmware/kernel.c index 5fec25d9b8..44927cd1c3 100644 --- a/firmware/kernel.c +++ b/firmware/kernel.c | |||
@@ -205,7 +205,7 @@ void IMIA0(void) | |||
205 | 205 | ||
206 | TSR0 &= ~0x01; | 206 | TSR0 &= ~0x01; |
207 | } | 207 | } |
208 | #elif CONFIG_CPU == MCF5249 | 208 | #elif defined(CPU_COLDFIRE) |
209 | void tick_start(unsigned int interval_in_ms) | 209 | void tick_start(unsigned int interval_in_ms) |
210 | { | 210 | { |
211 | unsigned int count; | 211 | unsigned int count; |
diff --git a/firmware/panic.c b/firmware/panic.c index 37a185f990..fb024693e1 100644 --- a/firmware/panic.c +++ b/firmware/panic.c | |||
@@ -43,7 +43,7 @@ void panicf( const char *fmt, ...) | |||
43 | /* Disable interrupts */ | 43 | /* Disable interrupts */ |
44 | #if CONFIG_CPU == SH7034 | 44 | #if CONFIG_CPU == SH7034 |
45 | asm volatile ("ldc\t%0,sr" : : "r"(15<<4)); | 45 | asm volatile ("ldc\t%0,sr" : : "r"(15<<4)); |
46 | #elif CONFIG_CPU == MCF5249 | 46 | #elif defined(CPU_COLDFIRE) |
47 | asm volatile ("move.w #0x2700,%sr"); | 47 | asm volatile ("move.w #0x2700,%sr"); |
48 | #endif | 48 | #endif |
49 | #endif | 49 | #endif |
diff --git a/firmware/rom.lds b/firmware/rom.lds index a4328b0ff5..632a69ed9e 100644 --- a/firmware/rom.lds +++ b/firmware/rom.lds | |||
@@ -1,7 +1,7 @@ | |||
1 | #include "config.h" | 1 | #include "config.h" |
2 | 2 | ||
3 | ENTRY(start) | 3 | ENTRY(start) |
4 | #if CONFIG_CPU == MCF5249 | 4 | #ifdef CPU_COLDFIRE |
5 | OUTPUT_FORMAT(elf32-m68k) | 5 | OUTPUT_FORMAT(elf32-m68k) |
6 | #else | 6 | #else |
7 | OUTPUT_FORMAT(elf32-sh) | 7 | OUTPUT_FORMAT(elf32-sh) |
diff --git a/firmware/system.c b/firmware/system.c index 219ad976bc..13d424d02b 100644 --- a/firmware/system.c +++ b/firmware/system.c | |||
@@ -303,7 +303,7 @@ void system_init(void) | |||
303 | 303 | ||
304 | 304 | ||
305 | 305 | ||
306 | #elif CONFIG_CPU == MCF5249 | 306 | #elif defined(CPU_COLDFIRE) |
307 | 307 | ||
308 | #define default_interrupt(name) \ | 308 | #define default_interrupt(name) \ |
309 | extern __attribute__((weak,alias("UIE"))) void name (void) | 309 | extern __attribute__((weak,alias("UIE"))) void name (void) |
@@ -1104,7 +1104,7 @@ int system_memory_guard(int newmode) | |||
1104 | 1104 | ||
1105 | void system_reboot (void) | 1105 | void system_reboot (void) |
1106 | { | 1106 | { |
1107 | #if CONFIG_CPU == MCF5249 | 1107 | #ifdef CPU_COLDFIRE |
1108 | set_cpu_frequency(0); | 1108 | set_cpu_frequency(0); |
1109 | 1109 | ||
1110 | asm(" move.w #0x2700,%sr"); | 1110 | asm(" move.w #0x2700,%sr"); |
diff --git a/firmware/thread.c b/firmware/thread.c index d6a4a4f3db..8834666b54 100644 --- a/firmware/thread.c +++ b/firmware/thread.c | |||
@@ -23,7 +23,7 @@ | |||
23 | #include "kernel.h" | 23 | #include "kernel.h" |
24 | #include "cpu.h" | 24 | #include "cpu.h" |
25 | 25 | ||
26 | #if CONFIG_CPU == MCF5249 | 26 | #ifdef CPU_COLDFIRE |
27 | struct regs | 27 | struct regs |
28 | { | 28 | { |
29 | unsigned int d[6]; /* d2-d7 */ | 29 | unsigned int d[6]; /* d2-d7 */ |
@@ -68,7 +68,7 @@ void switch_thread(void) __attribute__ ((section(".icode"))); | |||
68 | static inline void store_context(void* addr) __attribute__ ((always_inline)); | 68 | static inline void store_context(void* addr) __attribute__ ((always_inline)); |
69 | static inline void load_context(const void* addr) __attribute__ ((always_inline)); | 69 | static inline void load_context(const void* addr) __attribute__ ((always_inline)); |
70 | 70 | ||
71 | #if CONFIG_CPU == MCF5249 | 71 | #ifdef CPU_COLDFIRE |
72 | /*--------------------------------------------------------------------------- | 72 | /*--------------------------------------------------------------------------- |
73 | * Store non-volatile context. | 73 | * Store non-volatile context. |
74 | *--------------------------------------------------------------------------- | 74 | *--------------------------------------------------------------------------- |
@@ -212,7 +212,7 @@ void switch_thread(void) | |||
212 | while (num_sleepers == num_threads) | 212 | while (num_sleepers == num_threads) |
213 | { | 213 | { |
214 | /* Enter sleep mode, woken up on interrupt */ | 214 | /* Enter sleep mode, woken up on interrupt */ |
215 | #if CONFIG_CPU == MCF5249 | 215 | #ifdef CPU_COLDFIRE |
216 | asm volatile ("stop #0x2000"); | 216 | asm volatile ("stop #0x2000"); |
217 | #elif CONFIG_CPU == SH7034 | 217 | #elif CONFIG_CPU == SH7034 |
218 | SBYCR &= 0x7F; | 218 | SBYCR &= 0x7F; |
@@ -285,7 +285,7 @@ int create_thread(void (*function)(void), void* stack, int stack_size, | |||
285 | thread_stack[num_threads] = stack; | 285 | thread_stack[num_threads] = stack; |
286 | thread_stack_size[num_threads] = stack_size; | 286 | thread_stack_size[num_threads] = stack_size; |
287 | regs = &thread_contexts[num_threads]; | 287 | regs = &thread_contexts[num_threads]; |
288 | #if (CONFIG_CPU == MCF5249) || (CONFIG_CPU == SH7034) | 288 | #if defined(CPU_COLDFIRE) || (CONFIG_CPU == SH7034) |
289 | /* Align stack to an even 32 bit boundary */ | 289 | /* Align stack to an even 32 bit boundary */ |
290 | regs->sp = (void*)(((unsigned int)stack + stack_size) & ~3); | 290 | regs->sp = (void*)(((unsigned int)stack + stack_size) & ~3); |
291 | #elif CONFIG_CPU == TCC730 | 291 | #elif CONFIG_CPU == TCC730 |
@@ -333,7 +333,7 @@ void init_threads(void) | |||
333 | thread_name[0] = main_thread_name; | 333 | thread_name[0] = main_thread_name; |
334 | thread_stack[0] = stackbegin; | 334 | thread_stack[0] = stackbegin; |
335 | thread_stack_size[0] = (int)stackend - (int)stackbegin; | 335 | thread_stack_size[0] = (int)stackend - (int)stackbegin; |
336 | #if (CONFIG_CPU == MCF5249) || (CONFIG_CPU == SH7034) | 336 | #if defined(CPU_COLDFIRE) || (CONFIG_CPU == SH7034) |
337 | thread_contexts[0].start = 0; /* thread 0 already running */ | 337 | thread_contexts[0].start = 0; /* thread 0 already running */ |
338 | #elif CONFIG_CPU == TCC730 | 338 | #elif CONFIG_CPU == TCC730 |
339 | thread_contexts[0].started = 1; | 339 | thread_contexts[0].started = 1; |