7 files changed, 9 insertions, 18 deletions

diff --git a/apps/SOURCES b/apps/SOURCES
index 6005460a5a..d34d7b8b30 100644
--- a/apps/SOURCES
+++ b/apps/SOURCES
@@ -159,11 +159,12 @@ radio/radioart.c
 #endif
 #endif
 
+fixedpoint.c
+
 #if CONFIG_CODEC == SWCODEC
 #if INPUT_SRC_CAPS != 0
 audio_path.c
 #endif /* INPUT_SRC_CAPS != 0 */
-fixedpoint.c
 pcmbuf.c
 codec_thread.c
 playback.c
diff --git a/firmware/drivers/audio/wm8758.c b/firmware/drivers/audio/wm8758.c
index 387a1a48c4..3f3ac79229 100644
--- a/firmware/drivers/audio/wm8758.c
+++ b/firmware/drivers/audio/wm8758.c
@@ -150,7 +150,7 @@ void audiohw_set_volume(int vol_l, int vol_r)
     wmcodec_write(ROUT1VOL, amp_r | ROUT1VOL_ROUT1ZC | ROUT1VOL_OUT1VU);
 }
 
-void audiohw_set_lineout_vol(int vol_l, int vol_r)
+void audiohw_set_lineout_volume(int vol_l, int vol_r)
 {
     int dac_l, amp_l, dac_r, amp_r;
     get_volume_params(vol_l, &dac_l, &amp_l);
diff --git a/firmware/drivers/audio/wm8975.c b/firmware/drivers/audio/wm8975.c
index 3b9fef0dbc..4905445aea 100644
--- a/firmware/drivers/audio/wm8975.c
+++ b/firmware/drivers/audio/wm8975.c
@@ -178,7 +178,7 @@ void audiohw_set_volume(int vol_l, int vol_r)
     wm8975_write(ROUT1VOL, ROUT1VOL_RO1VU | ROUT1VOL_RO1ZC | vol_r);
 }
 
-void audiohw_set_lineout_vol(int vol_l, int vol_r)
+void audiohw_set_lineout_volume(int vol_l, int vol_r)
 {
     vol_l = vol_tenthdb2hw(vol_l);
     vol_r = vol_tenthdb2hw(vol_r);
diff --git a/firmware/export/hosted_codec.h b/firmware/export/hosted_codec.h
index 62a4d57613..e44da37c8d 100644
--- a/firmware/export/hosted_codec.h
+++ b/firmware/export/hosted_codec.h
@@ -46,6 +46,6 @@ AUDIOHW_SETTING(BASS_CUTOFF,   "",   0,  1,   1,   4,   1)
 #if defined(AUDIOHW_HAVE_TREBLE_CUTOFF)
 AUDIOHW_SETTING(TREBLE_CUTOFF, "",   0,  1,   1,   4,   1)
 #endif
-/* CONFIG_PLATFORM & PLATFORM_ANDROID */
+#endif /* CONFIG_PLATFORM & PLATFORM_ANDROID */
 
 #endif /* HOSTED_CODEC_H */
\ No newline at end of file
diff --git a/firmware/export/mas35xx.h b/firmware/export/mas35xx.h
index e374a1b903..0c6d21140c 100644
--- a/firmware/export/mas35xx.h
+++ b/firmware/export/mas35xx.h
@@ -43,9 +43,9 @@
 #define VOLUME_MAX  180
 #define AUDIOHW_CAPS (BASS_CAP | TREBLE_CAP | PRESCALER_CAP)
 
-AUDIOHW_SETTING(SOUND_VOLUME, "dB", 0,  1, -78,  18, -18)
-AUDIOHW_SETTING(SOUND_BASS,   "dB", 0,  1, -15,  15,   7)
-AUDIOHW_SETTING(SOUND_TREBLE, "dB", 0,  1, -15,  15,   7)
+AUDIOHW_SETTING(VOLUME, "dB", 0,  1, -78,  18, -18)
+AUDIOHW_SETTING(BASS,   "dB", 0,  1, -15,  15,   7)
+AUDIOHW_SETTING(TREBLE, "dB", 0,  1, -15,  15,   7)
 
 /* I2C defines */
 #define MAS_ADR         0x3a
diff --git a/firmware/target/arm/tms320dm320/mrobe-500/dm320codec-mr500.c b/firmware/target/arm/tms320dm320/mrobe-500/dm320codec-mr500.c
index 16d388f0b9..b4774935b8 100644
--- a/firmware/target/arm/tms320dm320/mrobe-500/dm320codec-mr500.c
+++ b/firmware/target/arm/tms320dm320/mrobe-500/dm320codec-mr500.c
@@ -22,16 +22,6 @@
 #include "kernel.h"
 #include "sound.h"
 
-const struct sound_settings_info audiohw_settings[] = {
-    [SOUND_VOLUME]        = {"dB", 0,  1, -74,   6, -25},
-    [SOUND_BASS]          = {"dB", 1, 15, -60,  90,   0},
-    [SOUND_TREBLE]        = {"dB", 1, 15, -60,  90,   0},
-    [SOUND_BALANCE]       = {"%",  0,  1,-100, 100,   0},
-    [SOUND_CHANNELS]      = {"",   0,  1,   0,   5,   0},
-    [SOUND_STEREO_WIDTH]  = {"%",  0,  5,   0, 250, 100},
-};
-
-
 void audiohw_init(void)
 {
 }
diff --git a/firmware/target/mips/ingenic_jz47xx/codec-jz4740.c b/firmware/target/mips/ingenic_jz47xx/codec-jz4740.c
index eae89cf78b..ee15b27fae 100644
--- a/firmware/target/mips/ingenic_jz47xx/codec-jz4740.c
+++ b/firmware/target/mips/ingenic_jz47xx/codec-jz4740.c
@@ -270,7 +270,7 @@ void audiohw_init(void)
     i2s_codec_init();
 }
 
-void audiohw_set_master_vol(int vol_l, int vol_r)
+void audiohw_set_volume(int vol_l, int vol_r)
 {
 #ifdef HAVE_SW_VOLUME_CONTROL
     /* SW volume for <= 1.0 gain, HW at unity, < VOLUME_MIN == MUTE */