len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-13 18:17:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix FS#12794 - new EQ code does not compile for the Nokia N8x0

Browse source 
The old GCC version currently required (sbox-arm-linux-gcc 3.4.4
release) apparently has trouble with function pointers used as
static array initializers when using indexed initializers + ranges
(ie. [A ... B] = fn).

Change-Id: I494c2b607e4d93a9893264749d0ac257fb54ce3b
This commit is contained in:
Michael Sevakis 2012-12-28 14:12:18 -05:00
parent 8ecbcad3d1
commit 362ade3892
1 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

22
lib/rbcodec/dsp/eq.c
View file

@ -71,15 +71,6 @@ void dsp_set_eq_precut(int precut)
/* Update the filter configuration for the band */ /* Update the filter configuration for the band */
void dsp_set_eq_coefs(int band, const struct eq_band_setting *setting) void dsp_set_eq_coefs(int band, const struct eq_band_setting *setting)
{ {
static void (* const coef_gen[EQ_NUM_BANDS])(unsigned long cutoff,
unsigned long Q, long db,
struct dsp_filter *f) =
{
[0] = filter_ls_coefs,
[1 ... EQ_NUM_BANDS-2] = filter_pk_coefs,
[EQ_NUM_BANDS-1] = filter_hs_coefs,
};
if (band < 0 || band >= EQ_NUM_BANDS) if (band < 0 || band >= EQ_NUM_BANDS)
return; return;
@ -98,8 +89,17 @@ void dsp_set_eq_coefs(int band, const struct eq_band_setting *setting)
/* Convert user settings to format required by coef generator /* Convert user settings to format required by coef generator
functions */ functions */
coef_gen[band](0xffffffff / NATIVE_FREQUENCY * setting->cutoff, void (* coef_gen)(unsigned long cutoff, unsigned long Q, long db,
setting->q ?: 1, setting->gain, filter); struct dsp_filter *f) = filter_pk_coefs;
/* Only first and last bands are not peaking filters */
if (band == 0)
coef_gen = filter_ls_coefs;
else if (band == EQ_NUM_BANDS-1)
coef_gen = filter_hs_coefs;
coef_gen(0xffffffff / NATIVE_FREQUENCY * setting->cutoff,
setting->q ?: 1, setting->gain, filter);
} }
if (mask == eq_data.enabled) if (mask == eq_data.enabled)