From 93712c97eef684c75b542ca1a30c4e9d1f3fc3fc Mon Sep 17 00:00:00 2001 From: Jens Arnold Date: Mon, 26 Feb 2007 18:36:58 +0000 Subject: [PATCH] WM8711/8721/8731 have no tone controls, so enable the software tone controls for the respective targets. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12499 a1c6a512-1295-4272-9138-f99709370657 --- firmware/export/config-h10.h | 5 ++++- firmware/export/config-h10_5gb.h | 5 ++++- firmware/export/config-ipod3g.h | 3 +++ firmware/export/config-ipodmini.h | 3 +++ firmware/export/config-ipodmini2g.h | 3 +++ firmware/sound.c | 2 -- 6 files changed, 17 insertions(+), 4 deletions(-) diff --git a/firmware/export/config-h10.h b/firmware/export/config-h10.h index 08497ad52d..a66a387f02 100644 --- a/firmware/export/config-h10.h +++ b/firmware/export/config-h10.h @@ -65,9 +65,12 @@ /* The number of bytes reserved for loadable plugins */ #define PLUGIN_BUFFER_SIZE 0x80000 -/* Define this if you have the WM8975 audio codec */ +/* Define this if you have the WM8731 audio codec */ #define HAVE_WM8731 +/* WM8731 has no tone controls, so we use the software ones */ +#define HAVE_SW_TONE_CONTROLS + #define AB_REPEAT_ENABLE 1 /* FM Tuner */ diff --git a/firmware/export/config-h10_5gb.h b/firmware/export/config-h10_5gb.h index 9fd3edfdb6..fa643b01b9 100644 --- a/firmware/export/config-h10_5gb.h +++ b/firmware/export/config-h10_5gb.h @@ -59,9 +59,12 @@ /* The number of bytes reserved for loadable plugins */ #define PLUGIN_BUFFER_SIZE 0x80000 -/* Define this if you have the WM8975 audio codec */ +/* Define this if you have the WM8731 audio codec */ #define HAVE_WM8731 +/* WM8731 has no tone controls, so we use the software ones */ +#define HAVE_SW_TONE_CONTROLS + #define AB_REPEAT_ENABLE 1 /* FM Tuner */ diff --git a/firmware/export/config-ipod3g.h b/firmware/export/config-ipod3g.h index b893e5c30c..d97b5ac886 100644 --- a/firmware/export/config-ipod3g.h +++ b/firmware/export/config-ipod3g.h @@ -62,6 +62,9 @@ /* Define this if you have the WM8731L audio codec */ #define HAVE_WM8731 +/* WM8731 has no tone controls, so we use the software ones */ +#define HAVE_SW_TONE_CONTROLS + /* Define this for LCD backlight available */ #define CONFIG_BACKLIGHT BL_IPOD3G /* port controlled */ diff --git a/firmware/export/config-ipodmini.h b/firmware/export/config-ipodmini.h index 687c55e3b0..df5da35f4c 100644 --- a/firmware/export/config-ipodmini.h +++ b/firmware/export/config-ipodmini.h @@ -62,6 +62,9 @@ /* Define this if you have the WM8721 audio codec */ #define HAVE_WM8721 /* actually WM8731 but no recording */ +/* WM8721 has no tone controls, so we use the software ones */ +#define HAVE_SW_TONE_CONTROLS + #define AB_REPEAT_ENABLE 1 #define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE diff --git a/firmware/export/config-ipodmini2g.h b/firmware/export/config-ipodmini2g.h index 105d1d78ed..aa5bef2df0 100644 --- a/firmware/export/config-ipodmini2g.h +++ b/firmware/export/config-ipodmini2g.h @@ -62,6 +62,9 @@ /* Define this if you have the WM8721 audio codec */ #define HAVE_WM8721 /* actually WM8731 but no recording */ +/* WM8721 has no tone controls, so we use the software ones */ +#define HAVE_SW_TONE_CONTROLS + #define AB_REPEAT_ENABLE 1 #define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE diff --git a/firmware/sound.c b/firmware/sound.c index a2b4e96e81..01d76a0a39 100644 --- a/firmware/sound.c +++ b/firmware/sound.c @@ -75,8 +75,6 @@ static const struct sound_settings_info sound_settings_table[] = { [SOUND_TREBLE] = {"dB", 0, 1, -6, 9, 0, sound_set_treble}, #elif defined(HAVE_WM8731) || defined(HAVE_WM8721) [SOUND_VOLUME] = {"dB", 0, 1, -74, 6, -25, sound_set_volume}, - [SOUND_BASS] = {"dB", 0, 1, -6, 9, 0, sound_set_bass}, - [SOUND_TREBLE] = {"dB", 0, 1, -6, 9, 0, sound_set_treble}, #elif (CONFIG_CPU == PNX0101) [SOUND_VOLUME] = {"dB", 0, 1, -48, 15, 0, sound_set_volume}, #elif defined(HAVE_PP5024_CODEC)