Do some cleanup, adjustment and a couple fixes to recent sound changes.

* SOUND_x enum can be generated by audiohw_settings.h along with settings
entries and sound_val2phys.

* VOLUME_MIN and VOLUME_MAX are no longer necessary within sound.c. If
you need them, they are for target-defined purposes.

* Fix up SDL volume implementation in sdl.c. Move sim volume calculation
code to pcm-sdl.c.

* Min trigger tresholds were based upon VOLUME_MIN for some reason.
These setting have nothing to do with playback volume. Since it is no
longer present, set these at -89dB which is the minimum peak meter
sensitivity setting.

* Fix an oversight in wm8758.c. I forgot to add the dB->register
conversion to audiohw_set_volume.

Change-Id: Ie1df33f1793eee75e6793f16bc7bddd16edb7f75

22 files changed, 38 insertions, 202 deletions

diff --git a/firmware/export/aic3x.h b/firmware/export/aic3x.h
index 65e1ebd62c..1baf52684a 100644
--- a/firmware/export/aic3x.h
+++ b/firmware/export/aic3x.h
@@ -22,9 +22,6 @@
 #ifndef _AIC3X_H_
 #define _AIC3X_H_
 
-#define VOLUME_MIN -630
-#define VOLUME_MAX  0
-
 AUDIOHW_SETTING(VOLUME, "dB",  0,  1, -64,   0, -25)
 
 /*** definitions ***/
diff --git a/firmware/export/ak4537.h b/firmware/export/ak4537.h
index abf2a378ae..d66205af7c 100644
--- a/firmware/export/ak4537.h
+++ b/firmware/export/ak4537.h
@@ -23,9 +23,6 @@
 #define _AK4537_H
 
 /* Volume goes from -127.0 ... 0 dB in 0.5 dB increments */
-#define VOLUME_MIN -1270
-#define VOLUME_MAX     0
-
 AUDIOHW_SETTING(VOLUME, "dB",  0,  1, -128,   0, -25)
 
 #define AKC_NUM_REGS        0x11
diff --git a/firmware/export/as3514.h b/firmware/export/as3514.h
index e9e48fab63..b5c9438786 100644
--- a/firmware/export/as3514.h
+++ b/firmware/export/as3514.h
@@ -32,14 +32,8 @@
 
 /*different volume ranges for different AMS chips*/
 #if CONFIG_CPU == AS3525v2 
-/* Headphone volume goes from -81.0 ... +6dB */
-#define VOLUME_MIN -810
-#define VOLUME_MAX   60
 AUDIOHW_SETTING(VOLUME,     "dB",   0,   1, -82,   6, -25)
 #else /* AS3525v1 */
-/* Headphone volume goes from -73.5 ... +6dB */
-#define VOLUME_MIN -735
-#define VOLUME_MAX   60
 AUDIOHW_SETTING(VOLUME,     "dB",   0,   1, -74,   6, -25)
 #endif /* CONFIG_CPU == AS3525v2 */
 
diff --git a/firmware/export/audiohw.h b/firmware/export/audiohw.h
index 3fce3fc6d4..e3b9623262 100644
--- a/firmware/export/audiohw.h
+++ b/firmware/export/audiohw.h
@@ -126,22 +126,6 @@ AUDIOHW_SETTING(BALANCE,      "%", 0, 1, -100, 100,   0)
 AUDIOHW_SETTING(CHANNELS,      "", 0, 1,    0,   5,   0)
 AUDIOHW_SETTING(STEREO_WIDTH, "%", 0, 5,    0, 250, 100)
 
-#define ONE_DB 10
-
-#if !defined(VOLUME_MIN) && !defined(VOLUME_MAX)
-#warning define for VOLUME_MIN and VOLUME_MAX is missing
-#define VOLUME_MIN -700
-#define VOLUME_MAX  0
-#endif
-
-#ifndef AUDIOHW_NUM_TONE_CONTROLS
-#define AUDIOHW_NUM_TONE_CONTROLS 0
-#endif
-
-/* volume/balance/treble/bass interdependency main part */
-#define VOLUME_RANGE (VOLUME_MAX - VOLUME_MIN)
-
-
 /* convert caps into defines */
 #ifdef AUDIOHW_CAPS
 /* Tone controls */
@@ -183,7 +167,7 @@ AUDIOHW_SETTING(STEREO_WIDTH, "%", 0, 5,    0, 250, 100)
 enum
 {
     /* Band 1 is implied; bands must be contiguous, 1 to N */
-    AUDIOHW_EQ_BAND1 = 0,
+    AUDIOHW_EQ_BAND1,
 #define AUDIOHW_HAVE_EQ_BAND1
 #if (AUDIOHW_EQ_BAND_CAPS & (EQ_CAP << 1))
     AUDIOHW_EQ_BAND2,
@@ -209,7 +193,6 @@ enum
 #define AUDIOHW_HAVE_EQ_FREQUENCY
 enum
 {
-    __AUDIOHW_EQ_BAND_FREQUENCY = -1,
 #if defined(AUDIOHW_HAVE_EQ_BAND1) && \
         (AUDIOHW_EQ_FREQUENCY_CAPS & (EQ_CAP << 0))
     AUDIOHW_EQ_BAND1_FREQUENCY,
@@ -235,7 +218,7 @@ enum
     AUDIOHW_EQ_BAND5_FREQUENCY,
 #define AUDIOHW_HAVE_EQ_BAND5_FREQUENCY
 #endif
-    AUDIOHW_EQ_FREQUENCY_NUM,
+    AUDIOHW_EQ_FREQUENCY_NUM, /* Keep last */
 };
 #endif /* AUDIOHW_EQ_FREQUENCY_CAPS */
 
@@ -244,7 +227,6 @@ enum
 #define AUDIOHW_HAVE_EQ_WIDTH
 enum
 {
-    __AUDIOHW_EQ_BAND_WIDTH = -1,
 #if defined(AUDIOHW_HAVE_EQ_BAND1) && \
         (AUDIOHW_EQ_WIDTH_CAPS & (EQ_CAP << 1))
     AUDIOHW_EQ_BAND2_WIDTH,
@@ -267,7 +249,7 @@ enum
 /* Types and number of settings types (gain, frequency, width) */
 enum AUDIOHW_EQ_SETTINGS
 {
-    AUDIOHW_EQ_GAIN = 0,
+    AUDIOHW_EQ_GAIN,
 #ifdef AUDIOHW_HAVE_EQ_FREQUENCY
     AUDIOHW_EQ_FREQUENCY,
 #endif
@@ -309,104 +291,8 @@ enum AUDIOHW_EQ_SETTINGS
 #endif
 #endif /* AUDIOHW_CAPS */
 
-enum {
-    /* TODO: Volume shouldn't be needed if device doesn't have digital control */
-    SOUND_VOLUME = 0,
-/* Tone control */
-#if defined(AUDIOHW_HAVE_BASS)
-    SOUND_BASS,
-#endif
-#if defined(AUDIOHW_HAVE_TREBLE)
-    SOUND_TREBLE,
-#endif
-    SOUND_BALANCE,
-    SOUND_CHANNELS,
-    SOUND_STEREO_WIDTH,
-#if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F)
-    SOUND_LOUDNESS,
-    SOUND_AVC,
-    SOUND_MDB_STRENGTH,
-    SOUND_MDB_HARMONICS,
-    SOUND_MDB_CENTER,
-    SOUND_MDB_SHAPE,
-    SOUND_MDB_ENABLE,
-    SOUND_SUPERBASS,
-#endif
-#if defined(AUDIOHW_HAVE_LIN_GAIN)
-    SOUND_LEFT_GAIN,
-    SOUND_RIGHT_GAIN,
-#endif
-#if defined(AUDIOHW_HAVE_MIC_GAIN)
-    SOUND_MIC_GAIN,
-#endif
-/* Bass and treble tone controls */
-#if defined(AUDIOHW_HAVE_BASS_CUTOFF)
-    SOUND_BASS_CUTOFF,
-#endif
-#if defined(AUDIOHW_HAVE_TREBLE_CUTOFF)
-    SOUND_TREBLE_CUTOFF,
-#endif
-/* 3D effect */
-#if defined(AUDIOHW_HAVE_DEPTH_3D)
-    SOUND_DEPTH_3D,
-#endif
-/* Hardware EQ tone controls */
-/* Band gains */
-#if defined(AUDIOHW_HAVE_EQ)
-    /* Band 1 implied */
-    SOUND_EQ_BAND1_GAIN,
-#if defined(AUDIOHW_HAVE_EQ_BAND2)
-    SOUND_EQ_BAND2_GAIN,
-#endif
-#if defined(AUDIOHW_HAVE_EQ_BAND3)
-    SOUND_EQ_BAND3_GAIN,
-#endif
-#if defined(AUDIOHW_HAVE_EQ_BAND4)
-    SOUND_EQ_BAND4_GAIN,
-#endif
-#if defined(AUDIOHW_HAVE_EQ_BAND5)
-    SOUND_EQ_BAND5_GAIN,
-#endif
-/* Band frequencies */
-#if defined(AUDIOHW_HAVE_EQ_BAND1_FREQUENCY)
-    SOUND_EQ_BAND1_FREQUENCY,
-#endif
-#if defined(AUDIOHW_HAVE_EQ_BAND2_FREQUENCY)
-    SOUND_EQ_BAND2_FREQUENCY,
-#endif
-#if defined(AUDIOHW_HAVE_EQ_BAND3_FREQUENCY)
-    SOUND_EQ_BAND3_FREQUENCY,
-#endif
-#if defined(AUDIOHW_HAVE_EQ_BAND4_FREQUENCY)
-    SOUND_EQ_BAND4_FREQUENCY,
-#endif
-#if defined(AUDIOHW_HAVE_EQ_BAND5_FREQUENCY)
-    SOUND_EQ_BAND5_FREQUENCY,
-#endif
-/* Band widths */
-#if defined(AUDIOHW_HAVE_EQ_BAND2_WIDTH)
-    SOUND_EQ_BAND2_WIDTH,
-#endif
-#if defined(AUDIOHW_HAVE_EQ_BAND3_WIDTH)
-    SOUND_EQ_BAND3_WIDTH,
-#endif
-#if defined(AUDIOHW_HAVE_EQ_BAND4_WIDTH)
-    SOUND_EQ_BAND4_WIDTH,
-#endif
-#endif /* AUDIOHW_HAVE_EQ */
-    SOUND_LAST_SETTING, /* Keep this last */
-};
-
-enum Channel
-{
-    SOUND_CHAN_STEREO,
-    SOUND_CHAN_MONO,
-    SOUND_CHAN_CUSTOM,
-    SOUND_CHAN_MONO_LEFT,
-    SOUND_CHAN_MONO_RIGHT,
-    SOUND_CHAN_KARAOKE,
-    SOUND_CHAN_NUM_MODES,
-};
+/* Generate enumeration of SOUND_xxx constants */
+#include "audiohw_settings.h"
 
 /* All usable functions implemented by a audio codec drivers. Most of
  * the function in sound settings are only called, when in audio codecs
@@ -619,8 +505,19 @@ void audiohw_set_monitor(bool enable);
 
 /**
  * Set channel configuration.
- * @param val new channel value (see enum Channel).
+ * @param val new channel value (see enum below).
  */
+enum AUDIOHW_CHANNEL_CONFIG
+{
+    SOUND_CHAN_STEREO,
+    SOUND_CHAN_MONO,
+    SOUND_CHAN_CUSTOM,
+    SOUND_CHAN_MONO_LEFT,
+    SOUND_CHAN_MONO_RIGHT,
+    SOUND_CHAN_KARAOKE,
+    SOUND_CHAN_NUM_MODES,
+};
+
 void audiohw_set_channel(int val);
 
 #ifdef HAVE_PITCHCONTROL
diff --git a/firmware/export/audiohw_settings.h b/firmware/export/audiohw_settings.h
index 8efbc0dbe7..f934c96302 100644
--- a/firmware/export/audiohw_settings.h
+++ b/firmware/export/audiohw_settings.h
@@ -21,6 +21,7 @@
  *
  ****************************************************************************/
 #if defined(AUDIOHW_SOUND_SETTINGS_ENTRIES)
+#undef AUDIOHW_SOUND_SETTINGS_ENTRIES
 /* Define sound_setting_entries table */
 
 #define AUDIOHW_SETTINGS(...) \
@@ -38,6 +39,7 @@
     [SOUND_##name] = { .info = &_audiohw_setting_##name, .function = fn },
 
 #elif defined(AUDIOHW_SOUND_SETTINGS_VAL2PHYS)
+#undef AUDIOHW_SOUND_SETTINGS_VAL2PHYS
 
 /* Implements sound_val2phys */
 #define AUDIOHW_SETTINGS(...) \
@@ -54,6 +56,19 @@
 #define AUDIOHW_SETTING_ENT(name, fn) \
     case SOUND_##name: return _sound_val2phys_##name(value);
 
+#else
+
+/* Generate enumeration of SOUND_xxx constants */
+#define AUDIOHW_SETTINGS(...) \
+    enum                                               \
+    {                                                  \
+        __VA_ARGS__                                    \
+        SOUND_LAST_SETTING,                            \
+    };
+
+#define AUDIOHW_SETTING_ENT(name, fn) \
+    SOUND_##name,
+
 #endif /* setting table type selection */
 
 AUDIOHW_SETTINGS(
@@ -139,5 +154,3 @@ AUDIOHW_SETTINGS(
 
 #undef AUDIOHW_SETTINGS
 #undef AUDIOHW_SETTING_ENT
-#undef AUDIOHW_SOUND_SETTINGS_ENTRIES
-#undef AUDIOHW_SOUND_SETTINGS_VAL2PHYS
diff --git a/firmware/export/cs42l55.h b/firmware/export/cs42l55.h
index 4584706dfd..d8d177e693 100644
--- a/firmware/export/cs42l55.h
+++ b/firmware/export/cs42l55.h
@@ -22,10 +22,6 @@
 #ifndef __CS42L55_H__
 #define __CS42L55_H__
 
-/* volume/balance/treble/bass interdependency */
-#define VOLUME_MIN -580
-#define VOLUME_MAX  120
-
 #define AUDIOHW_CAPS (BASS_CAP | TREBLE_CAP | BASS_CUTOFF_CAP | \
                       TREBLE_CUTOFF_CAP | PRESCALER_CAP | LINEOUT_CAP)
 
diff --git a/firmware/export/dummy_codec.h b/firmware/export/dummy_codec.h
index 90fd7b03c2..7337c2c730 100644
--- a/firmware/export/dummy_codec.h
+++ b/firmware/export/dummy_codec.h
@@ -22,9 +22,8 @@
 #ifndef __DUMMY_CODEC_H_
 #define __DUMMY_CODEC_H_
 
-#define VOLUME_MIN   -730
-#define VOLUME_MAX   0
-
-AUDIOHW_SETTING(VOLUME, "dB", 0, 1, VOLUME_MIN/10, VOLUME_MAX/10, 0)
+#define DUMMY_VOLUME_MIN    -740
+#define DUMMY_VOLUME_MAX    0
+AUDIOHW_SETTING(VOLUME, "dB", 0, 1, -74, 0, 0)
 
 #endif /* __DUMMY_CODEC_H_ */
diff --git a/firmware/export/hosted_codec.h b/firmware/export/hosted_codec.h
index e44da37c8d..72495709e8 100644
--- a/firmware/export/hosted_codec.h
+++ b/firmware/export/hosted_codec.h
@@ -21,11 +21,8 @@
 #ifndef HOSTED_CODEC_H
 #define HOSTED_CODEC_H
 
-#define VOLUME_MIN  -990
-#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, -99,   0,   0)
 
 #if (CONFIG_PLATFORM & PLATFORM_ANDROID)
 /* Bass and treble tone controls */
diff --git a/firmware/export/imx233-codec.h b/firmware/export/imx233-codec.h
index 2fbd8bde59..a02ef22fec 100644
--- a/firmware/export/imx233-codec.h
+++ b/firmware/export/imx233-codec.h
@@ -24,9 +24,6 @@
 /* i.MX233 can boost up to 6dB in DAC mode and 12dB in line mode. Since mic/line
  * already have adjustable gain, keep lowest of both. With chained DAC volume
  * and headphone volume, the i.MX233 can achieve < -100dB but stay at -100dB. */
-#define VOLUME_MIN -1000
-#define VOLUME_MAX  60
-
 #define AUDIOHW_CAPS    (DEPTH_3D_CAP | BASS_CAP | TREBLE_CAP | \
                          LIN_GAIN_CAP | MIC_GAIN_CAP)
 
diff --git a/firmware/export/jz4740-codec.h b/firmware/export/jz4740-codec.h
index fc731fdf50..4a2ca19a82 100644
--- a/firmware/export/jz4740-codec.h
+++ b/firmware/export/jz4740-codec.h
@@ -21,10 +21,6 @@
 #ifndef __JZ4740_CODEC_H_
 #define __JZ4740_CODEC_H_
 
-#define VOLUME_MIN -730
-#define VOLUME_MAX  60
-
-/* TODO */
 #ifdef HAVE_SW_VOLUME_CONTROL
 AUDIOHW_SETTING(VOLUME,     "dB", 0,  1, -74,   6, -25)
 #else
diff --git a/firmware/export/mas35xx.h b/firmware/export/mas35xx.h
index 0c6d21140c..02691f3de2 100644
--- a/firmware/export/mas35xx.h
+++ b/firmware/export/mas35xx.h
@@ -39,8 +39,6 @@
 
 #if CONFIG_CODEC == MAS3507D
 
-#define VOLUME_MIN -780
-#define VOLUME_MAX  180
 #define AUDIOHW_CAPS (BASS_CAP | TREBLE_CAP | PRESCALER_CAP)
 
 AUDIOHW_SETTING(VOLUME, "dB", 0,  1, -78,  18, -18)
@@ -171,9 +169,6 @@ static const unsigned int prescale_table[] =
 
 #else /* CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F */
 
-#define VOLUME_MIN -400
-#define VOLUME_MAX  600
-
 AUDIOHW_SETTING(VOLUME,       "dB",  0,  1,-100,  12, -25)
 AUDIOHW_SETTING(BASS,         "dB",  0,  1, -12,  12,   6)
 AUDIOHW_SETTING(TREBLE,       "dB",  0,  1, -12,  12,   6)
diff --git a/firmware/export/rk27xx_codec.h b/firmware/export/rk27xx_codec.h
index 5a6796d63c..28ab4730d8 100644
--- a/firmware/export/rk27xx_codec.h
+++ b/firmware/export/rk27xx_codec.h
@@ -24,8 +24,6 @@
 #ifndef _RK27XX_CODEC_H_
 #define _RK27XX_CODEC_H_
 
-#define VOLUME_MIN -330
-#define VOLUME_MAX   40
 #define AUDIOHW_CAPS    (BASS_CAP | TREBLE_CAP | LIN_GAIN_CAP | MIC_GAIN_CAP)
 
 AUDIOHW_SETTING(VOLUME,     "dB", 0,  1,   -34,    4, -25)
diff --git a/firmware/export/tlv320.h b/firmware/export/tlv320.h
index ea7ccfceb2..75f98bc142 100644
--- a/firmware/export/tlv320.h
+++ b/firmware/export/tlv320.h
@@ -22,9 +22,6 @@
 #ifndef _TLV320_H_
 #define _TLV320_H_
 
-#define VOLUME_MIN -730
-#define VOLUME_MAX  60
-
 #define AUDIOHW_CAPS    (LIN_GAIN_CAP | MIC_GAIN_CAP)
 
 AUDIOHW_SETTING(VOLUME,     "dB", 0,  1, -74,   6, -20)
diff --git a/firmware/export/tsc2100.h b/firmware/export/tsc2100.h
index 4e1e7d9287..11baf3ffcb 100644
--- a/firmware/export/tsc2100.h
+++ b/firmware/export/tsc2100.h
@@ -21,10 +21,6 @@
 #ifndef __TSC2100_H_
 #define __TSC2100_H_
 
-/* volume/balance/treble/bass interdependency */
-#define VOLUME_MIN -630
-#define VOLUME_MAX 0
-
 AUDIOHW_SETTING(VOLUME, "dB", 0, 1, -64, 0, -25)
 
 void tsc2100_read_data(void);
@@ -94,8 +90,6 @@ void tsc2100_keyclick(void);
 /* ts codec dac gain control */
 #define TSDACGAIN_PAGE          2
 #define TSDACGAIN_ADDRESS       0x02
-#define VOLUME_MAX  0
-#define VOLUME_MIN  -630
 
 /* ts audio control 2 */
 #define TSAC2_PAGE          2
diff --git a/firmware/export/uda1341.h b/firmware/export/uda1341.h
index 81eb1a3fa9..f07b4c62bf 100644
--- a/firmware/export/uda1341.h
+++ b/firmware/export/uda1341.h
@@ -22,14 +22,10 @@
 #ifndef _UDA1341_H
 #define _UDA1341_H
 
-/* volume/balance/treble/bass interdependency */
-#define VOLUME_MIN -840
-#define VOLUME_MAX  0
-
 #define AUDIOHW_CAPS    (BASS_CAP | TREBLE_CAP | MIC_GAIN_CAP | LIN_GAIN_CAP\
                          | MONO_VOL_CAP)
 
-AUDIOHW_SETTING(VOLUME,     "dB", 0,  1, -84,   0, -25)
+AUDIOHW_SETTING(VOLUME,     "dB", 0,  1, -61,   0, -25)
 AUDIOHW_SETTING(BASS,       "dB", 0,  2,   0,  24,   0)
 AUDIOHW_SETTING(TREBLE,     "dB", 0,  2,   0,   6,   0)
 #ifdef HAVE_RECORDING
diff --git a/firmware/export/uda1380.h b/firmware/export/uda1380.h
index a2200967dd..4d4f22ff82 100644
--- a/firmware/export/uda1380.h
+++ b/firmware/export/uda1380.h
@@ -22,14 +22,10 @@
 #ifndef _UDA1380_H
 #define _UDA1380_H
 
-/* volume/balance/treble/bass interdependency */
-#define VOLUME_MIN -840
-#define VOLUME_MAX  0
-
 #define AUDIOHW_CAPS (BASS_CAP | TREBLE_CAP | PRESCALER_CAP | \
                       LIN_GAIN_CAP | MIC_GAIN_CAP)
 
-AUDIOHW_SETTING(VOLUME,     "dB", 0,  1, -85,   0, -25)
+AUDIOHW_SETTING(VOLUME,     "dB", 0,  1, -84,   0, -25)
 AUDIOHW_SETTING(BASS,       "dB", 0,  2,   0,  24,   0)
 AUDIOHW_SETTING(TREBLE,     "dB", 0,  2,   0,   6,   0)
 #ifdef HAVE_RECORDING
diff --git a/firmware/export/wm8731.h b/firmware/export/wm8731.h
index 086c847ee1..10925880c3 100644
--- a/firmware/export/wm8731.h
+++ b/firmware/export/wm8731.h
@@ -24,10 +24,6 @@
 #ifndef _WM8731_H
 #define _WM8731_H
 
-/* volume/balance/treble/bass interdependency */
-#define VOLUME_MIN -730
-#define VOLUME_MAX  60
-
 #define AUDIOHW_CAPS        (LIN_GAIN_CAP | MIC_GAIN_CAP)
 
 AUDIOHW_SETTING(VOLUME,     "dB", 0,  1, -74,   6, -25)
diff --git a/firmware/export/wm8751.h b/firmware/export/wm8751.h
index aa18972c23..214643c64d 100644
--- a/firmware/export/wm8751.h
+++ b/firmware/export/wm8751.h
@@ -21,10 +21,6 @@
 #ifndef _WM8751_H
 #define _WM8751_H
 
-/* volume/balance/treble/bass interdependency */
-#define VOLUME_MIN -730
-#define VOLUME_MAX  60
-
 #if defined(HAVE_WM8750)
 #define AUDIOHW_CAPS (BASS_CAP | TREBLE_CAP | PRESCALER_CAP | \
                       BASS_CUTOFF_CAP | TREBLE_CUTOFF_CAP | \
diff --git a/firmware/export/wm8758.h b/firmware/export/wm8758.h
index 89b000cf8c..db6dd083dd 100644
--- a/firmware/export/wm8758.h
+++ b/firmware/export/wm8758.h
@@ -22,10 +22,6 @@
 #ifndef _WM8758_H
 #define _WM8758_H
 
-/* volume/balance/treble/bass interdependency */
-#define VOLUME_MIN -890
-#define VOLUME_MAX  60
-
 #define AUDIOHW_CAPS (BASS_CAP | TREBLE_CAP | BASS_CUTOFF_CAP | \
                       TREBLE_CUTOFF_CAP | LINEOUT_CAP | LIN_GAIN_CAP | \
                       MIC_GAIN_CAP)
diff --git a/firmware/export/wm8975.h b/firmware/export/wm8975.h
index bc0d113c4c..cdae7af865 100644
--- a/firmware/export/wm8975.h
+++ b/firmware/export/wm8975.h
@@ -22,10 +22,6 @@
 #ifndef _WM8975_H
 #define _WM8975_H
 
-/* volume/balance/treble/bass interdependency */
-#define VOLUME_MIN -730
-#define VOLUME_MAX  60
-
 #define AUDIOHW_CAPS (BASS_CAP | TREBLE_CAP | LINEOUT_CAP | \
                       LIN_GAIN_CAP | MIC_GAIN_CAP)
 
diff --git a/firmware/export/wm8978.h b/firmware/export/wm8978.h
index d5ed8f184c..00f46a02d5 100644
--- a/firmware/export/wm8978.h
+++ b/firmware/export/wm8978.h
@@ -23,9 +23,6 @@
 #ifndef _WM8978_H
 #define _WM8978_H
 
-#define VOLUME_MIN -890
-#define VOLUME_MAX 60
-
 #if 0
 #define AUDIOHW_CAPS (EQ_CAP | PRESCALER_CAP | DEPTH_3D_CAP | \
                       LIN_GAIN_CAP | MIC_GAIN_CAP)
diff --git a/firmware/export/wm8985.h b/firmware/export/wm8985.h
index a5eb59f159..f733133917 100644
--- a/firmware/export/wm8985.h
+++ b/firmware/export/wm8985.h
@@ -22,10 +22,6 @@
 #ifndef _WM8985_H
 #define _WM8985_H
 
-/* volume/balance/treble/bass interdependency */
-#define VOLUME_MIN -890
-#define VOLUME_MAX  60
-
 #ifdef COWON_D2
 /* FIXME: somehow something was out of sync in the .lang, settings and caps. Keep the
  * cutoffs disabled until someone with the device works it out. */