diff options
| author | Michael Sevakis <jethead71@rockbox.org> | 2013-04-15 14:00:48 -0400 |
|---|---|---|
| committer | Michael Sevakis <jethead71@rockbox.org> | 2013-04-15 14:00:48 -0400 |
| commit | 9e71fd16a55bd69f2cf3345b5ab3459b29c1832d (patch) | |
| tree | 4c60af99e480be496d4fe8b691c89b356b52e884 /firmware/export | |
| parent | bbd991ad63805533ec4e2558061bbba48bfab1a9 (diff) | |
| download | rockbox-9e71fd16a55bd69f2cf3345b5ab3459b29c1832d.zip rockbox-9e71fd16a55bd69f2cf3345b5ab3459b29c1832d.tar.gz rockbox-9e71fd16a55bd69f2cf3345b5ab3459b29c1832d.tar.bz2 rockbox-9e71fd16a55bd69f2cf3345b5ab3459b29c1832d.tar.xz | |
Keep fixing 0c7b787 stuff
Change-Id: I0678d3307fbcad32156f9f4e0f8b90eed5a20d92
Diffstat (limited to 'firmware/export')
| -rw-r--r-- | firmware/export/hosted_codec.h | 23 | ||||
| -rw-r--r-- | firmware/export/tlv320.h | 13 | ||||
| -rw-r--r-- | firmware/export/wm8975.h | 2 |
3 files changed, 23 insertions, 15 deletions
diff --git a/firmware/export/hosted_codec.h b/firmware/export/hosted_codec.h index 50d1281..62a4d57 100644 --- a/firmware/export/hosted_codec.h +++ b/firmware/export/hosted_codec.h @@ -25,6 +25,27 @@ #define VOLUME_MAX 0 #define AUDIOHW_CAPS (MONO_VOL_CAP) -AUDIOHW_SETTING(VOLUME, "dB", 0, 1, -100, 0, 0) +AUDIOHW_SETTING(VOLUME, "dB", 0, 1,-100, 0, 0) + +#if (CONFIG_PLATFORM & PLATFORM_ANDROID) +/* Bass and treble tone controls */ +#ifdef AUDIOHW_HAVE_BASS +AUDIOHW_SETTING(BASS, "dB", 0, 1, -24, 24, 0) +#endif +#ifdef AUDIOHW_HAVE_TREBLE +AUDIOHW_SETTING(TREBLE, "dB", 0, 1, -24, 24, 0) +#endif +#if defined(HAVE_RECORDING) +AUDIOHW_SETTING(LEFT_GAIN, "dB", 1, 1,-128, 96, 0) +AUDIOHW_SETTING(RIGHT_GAIN, "dB", 1, 1,-128, 96, 0) +AUDIOHW_SETTING(MIC_GAIN, "dB", 1, 1,-128, 108, 16) +#endif +#if defined(AUDIOHW_HAVE_BASS_CUTOFF) +AUDIOHW_SETTING(BASS_CUTOFF, "", 0, 1, 1, 4, 1) +#endif +#if defined(AUDIOHW_HAVE_TREBLE_CUTOFF) +AUDIOHW_SETTING(TREBLE_CUTOFF, "", 0, 1, 1, 4, 1) +#endif +/* CONFIG_PLATFORM & PLATFORM_ANDROID */ #endif /* HOSTED_CODEC_H */
\ No newline at end of file diff --git a/firmware/export/tlv320.h b/firmware/export/tlv320.h index 99359f7..ea7ccfc 100644 --- a/firmware/export/tlv320.h +++ b/firmware/export/tlv320.h @@ -36,19 +36,6 @@ AUDIOHW_SETTING(RIGHT_GAIN, "dB", 1, 1, 0, 31, 23, (val - 23) * 15) AUDIOHW_SETTING(MIC_GAIN, "dB", 1, 1, 0, 1, 1, val * 200) #endif /* HAVE_RECORDING */ -static inline int _param_2_phys(int setting, int value) -{ - switch(setting) - { - default: return value; -#ifdef HAVE_RECORDING - case SOUND_LEFT_GAIN: - case SOUND_RIGHT_GAIN: return (value - 23) * 15; - case SOUND_MIC_GAIN: return value * 200; /* 0 or 20 dB */ -#endif - } -} - /*** definitions ***/ #define HEADPHONE_MUTE 0x30 /* 0110000 = -73db */ diff --git a/firmware/export/wm8975.h b/firmware/export/wm8975.h index f4e0d20..bc0d113 100644 --- a/firmware/export/wm8975.h +++ b/firmware/export/wm8975.h @@ -34,7 +34,7 @@ AUDIOHW_SETTING(BASS, "dB", 0, 1, -6, 9, 0) AUDIOHW_SETTING(TREBLE, "dB", 0, 1, -6, 9, 0) #ifdef HAVE_RECORDING AUDIOHW_SETTING(LEFT_GAIN, "dB", 1, 1, 0, 63, 23, ((val - 23) * 15) / 2) -AUDIOHW_SETTING(RIGHT_GAIN, "dB", 1, 1, 0, 63, 23, ((val - 23) * 15) / 2)) +AUDIOHW_SETTING(RIGHT_GAIN, "dB", 1, 1, 0, 63, 23, ((val - 23) * 15) / 2) AUDIOHW_SETTING(MIC_GAIN, "dB", 1, 1, 0, 63, 0, ((val - 23) * 15) / 2 + 200) #endif /* HAVE_RECORDING */ |