devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

oops... should compile without warnings now

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7187 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Christian Gmeiner 2005-07-18 13:09:05 +00:00
parent c6ff1f5eb5
commit 6753fb5138
13 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
apps/codecs/Tremor/asm_mcf5249.h
View file

@ -19,7 +19,7 @@
#include "os_types.h" #include "os_types.h"
#ifdef CPU_COLDFIRE && !defined(SIMULATOR) #if defined(CPU_COLDFIRE) && !defined(SIMULATOR)
/* attribute for 16-byte alignment */ /* attribute for 16-byte alignment */
#define LINE_ATTR __attribute__ ((aligned (16))) #define LINE_ATTR __attribute__ ((aligned (16)))

4
apps/codecs/Tremor/vorbisfile.c
View file

@ -1291,7 +1291,7 @@ int ov_pcm_seek(OggVorbis_File *vf,ogg_int64_t pos){
if(ret<0)return(ret); if(ret<0)return(ret);
_make_decode_ready(vf); _make_decode_ready(vf);
#ifdef CPU_COLDFIRE && !defined(SIMULATOR) #if defined(CPU_COLDFIRE) && !defined(SIMULATOR)
mcf5249_init_mac(); mcf5249_init_mac();
#endif #endif
@ -1552,7 +1552,7 @@ long ov_read(OggVorbis_File *vf,char *buffer,int bytes_req,int *bitstream){
if(vf->ready_state<OPENED)return(OV_EINVAL); if(vf->ready_state<OPENED)return(OV_EINVAL);
#ifdef CPU_COLDFIRE && !defined(SIMULATOR) #if defined(CPU_COLDFIRE) && !defined(SIMULATOR)
mcf5249_init_mac(); mcf5249_init_mac();
#endif #endif

2
apps/codecs/libFLAC/SOURCES
View file

@ -10,6 +10,6 @@ md5.c
memory.c memory.c
seekable_stream_decoder.c seekable_stream_decoder.c
stream_decoder.c stream_decoder.c
#ifdef CPU_COLDFIRE && !defined(SIMULATOR) #if defined(CPU_COLDFIRE) && !defined(SIMULATOR)
coldfire.S coldfire.S
#endif #endif

2
apps/codecs/libFLAC/stream_decoder.c
View file

@ -299,7 +299,7 @@ FLAC_API FLAC__StreamDecoderState FLAC__stream_decoder_init(FLAC__StreamDecoder
*/ */
FLAC__cpu_info(&decoder->private_->cpuinfo); FLAC__cpu_info(&decoder->private_->cpuinfo);
/* first default to the non-asm routines */ /* 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 = FLAC__lpc_restore_signal_mcf5249;
decoder->private_->local_lpc_restore_signal_16bit = 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; decoder->private_->local_lpc_restore_signal_16bit_order8 = FLAC__lpc_restore_signal_mcf5249;

2
apps/codecs/liba52/parse.c
View file

@ -58,7 +58,7 @@ a52_state_t * a52_init (uint32_t mm_accel)
a52_state_t * state; a52_state_t * state;
int i; int i;
#ifdef CPU_COLDFIRE && !defined(SIMULATOR) #if defined(CPU_COLDFIRE) && !defined(SIMULATOR)
asm volatile ("move.l #0x30, %macsr"); /* frac. mode with rounding */ asm volatile ("move.l #0x30, %macsr"); /* frac. mode with rounding */
#endif #endif
/* /*

2
apps/codecs/libmad/SOURCES
View file

@ -9,6 +9,6 @@ stream.c
synth.c synth.c
timer.c timer.c
version.c version.c
#ifdef CPU_COLDFIRE && !defined(SIMULATOR) #if defined(CPU_COLDFIRE) && !defined(SIMULATOR)
imdct_mcf5249.S imdct_mcf5249.S
#endif #endif

2
apps/codecs/libmad/global.h
View file

@ -24,7 +24,7 @@
# ifndef LIBMAD_GLOBAL_H # ifndef LIBMAD_GLOBAL_H
# define LIBMAD_GLOBAL_H # define LIBMAD_GLOBAL_H
#ifdef CPU_COLDFIRE && !defined(SIMULATOR) #if defined(CPU_COLDFIRE) && !defined(SIMULATOR)
#define FPM_COLDFIRE_EMAC #define FPM_COLDFIRE_EMAC
#else #else
#define FPM_DEFAULT #define FPM_DEFAULT

4
apps/codecs/libmad/layer3.c
View file

@ -1765,7 +1765,7 @@ void imdct36(mad_fixed_t const x[18], mad_fixed_t y[36])
* DESCRIPTION: perform X[18]->x[36] IMDCT * 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. /* 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. * 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 * 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]); void III_imdct_s(mad_fixed_t const X[18], mad_fixed_t z[36]);
#else #else

2
apps/codecs/libmusepack/math.h
View file

@ -99,7 +99,7 @@ static inline MPC_SAMPLE_FORMAT MPC_MULTIPLY_EX(MPC_SAMPLE_FORMAT item1,MPC_SAMP
#ifdef MPC_HAVE_MULHIGH #ifdef MPC_HAVE_MULHIGH
#define MPC_MULTIPLY_FRACT(X,Y) _MulHigh(X,Y) #define MPC_MULTIPLY_FRACT(X,Y) _MulHigh(X,Y)
#else #else
#ifdef CPU_COLDFIRE && !defined(SIMULATOR) #if defined(CPU_COLDFIRE) && !defined(SIMULATOR)
/* loses one bit of accuracy. /* loses one bit of accuracy.
the rest of the macros won't be as easy as this... */ the rest of the macros won't be as easy as this... */
#define MPC_MULTIPLY_FRACT(X,Y) \ #define MPC_MULTIPLY_FRACT(X,Y) \

4
apps/codecs/libmusepack/synth_filter.c
View file

@ -335,7 +335,7 @@ static void Synthese_Filter_float_internal(MPC_SAMPLE_FORMAT * OutData,MPC_SAMPL
{ {
mpc_uint32_t n; mpc_uint32_t n;
#ifdef CPU_COLDFIRE && !defined(SIMULATOR) #if defined(CPU_COLDFIRE) && !defined(SIMULATOR)
asm volatile ("move.l #0x20, %macsr"); /* fractional emac mode */ asm volatile ("move.l #0x20, %macsr"); /* fractional emac mode */
#endif #endif
for ( n = 0; n < 36; n++, Y += 32 ) { 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++ ) { for ( k = 0; k < 32; k++, D += 16, V++ ) {
#ifdef CPU_COLDFIRE && !defined(SIMULATOR) #if defined(CPU_COLDFIRE) && !defined(SIMULATOR)
asm volatile ( asm volatile (
"movem.l (%[D]), %%d0-%%d3\n\t" "movem.l (%[D]), %%d0-%%d3\n\t"
"move.l (%[V]), %%a5\n\t" "move.l (%[V]), %%a5\n\t"

2
apps/codecs/libwavpack/SOURCES
View file

@ -5,7 +5,7 @@ unpack.c
pack.c pack.c
words.c words.c
wputils.c wputils.c
#ifdef CPU_COLDFIRE && !defined(SIMULATOR) #if defined(CPU_COLDFIRE) && !defined(SIMULATOR)
coldfire.S coldfire.S
#endif #endif

6
apps/codecs/libwavpack/unpack.c
View file

@ -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 // samples unpacked, which can be less than the number requested if an error
// occurs or the end of the block is reached. // 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); extern void decorr_stereo_pass_cont_mcf5249 (struct decorr_pass *dpp, long *buffer, long sample_count);
#else #else
static void decorr_stereo_pass_cont (struct decorr_pass *dpp, long *buffer, long sample_count); 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 else
for (tcount = wps->num_terms, dpp = wps->decorr_passes; tcount--; dpp++) { for (tcount = wps->num_terms, dpp = wps->decorr_passes; tcount--; dpp++) {
decorr_stereo_pass (dpp, buffer, 8); 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); decorr_stereo_pass_cont_mcf5249 (dpp, buffer + 16, sample_count - 8);
#else #else
decorr_stereo_pass_cont (dpp, buffer + 16, sample_count - 8); 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; 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) static void decorr_stereo_pass_cont (struct decorr_pass *dpp, long *buffer, long sample_count)
{ {

2
apps/dsp.c
View file

@ -36,7 +36,7 @@
#define SAMPLE_BUF_SIZE 256 #define SAMPLE_BUF_SIZE 256
#define RESAMPLE_BUF_SIZE (256 * 4) /* Enough for 11,025 Hz -> 44,100 Hz*/ #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 */ #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 /* Multiply 2 32-bit integers and return the 32 most significant bits of the