From 6753fb5138a399b51e65f1dc3e36e73427013379 Mon Sep 17 00:00:00 2001 From: Christian Gmeiner Date: Mon, 18 Jul 2005 13:09:05 +0000 Subject: oops... should compile without warnings now git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7187 a1c6a512-1295-4272-9138-f99709370657 --- apps/codecs/Tremor/asm_mcf5249.h | 2 +- apps/codecs/Tremor/vorbisfile.c | 4 ++-- apps/codecs/libFLAC/SOURCES | 2 +- apps/codecs/libFLAC/stream_decoder.c | 2 +- apps/codecs/liba52/parse.c | 2 +- apps/codecs/libmad/SOURCES | 2 +- apps/codecs/libmad/global.h | 2 +- apps/codecs/libmad/layer3.c | 4 ++-- apps/codecs/libmusepack/math.h | 2 +- apps/codecs/libmusepack/synth_filter.c | 4 ++-- apps/codecs/libwavpack/SOURCES | 2 +- apps/codecs/libwavpack/unpack.c | 6 +++--- apps/dsp.c | 2 +- 13 files changed, 18 insertions(+), 18 deletions(-) diff --git a/apps/codecs/Tremor/asm_mcf5249.h b/apps/codecs/Tremor/asm_mcf5249.h index 7b071f96c2..2dcff021a4 100644 --- a/apps/codecs/Tremor/asm_mcf5249.h +++ b/apps/codecs/Tremor/asm_mcf5249.h @@ -19,7 +19,7 @@ #include "os_types.h" -#ifdef CPU_COLDFIRE && !defined(SIMULATOR) +#if defined(CPU_COLDFIRE) && !defined(SIMULATOR) /* attribute for 16-byte alignment */ #define LINE_ATTR __attribute__ ((aligned (16))) diff --git a/apps/codecs/Tremor/vorbisfile.c b/apps/codecs/Tremor/vorbisfile.c index 060b0bac89..f6a208d1c7 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){ if(ret<0)return(ret); _make_decode_ready(vf); -#ifdef CPU_COLDFIRE && !defined(SIMULATOR) +#if defined(CPU_COLDFIRE) && !defined(SIMULATOR) mcf5249_init_mac(); #endif @@ -1552,7 +1552,7 @@ long ov_read(OggVorbis_File *vf,char *buffer,int bytes_req,int *bitstream){ if(vf->ready_stateprivate_->cpuinfo); /* first default to the non-asm routines */ -#ifdef CPU_COLDFIRE && !defined(SIMULATOR) +#if defined(CPU_COLDFIRE) && !defined(SIMULATOR) decoder->private_->local_lpc_restore_signal = FLAC__lpc_restore_signal_mcf5249; decoder->private_->local_lpc_restore_signal_16bit = FLAC__lpc_restore_signal_mcf5249; decoder->private_->local_lpc_restore_signal_16bit_order8 = FLAC__lpc_restore_signal_mcf5249; diff --git a/apps/codecs/liba52/parse.c b/apps/codecs/liba52/parse.c index c06381be9e..d5b323c701 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) a52_state_t * state; int i; - #ifdef CPU_COLDFIRE && !defined(SIMULATOR) + #if defined(CPU_COLDFIRE) && !defined(SIMULATOR) asm volatile ("move.l #0x30, %macsr"); /* frac. mode with rounding */ #endif /* diff --git a/apps/codecs/libmad/SOURCES b/apps/codecs/libmad/SOURCES index 5e76423abf..72386d3bcb 100644 --- a/apps/codecs/libmad/SOURCES +++ b/apps/codecs/libmad/SOURCES @@ -9,6 +9,6 @@ stream.c synth.c timer.c version.c -#ifdef CPU_COLDFIRE && !defined(SIMULATOR) +#if defined(CPU_COLDFIRE) && !defined(SIMULATOR) imdct_mcf5249.S #endif diff --git a/apps/codecs/libmad/global.h b/apps/codecs/libmad/global.h index 17dd1dd804..5dee36c686 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 -#ifdef CPU_COLDFIRE && !defined(SIMULATOR) +#if defined(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 e8b80e7ce4..b5fa2be6f5 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 */ -# ifdef CPU_COLDFIRE && !defined(SIMULATOR) +# if defined(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. */ @@ -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 */ -# ifdef CPU_COLDFIRE && !defined(SIMULATOR) +# if defined(CPU_COLDFIRE) && !defined(SIMULATOR) void III_imdct_s(mad_fixed_t const X[18], mad_fixed_t z[36]); #else diff --git a/apps/codecs/libmusepack/math.h b/apps/codecs/libmusepack/math.h index 532f1350c4..a89ef76f58 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 #ifdef MPC_HAVE_MULHIGH #define MPC_MULTIPLY_FRACT(X,Y) _MulHigh(X,Y) #else -#ifdef CPU_COLDFIRE && !defined(SIMULATOR) +#if defined(CPU_COLDFIRE) && !defined(SIMULATOR) /* 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/synth_filter.c b/apps/codecs/libmusepack/synth_filter.c index 105dbb0008..7644551d16 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 { mpc_uint32_t n; - #ifdef CPU_COLDFIRE && !defined(SIMULATOR) + #if defined(CPU_COLDFIRE) && !defined(SIMULATOR) asm volatile ("move.l #0x20, %macsr"); /* fractional emac mode */ #endif for ( n = 0; n < 36; n++, Y += 32 ) { @@ -350,7 +350,7 @@ static void Synthese_Filter_float_internal(MPC_SAMPLE_FORMAT * OutData,MPC_SAMPL for ( k = 0; k < 32; k++, D += 16, V++ ) { - #ifdef CPU_COLDFIRE && !defined(SIMULATOR) + #if defined(CPU_COLDFIRE) && !defined(SIMULATOR) asm volatile ( "movem.l (%[D]), %%d0-%%d3\n\t" "move.l (%[V]), %%a5\n\t" diff --git a/apps/codecs/libwavpack/SOURCES b/apps/codecs/libwavpack/SOURCES index 28e8fb3584..f63c55a87a 100644 --- a/apps/codecs/libwavpack/SOURCES +++ b/apps/codecs/libwavpack/SOURCES @@ -5,7 +5,7 @@ unpack.c pack.c words.c wputils.c -#ifdef CPU_COLDFIRE && !defined(SIMULATOR) +#if defined(CPU_COLDFIRE) && !defined(SIMULATOR) coldfire.S #endif diff --git a/apps/codecs/libwavpack/unpack.c b/apps/codecs/libwavpack/unpack.c index dcc776e42a..76198a7af8 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) // samples unpacked, which can be less than the number requested if an error // occurs or the end of the block is reached. -#ifdef CPU_COLDFIRE && !defined(SIMULATOR) +#if defined(CPU_COLDFIRE) && !defined(SIMULATOR) extern void decorr_stereo_pass_cont_mcf5249 (struct decorr_pass *dpp, long *buffer, long sample_count); #else 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) else for (tcount = wps->num_terms, dpp = wps->decorr_passes; tcount--; dpp++) { decorr_stereo_pass (dpp, buffer, 8); -#ifdef CPU_COLDFIRE && !defined(SIMULATOR) +#if defined(CPU_COLDFIRE) && !defined(SIMULATOR) decorr_stereo_pass_cont_mcf5249 (dpp, buffer + 16, sample_count - 8); #else 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 dpp->weight_B = weight_B; } -#ifndef CPU_COLDFIRE || defined(SIMULATOR) +#if !defined(CPU_COLDFIRE) || defined(SIMULATOR) static void decorr_stereo_pass_cont (struct decorr_pass *dpp, long *buffer, long sample_count) { diff --git a/apps/dsp.c b/apps/dsp.c index 8e20a68aed..cd22610f74 100644 --- a/apps/dsp.c +++ b/apps/dsp.c @@ -36,7 +36,7 @@ #define SAMPLE_BUF_SIZE 256 #define RESAMPLE_BUF_SIZE (256 * 4) /* Enough for 11,025 Hz -> 44,100 Hz*/ -#ifdef CPU_COLDFIRE && !defined(SIMULATOR) +#if defined(CPU_COLDFIRE) && !defined(SIMULATOR) #define INIT() asm volatile ("move.l #0xb0, %macsr") /* frac, round, clip */ /* Multiply 2 32-bit integers and return the 32 most significant bits of the -- cgit v1.2.3