3 files changed, 23 insertions, 15 deletions

diff --git a/firmware/export/hosted_codec.h b/firmware/export/hosted_codec.h
index 50d1281394..62a4d57613 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 99359f72ce..ea7ccfceb2 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 f4e0d203a1..bc0d113c4c 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 */