1 files changed, 7 insertions, 44 deletions

diff --git a/firmware/drivers/audio/wm8975.c b/firmware/drivers/audio/wm8975.c
index c46dab79de..3b9fef0dbc 100644
--- a/firmware/drivers/audio/wm8975.c
+++ b/firmware/drivers/audio/wm8975.c
@@ -34,20 +34,6 @@
 #include "wmcodec.h"
 #include "audiohw.h"
 
-const struct sound_settings_info audiohw_settings[] = {
-    [SOUND_VOLUME]        = {"dB", 0,  1, -74,   6, -25},
-    [SOUND_BASS]          = {"dB", 0,  1,  -6,   9,   0},
-    [SOUND_TREBLE]        = {"dB", 0,  1,  -6,   9,   0},
-    [SOUND_BALANCE]       = {"%",  0,  1,-100, 100,   0},
-    [SOUND_CHANNELS]      = {"",   0,  1,   0,   5,   0},
-    [SOUND_STEREO_WIDTH]  = {"%",  0,  5,   0, 250, 100},
-#ifdef HAVE_RECORDING
-    [SOUND_LEFT_GAIN]     = {"dB", 1,  1,   0,  63,  23},
-    [SOUND_RIGHT_GAIN]    = {"dB", 1,  1,   0,  63,  23},
-    [SOUND_MIC_GAIN]      = {"dB", 1,  1,   0,  63,   0},
-#endif
-};
-
 static unsigned short wm8975_regs[WM8975_NUM_REGISTERS] =
 {
     [LINVOL]   = LINVOL_LZCEN | 23, /* 0dB */
@@ -85,7 +71,7 @@ static void wm8975_write_or(int reg, unsigned bits)
 }
 
 /* convert tenth of dB volume (-730..60) to master volume register value */
-int tenthdb2master(int db)
+static int vol_tenthdb2hw(int db)
 {
     /* +6 to -73dB 1dB steps (plus mute == 80levels) 7bits */
     /* 1111111 == +6dB  (0x7f) */
@@ -100,29 +86,6 @@ int tenthdb2master(int db)
     }
 }
 
-int sound_val2phys(int setting, int value)
-{
-    int result;
-
-    switch(setting)
-    {
-#ifdef HAVE_RECORDING
-    case SOUND_LEFT_GAIN:
-    case SOUND_RIGHT_GAIN:
-        result = ((value - 23) * 15) / 2;
-        break;
-    case SOUND_MIC_GAIN:
-        result = ((value - 23) * 15) / 2 + 200;
-        break;
-#endif
-    default:
-        result = value;
-        break;
-    }
-
-    return result;
-}
-
 static void audiohw_mute(bool mute)
 {
     if (mute) {
@@ -205,13 +168,10 @@ void audiohw_postinit(void)
 }
 #endif
 
-void audiohw_set_master_vol(int vol_l, int vol_r)
+void audiohw_set_volume(int vol_l, int vol_r)
 {
-    /* +6 to -73dB 1dB steps (plus mute == 80levels) 7bits */
-    /* 1111111 == +6dB */
-    /* 1111001 == 0dB */
-    /* 0110000 == -73dB */
-    /* 0101111 == mute (0x2f) */
+    vol_l = vol_tenthdb2hw(vol_l);
+    vol_r = vol_tenthdb2hw(vol_r);
 
     /* OUT1 */
     wm8975_write(LOUT1VOL, LOUT1VOL_LO1ZC | vol_l);
@@ -220,6 +180,9 @@ void audiohw_set_master_vol(int vol_l, int vol_r)
 
 void audiohw_set_lineout_vol(int vol_l, int vol_r)
 {
+    vol_l = vol_tenthdb2hw(vol_l);
+    vol_r = vol_tenthdb2hw(vol_r);
+
     /* OUT2 */
     wm8975_write(LOUT2VOL, LOUT2VOL_LO2ZC | vol_l);
     wm8975_write(ROUT2VOL, ROUT2VOL_RO2VU | ROUT2VOL_RO2ZC | vol_r);