diff options
author | Nils Wallménius <nils@rockbox.org> | 2011-06-01 10:28:26 +0000 |
---|---|---|
committer | Nils Wallménius <nils@rockbox.org> | 2011-06-01 10:28:26 +0000 |
commit | 7c6056b352e35c5b12521b35ba193e13f75500be (patch) | |
tree | a53215338a7c78bd47ebb3afedf41c0489a97f4e | |
parent | 05a1984eb32dd07bcf5d54c147ace4d6f56a00b4 (diff) | |
download | rockbox-7c6056b352e35c5b12521b35ba193e13f75500be.tar.gz rockbox-7c6056b352e35c5b12521b35ba193e13f75500be.zip |
FS#12140 by Sean Bartell, Make various codec stuff static.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29942 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/codecs/au.c | 2 | ||||
-rw-r--r-- | apps/codecs/lib/fft-ffmpeg.c | 12 | ||||
-rw-r--r-- | apps/codecs/libalac/alac.c | 54 | ||||
-rw-r--r-- | apps/codecs/libatrac/atrac3.c | 4 | ||||
-rw-r--r-- | apps/codecs/libmusepack/mpc_decoder.c | 22 | ||||
-rw-r--r-- | apps/codecs/libmusepack/mpcdec.h | 2 | ||||
-rw-r--r-- | apps/codecs/libmusepack/requant.c | 2 | ||||
-rw-r--r-- | apps/codecs/libspc/spc_codec.h | 16 | ||||
-rw-r--r-- | apps/codecs/libspc/spc_emu.c | 18 | ||||
-rw-r--r-- | apps/codecs/libtremor/res012.c | 8 | ||||
-rw-r--r-- | apps/codecs/libtta/ttadec.c | 2 | ||||
-rw-r--r-- | apps/codecs/spc.c | 4 | ||||
-rw-r--r-- | apps/codecs/wav.c | 2 | ||||
-rw-r--r-- | apps/codecs/wmapro.c | 3 |
14 files changed, 77 insertions, 74 deletions
diff --git a/apps/codecs/au.c b/apps/codecs/au.c index e06f931cf9..ef308358f4 100644 --- a/apps/codecs/au.c +++ b/apps/codecs/au.c | |||
@@ -58,7 +58,7 @@ static const char support_formats[9][2] = { | |||
58 | { AU_FORMAT_ALAW, 8 }, /* 27: G.711 ALAW */ | 58 | { AU_FORMAT_ALAW, 8 }, /* 27: G.711 ALAW */ |
59 | }; | 59 | }; |
60 | 60 | ||
61 | const struct pcm_entry au_codecs[] = { | 61 | static const struct pcm_entry au_codecs[] = { |
62 | { AU_FORMAT_MULAW, get_itut_g711_mulaw_codec }, | 62 | { AU_FORMAT_MULAW, get_itut_g711_mulaw_codec }, |
63 | { AU_FORMAT_PCM, get_linear_pcm_codec }, | 63 | { AU_FORMAT_PCM, get_linear_pcm_codec }, |
64 | { AU_FORMAT_IEEE_FLOAT, get_ieee_float_codec }, | 64 | { AU_FORMAT_IEEE_FLOAT, get_ieee_float_codec }, |
diff --git a/apps/codecs/lib/fft-ffmpeg.c b/apps/codecs/lib/fft-ffmpeg.c index a76f49fd1e..807f606038 100644 --- a/apps/codecs/lib/fft-ffmpeg.c +++ b/apps/codecs/lib/fft-ffmpeg.c | |||
@@ -276,8 +276,8 @@ static inline FFTComplex* TRANSFORM_ZERO(FFTComplex * z, unsigned int n) | |||
276 | #endif | 276 | #endif |
277 | 277 | ||
278 | /* z[0...8n-1], w[1...2n-1] */ | 278 | /* z[0...8n-1], w[1...2n-1] */ |
279 | void pass(FFTComplex *z_arg, unsigned int STEP_arg, unsigned int n_arg) ICODE_ATTR_TREMOR_MDCT; | 279 | static void pass(FFTComplex *z_arg, unsigned int STEP_arg, unsigned int n_arg) ICODE_ATTR_TREMOR_MDCT; |
280 | void pass(FFTComplex *z_arg, unsigned int STEP_arg, unsigned int n_arg) | 280 | static void pass(FFTComplex *z_arg, unsigned int STEP_arg, unsigned int n_arg) |
281 | { | 281 | { |
282 | register FFTComplex * z = z_arg; | 282 | register FFTComplex * z = z_arg; |
283 | register unsigned int STEP = STEP_arg; | 283 | register unsigned int STEP = STEP_arg; |
@@ -318,8 +318,8 @@ void pass(FFTComplex *z_arg, unsigned int STEP_arg, unsigned int n_arg) | |||
318 | 8192/16 (from "ff_cos_16") is 512 bytes. | 318 | 8192/16 (from "ff_cos_16") is 512 bytes. |
319 | i.e. for fft16, STEP = 8192/16 */ | 319 | i.e. for fft16, STEP = 8192/16 */ |
320 | #define DECL_FFT(n,n2,n4)\ | 320 | #define DECL_FFT(n,n2,n4)\ |
321 | void fft##n(FFTComplex *z) ICODE_ATTR_TREMOR_MDCT;\ | 321 | static void fft##n(FFTComplex *z) ICODE_ATTR_TREMOR_MDCT;\ |
322 | void fft##n(FFTComplex *z)\ | 322 | static void fft##n(FFTComplex *z)\ |
323 | {\ | 323 | {\ |
324 | fft##n2(z);\ | 324 | fft##n2(z);\ |
325 | fft##n4(z+n4*2);\ | 325 | fft##n4(z+n4*2);\ |
@@ -379,8 +379,8 @@ static void fft8_dispatch(FFTComplex *z) | |||
379 | } | 379 | } |
380 | 380 | ||
381 | #ifndef CONFIG_SMALL | 381 | #ifndef CONFIG_SMALL |
382 | void fft16(FFTComplex *z) ICODE_ATTR_TREMOR_MDCT; | 382 | static void fft16(FFTComplex *z) ICODE_ATTR_TREMOR_MDCT; |
383 | void fft16(FFTComplex *z) | 383 | static void fft16(FFTComplex *z) |
384 | { | 384 | { |
385 | fft8(z); | 385 | fft8(z); |
386 | fft4(z+8); | 386 | fft4(z+8); |
diff --git a/apps/codecs/libalac/alac.c b/apps/codecs/libalac/alac.c index 8a5c694994..7438e9436b 100644 --- a/apps/codecs/libalac/alac.c +++ b/apps/codecs/libalac/alac.c | |||
@@ -40,9 +40,9 @@ | |||
40 | 40 | ||
41 | #define SIGNEXTEND24(val) (((signed)val<<8)>>8) | 41 | #define SIGNEXTEND24(val) (((signed)val<<8)>>8) |
42 | 42 | ||
43 | int16_t predictor_coef_table[32] IBSS_ATTR; | 43 | static int16_t predictor_coef_table[32] IBSS_ATTR; |
44 | int16_t predictor_coef_table_a[32] IBSS_ATTR; | 44 | static int16_t predictor_coef_table_a[32] IBSS_ATTR; |
45 | int16_t predictor_coef_table_b[32] IBSS_ATTR; | 45 | static int16_t predictor_coef_table_b[32] IBSS_ATTR; |
46 | 46 | ||
47 | 47 | ||
48 | /* Endian/aligment safe functions - only used in alac_set_info() */ | 48 | /* Endian/aligment safe functions - only used in alac_set_info() */ |
@@ -578,16 +578,16 @@ static void predictor_decompress_fir_adapt(int32_t *error_buffer, | |||
578 | } | 578 | } |
579 | } | 579 | } |
580 | 580 | ||
581 | void deinterlace_16(int32_t* buffer0, | 581 | static void deinterlace_16(int32_t* buffer0, |
582 | int32_t* buffer1, | 582 | int32_t* buffer1, |
583 | int numsamples, | 583 | int numsamples, |
584 | uint8_t interlacing_shift, | 584 | uint8_t interlacing_shift, |
585 | uint8_t interlacing_leftweight) ICODE_ATTR_ALAC; | 585 | uint8_t interlacing_leftweight) ICODE_ATTR_ALAC; |
586 | void deinterlace_16(int32_t* buffer0, | 586 | static void deinterlace_16(int32_t* buffer0, |
587 | int32_t* buffer1, | 587 | int32_t* buffer1, |
588 | int numsamples, | 588 | int numsamples, |
589 | uint8_t interlacing_shift, | 589 | uint8_t interlacing_shift, |
590 | uint8_t interlacing_leftweight) | 590 | uint8_t interlacing_leftweight) |
591 | { | 591 | { |
592 | int i; | 592 | int i; |
593 | if (numsamples <= 0) return; | 593 | if (numsamples <= 0) return; |
@@ -619,20 +619,20 @@ void deinterlace_16(int32_t* buffer0, | |||
619 | } | 619 | } |
620 | } | 620 | } |
621 | 621 | ||
622 | void deinterlace_24(int32_t *buffer0, int32_t *buffer1, | 622 | static void deinterlace_24(int32_t *buffer0, int32_t *buffer1, |
623 | int uncompressed_bytes, | 623 | int uncompressed_bytes, |
624 | int32_t *uncompressed_bytes_buffer0, | 624 | int32_t *uncompressed_bytes_buffer0, |
625 | int32_t *uncompressed_bytes_buffer1, | 625 | int32_t *uncompressed_bytes_buffer1, |
626 | int numsamples, | 626 | int numsamples, |
627 | uint8_t interlacing_shift, | 627 | uint8_t interlacing_shift, |
628 | uint8_t interlacing_leftweight) ICODE_ATTR_ALAC; | 628 | uint8_t interlacing_leftweight) ICODE_ATTR_ALAC; |
629 | void deinterlace_24(int32_t *buffer0, int32_t *buffer1, | 629 | static void deinterlace_24(int32_t *buffer0, int32_t *buffer1, |
630 | int uncompressed_bytes, | 630 | int uncompressed_bytes, |
631 | int32_t *uncompressed_bytes_buffer0, | 631 | int32_t *uncompressed_bytes_buffer0, |
632 | int32_t *uncompressed_bytes_buffer1, | 632 | int32_t *uncompressed_bytes_buffer1, |
633 | int numsamples, | 633 | int numsamples, |
634 | uint8_t interlacing_shift, | 634 | uint8_t interlacing_shift, |
635 | uint8_t interlacing_leftweight) | 635 | uint8_t interlacing_leftweight) |
636 | { | 636 | { |
637 | int i; | 637 | int i; |
638 | if (numsamples <= 0) return; | 638 | if (numsamples <= 0) return; |
diff --git a/apps/codecs/libatrac/atrac3.c b/apps/codecs/libatrac/atrac3.c index 711537fa96..bb52dd4cf0 100644 --- a/apps/codecs/libatrac/atrac3.c +++ b/apps/codecs/libatrac/atrac3.c | |||
@@ -474,8 +474,8 @@ static void inverseQuantizeSpectrum(int *mantissas, int32_t *pOut, | |||
474 | * @return outSubbands subband counter, fix for broken specification/files | 474 | * @return outSubbands subband counter, fix for broken specification/files |
475 | */ | 475 | */ |
476 | 476 | ||
477 | int decodeSpectrum (GetBitContext *gb, int32_t *pOut) ICODE_ATTR_LARGE_IRAM; | 477 | static int decodeSpectrum (GetBitContext *gb, int32_t *pOut) ICODE_ATTR_LARGE_IRAM; |
478 | int decodeSpectrum (GetBitContext *gb, int32_t *pOut) | 478 | static int decodeSpectrum (GetBitContext *gb, int32_t *pOut) |
479 | { | 479 | { |
480 | int numSubbands, codingMode, cnt, first, last, subbWidth; | 480 | int numSubbands, codingMode, cnt, first, last, subbWidth; |
481 | int subband_vlc_index[32], SF_idxs[32]; | 481 | int subband_vlc_index[32], SF_idxs[32]; |
diff --git a/apps/codecs/libmusepack/mpc_decoder.c b/apps/codecs/libmusepack/mpc_decoder.c index eb0638524f..7bf7935d39 100644 --- a/apps/codecs/libmusepack/mpc_decoder.c +++ b/apps/codecs/libmusepack/mpc_decoder.c | |||
@@ -118,13 +118,15 @@ enum | |||
118 | //------------------------------------------------------------------------------ | 118 | //------------------------------------------------------------------------------ |
119 | // forward declarations | 119 | // forward declarations |
120 | //------------------------------------------------------------------------------ | 120 | //------------------------------------------------------------------------------ |
121 | void mpc_decoder_requantisierung (mpc_decoder *d) | 121 | static void mpc_decoder_requantisierung (mpc_decoder *d) |
122 | ICODE_ATTR_MPC_LARGE_IRAM; | 122 | ICODE_ATTR_MPC_LARGE_IRAM; |
123 | void mpc_decoder_read_bitstream_sv7(mpc_decoder * d, mpc_bits_reader * r) | 123 | static void mpc_decoder_read_bitstream_sv7(mpc_decoder * d, |
124 | ICODE_ATTR_MPC_LARGE_IRAM; | 124 | mpc_bits_reader * r) |
125 | void mpc_decoder_read_bitstream_sv8(mpc_decoder * d, mpc_bits_reader * r, | 125 | ICODE_ATTR_MPC_LARGE_IRAM; |
126 | mpc_bool_t is_key_frame) | 126 | static void mpc_decoder_read_bitstream_sv8(mpc_decoder * d, |
127 | ICODE_ATTR_MPC_SV8_BS_DEC; | 127 | mpc_bits_reader * r, |
128 | mpc_bool_t is_key_frame) | ||
129 | ICODE_ATTR_MPC_SV8_BS_DEC; | ||
128 | 130 | ||
129 | //------------------------------------------------------------------------------ | 131 | //------------------------------------------------------------------------------ |
130 | // macros | 132 | // macros |
@@ -348,7 +350,7 @@ void mpc_decoder_decode_frame(mpc_decoder * d, | |||
348 | } | 350 | } |
349 | } | 351 | } |
350 | 352 | ||
351 | void | 353 | static void |
352 | mpc_decoder_requantisierung(mpc_decoder *d) | 354 | mpc_decoder_requantisierung(mpc_decoder *d) |
353 | { | 355 | { |
354 | mpc_int32_t Band; | 356 | mpc_int32_t Band; |
@@ -431,7 +433,7 @@ mpc_decoder_requantisierung(mpc_decoder *d) | |||
431 | } | 433 | } |
432 | } | 434 | } |
433 | 435 | ||
434 | void mpc_decoder_read_bitstream_sv7(mpc_decoder * d, mpc_bits_reader * r) | 436 | static void mpc_decoder_read_bitstream_sv7(mpc_decoder * d, mpc_bits_reader * r) |
435 | { | 437 | { |
436 | mpc_int32_t n, idx, Max_used_Band = 0; | 438 | mpc_int32_t n, idx, Max_used_Band = 0; |
437 | 439 | ||
@@ -580,7 +582,7 @@ void mpc_decoder_read_bitstream_sv7(mpc_decoder * d, mpc_bits_reader * r) | |||
580 | } | 582 | } |
581 | } | 583 | } |
582 | 584 | ||
583 | void mpc_decoder_read_bitstream_sv8(mpc_decoder * d, mpc_bits_reader * r, mpc_bool_t is_key_frame) | 585 | static void mpc_decoder_read_bitstream_sv8(mpc_decoder * d, mpc_bits_reader * r, mpc_bool_t is_key_frame) |
584 | { | 586 | { |
585 | mpc_int32_t n, Max_used_Band; | 587 | mpc_int32_t n, Max_used_Band; |
586 | const mpc_can_data * Table, * Tables[2]; | 588 | const mpc_can_data * Table, * Tables[2]; |
diff --git a/apps/codecs/libmusepack/mpcdec.h b/apps/codecs/libmusepack/mpcdec.h index 68754dcbd2..85536e726a 100644 --- a/apps/codecs/libmusepack/mpcdec.h +++ b/apps/codecs/libmusepack/mpcdec.h | |||
@@ -139,7 +139,9 @@ MPC_API void mpc_decoder_exit(mpc_decoder *p_dec); | |||
139 | * by this factor. Useful for applying replay gain. | 139 | * by this factor. Useful for applying replay gain. |
140 | * @param scale_factor multiplicative scaling factor | 140 | * @param scale_factor multiplicative scaling factor |
141 | */ | 141 | */ |
142 | /* rockbox: changed to static | ||
142 | MPC_API void mpc_decoder_scale_output(mpc_decoder *p_dec, double scale_factor); | 143 | MPC_API void mpc_decoder_scale_output(mpc_decoder *p_dec, double scale_factor); |
144 | */ | ||
143 | 145 | ||
144 | MPC_API void mpc_decoder_decode_frame(mpc_decoder * d, mpc_bits_reader * r, mpc_frame_info * i); | 146 | MPC_API void mpc_decoder_decode_frame(mpc_decoder * d, mpc_bits_reader * r, mpc_frame_info * i); |
145 | 147 | ||
diff --git a/apps/codecs/libmusepack/requant.c b/apps/codecs/libmusepack/requant.c index ad26867204..5a113b0885 100644 --- a/apps/codecs/libmusepack/requant.c +++ b/apps/codecs/libmusepack/requant.c | |||
@@ -90,7 +90,7 @@ static mpc_uint32_t find_shift(double fval) | |||
90 | 90 | ||
91 | #define SET_SCF(N,X) d->SCF[N] = MAKE_MPC_SAMPLE_EX(X,d->SCF_shift[N] = (mpc_uint8_t) find_shift(X)); | 91 | #define SET_SCF(N,X) d->SCF[N] = MAKE_MPC_SAMPLE_EX(X,d->SCF_shift[N] = (mpc_uint8_t) find_shift(X)); |
92 | 92 | ||
93 | void | 93 | static void |
94 | mpc_decoder_scale_output(mpc_decoder *d, double factor) | 94 | mpc_decoder_scale_output(mpc_decoder *d, double factor) |
95 | { | 95 | { |
96 | mpc_int32_t n; double f1, f2; | 96 | mpc_int32_t n; double f1, f2; |
diff --git a/apps/codecs/libspc/spc_codec.h b/apps/codecs/libspc/spc_codec.h index caa6860088..7f6b6e2e9f 100644 --- a/apps/codecs/libspc/spc_codec.h +++ b/apps/codecs/libspc/spc_codec.h | |||
@@ -433,14 +433,6 @@ struct Timer | |||
433 | int counter; | 433 | int counter; |
434 | }; | 434 | }; |
435 | 435 | ||
436 | void Timer_run_( struct Timer* t, long time ) ICODE_ATTR_SPC; | ||
437 | |||
438 | static inline void Timer_run( struct Timer* t, long time ) | ||
439 | { | ||
440 | if ( time >= t->next_tick ) | ||
441 | Timer_run_( t, time ); | ||
442 | } | ||
443 | |||
444 | struct Spc_Emu | 436 | struct Spc_Emu |
445 | { | 437 | { |
446 | uint8_t cycle_table [0x100]; | 438 | uint8_t cycle_table [0x100]; |
@@ -490,14 +482,6 @@ static inline int DSP_read( struct Spc_Dsp* this, int i ) | |||
490 | return this->r.reg [i]; | 482 | return this->r.reg [i]; |
491 | } | 483 | } |
492 | 484 | ||
493 | void SPC_run_dsp_( THIS, long time ) ICODE_ATTR_SPC; | ||
494 | |||
495 | static inline void SPC_run_dsp( THIS, long time ) | ||
496 | { | ||
497 | if ( time >= this->next_dsp ) | ||
498 | SPC_run_dsp_( this, time ); | ||
499 | } | ||
500 | |||
501 | int SPC_read( THIS, unsigned addr, long const time ) ICODE_ATTR_SPC; | 485 | int SPC_read( THIS, unsigned addr, long const time ) ICODE_ATTR_SPC; |
502 | void SPC_write( THIS, unsigned addr, int data, long const time ) ICODE_ATTR_SPC; | 486 | void SPC_write( THIS, unsigned addr, int data, long const time ) ICODE_ATTR_SPC; |
503 | 487 | ||
diff --git a/apps/codecs/libspc/spc_emu.c b/apps/codecs/libspc/spc_emu.c index 0ad1329a6b..5ea5b0cdeb 100644 --- a/apps/codecs/libspc/spc_emu.c +++ b/apps/codecs/libspc/spc_emu.c | |||
@@ -32,7 +32,8 @@ struct cpu_ram_t ram IBSS_ATTR_SPC_LARGE_IRAM CACHEALIGN_ATTR; | |||
32 | 32 | ||
33 | /**************** Timers ****************/ | 33 | /**************** Timers ****************/ |
34 | 34 | ||
35 | void Timer_run_( struct Timer* t, long time ) | 35 | static void Timer_run_( struct Timer* t, long time ) ICODE_ATTR_SPC; |
36 | static void Timer_run_( struct Timer* t, long time ) | ||
36 | { | 37 | { |
37 | /* when disabled, next_tick should always be in the future */ | 38 | /* when disabled, next_tick should always be in the future */ |
38 | assert( t->enabled ); | 39 | assert( t->enabled ); |
@@ -50,6 +51,12 @@ void Timer_run_( struct Timer* t, long time ) | |||
50 | t->count = elapsed; | 51 | t->count = elapsed; |
51 | } | 52 | } |
52 | 53 | ||
54 | static inline void Timer_run( struct Timer* t, long time ) | ||
55 | { | ||
56 | if ( time >= t->next_tick ) | ||
57 | Timer_run_( t, time ); | ||
58 | } | ||
59 | |||
53 | /**************** SPC emulator ****************/ | 60 | /**************** SPC emulator ****************/ |
54 | /* 1.024 MHz clock / 32000 samples per second */ | 61 | /* 1.024 MHz clock / 32000 samples per second */ |
55 | 62 | ||
@@ -179,7 +186,8 @@ int SPC_load_spc( THIS, const void* data, long size ) | |||
179 | } | 186 | } |
180 | 187 | ||
181 | /**************** DSP interaction ****************/ | 188 | /**************** DSP interaction ****************/ |
182 | void SPC_run_dsp_( THIS, long time ) | 189 | static void SPC_run_dsp_( THIS, long time ) ICODE_ATTR_SPC; |
190 | static void SPC_run_dsp_( THIS, long time ) | ||
183 | { | 191 | { |
184 | /* divide by CLOCKS_PER_SAMPLE */ | 192 | /* divide by CLOCKS_PER_SAMPLE */ |
185 | int count = ((time - this->next_dsp) >> 5) + 1; | 193 | int count = ((time - this->next_dsp) >> 5) + 1; |
@@ -189,6 +197,12 @@ void SPC_run_dsp_( THIS, long time ) | |||
189 | DSP_run( &this->dsp, count, buf ); | 197 | DSP_run( &this->dsp, count, buf ); |
190 | } | 198 | } |
191 | 199 | ||
200 | static inline void SPC_run_dsp( THIS, long time ) | ||
201 | { | ||
202 | if ( time >= this->next_dsp ) | ||
203 | SPC_run_dsp_( this, time ); | ||
204 | } | ||
205 | |||
192 | int SPC_read( THIS, unsigned addr, long const time ) | 206 | int SPC_read( THIS, unsigned addr, long const time ) |
193 | { | 207 | { |
194 | int result = RAM [addr]; | 208 | int result = RAM [addr]; |
diff --git a/apps/codecs/libtremor/res012.c b/apps/codecs/libtremor/res012.c index 79e3c23e15..e4ff440a6d 100644 --- a/apps/codecs/libtremor/res012.c +++ b/apps/codecs/libtremor/res012.c | |||
@@ -289,11 +289,11 @@ static int res1_inverse(vorbis_block *vb,vorbis_look_residue *vl, | |||
289 | } | 289 | } |
290 | 290 | ||
291 | /* duplicate code here as speed is somewhat more important */ | 291 | /* duplicate code here as speed is somewhat more important */ |
292 | int res2_inverse(vorbis_block *vb,vorbis_look_residue *vl, | 292 | static int res2_inverse(vorbis_block *vb,vorbis_look_residue *vl, |
293 | ogg_int32_t **in,int *nonzero,int ch) | 293 | ogg_int32_t **in,int *nonzero,int ch) |
294 | ICODE_ATTR_TREMOR_NOT_MDCT; | 294 | ICODE_ATTR_TREMOR_NOT_MDCT; |
295 | int res2_inverse(vorbis_block *vb,vorbis_look_residue *vl, | 295 | static int res2_inverse(vorbis_block *vb,vorbis_look_residue *vl, |
296 | ogg_int32_t **in,int *nonzero,int ch){ | 296 | ogg_int32_t **in,int *nonzero,int ch){ |
297 | long i,k,l,s; | 297 | long i,k,l,s; |
298 | vorbis_look_residue0 *look=(vorbis_look_residue0 *)vl; | 298 | vorbis_look_residue0 *look=(vorbis_look_residue0 *)vl; |
299 | vorbis_info_residue0 *info=look->info; | 299 | vorbis_info_residue0 *info=look->info; |
diff --git a/apps/codecs/libtta/ttadec.c b/apps/codecs/libtta/ttadec.c index 130cff8b41..aaefe736b9 100644 --- a/apps/codecs/libtta/ttadec.c +++ b/apps/codecs/libtta/ttadec.c | |||
@@ -53,7 +53,7 @@ static decoder tta[MAX_NCH] IBSS_ATTR; /* decoder state */ | |||
53 | /* Rockbox speciffic: cache is defined in get_samples() (non static value) */ | 53 | /* Rockbox speciffic: cache is defined in get_samples() (non static value) */ |
54 | /* static int cache[MAX_NCH]; // decoder cache */ | 54 | /* static int cache[MAX_NCH]; // decoder cache */ |
55 | 55 | ||
56 | tta_info *ttainfo IBSS_ATTR; /* currently playing file info */ | 56 | static tta_info *ttainfo IBSS_ATTR; /* currently playing file info */ |
57 | 57 | ||
58 | static unsigned int fframes IBSS_ATTR; /* number of frames in file */ | 58 | static unsigned int fframes IBSS_ATTR; /* number of frames in file */ |
59 | static unsigned int framelen IBSS_ATTR; /* the frame length in samples */ | 59 | static unsigned int framelen IBSS_ATTR; /* the frame length in samples */ |
diff --git a/apps/codecs/spc.c b/apps/codecs/spc.c index 80c28abbc1..6b21f9ad19 100644 --- a/apps/codecs/spc.c +++ b/apps/codecs/spc.c | |||
@@ -34,7 +34,7 @@ CODEC_HEADER | |||
34 | 34 | ||
35 | /**************** ID666 parsing ****************/ | 35 | /**************** ID666 parsing ****************/ |
36 | 36 | ||
37 | struct { | 37 | static struct { |
38 | unsigned char isBinary; | 38 | unsigned char isBinary; |
39 | char song[32]; | 39 | char song[32]; |
40 | char game[32]; | 40 | char game[32]; |
@@ -397,7 +397,7 @@ static inline void spc_play_send_samples(int32_t *samples) | |||
397 | 397 | ||
398 | #else /* !SPC_DUAL_CORE */ | 398 | #else /* !SPC_DUAL_CORE */ |
399 | /** Implementations for single-core operation **/ | 399 | /** Implementations for single-core operation **/ |
400 | int32_t wav_chunk[WAV_CHUNK_SIZE*2] IBSS_ATTR; | 400 | static int32_t wav_chunk[WAV_CHUNK_SIZE*2] IBSS_ATTR; |
401 | 401 | ||
402 | /* load a new program into emu */ | 402 | /* load a new program into emu */ |
403 | static inline int load_spc_buffer(uint8_t *buf, size_t size) | 403 | static inline int load_spc_buffer(uint8_t *buf, size_t size) |
diff --git a/apps/codecs/wav.c b/apps/codecs/wav.c index 42bcc7081f..f6f83b174d 100644 --- a/apps/codecs/wav.c +++ b/apps/codecs/wav.c | |||
@@ -60,7 +60,7 @@ enum | |||
60 | WAVE_FORMAT_EXTENSIBLE = 0xFFFE | 60 | WAVE_FORMAT_EXTENSIBLE = 0xFFFE |
61 | }; | 61 | }; |
62 | 62 | ||
63 | const struct pcm_entry wave_codecs[] = { | 63 | static const struct pcm_entry wave_codecs[] = { |
64 | { WAVE_FORMAT_UNKNOWN, 0 }, | 64 | { WAVE_FORMAT_UNKNOWN, 0 }, |
65 | { WAVE_FORMAT_PCM, get_linear_pcm_codec }, | 65 | { WAVE_FORMAT_PCM, get_linear_pcm_codec }, |
66 | { WAVE_FORMAT_ADPCM, get_ms_adpcm_codec }, | 66 | { WAVE_FORMAT_ADPCM, get_ms_adpcm_codec }, |
diff --git a/apps/codecs/wmapro.c b/apps/codecs/wmapro.c index d451810216..17e311c5c0 100644 --- a/apps/codecs/wmapro.c +++ b/apps/codecs/wmapro.c | |||
@@ -25,7 +25,8 @@ | |||
25 | 25 | ||
26 | CODEC_HEADER | 26 | CODEC_HEADER |
27 | 27 | ||
28 | int32_t *dec[2]; /* pointers to the output buffers in WMAProDecodeCtx in wmaprodec.c */ | 28 | static int32_t *dec[2]; /* pointers to the output buffers in WMAProDecodeCtx in |
29 | wmaprodec.c */ | ||
29 | 30 | ||
30 | 31 | ||
31 | /* this is the codec entry point */ | 32 | /* this is the codec entry point */ |