2 files changed, 19 insertions, 5 deletions

diff --git a/firmware/drivers/audio/wm8985.c b/firmware/drivers/audio/wm8985.c
index f7b2e510ae..d59d2d3230 100644
--- a/firmware/drivers/audio/wm8985.c
+++ b/firmware/drivers/audio/wm8985.c
@@ -186,6 +186,13 @@ void audiohw_set_lineout_vol(int vol_l, int vol_r)
     wmcodec_write(ROUT2VOL, 0x100 | vol_r);
 }
 
+void audiohw_set_aux_vol(int vol_l, int vol_r)
+{
+    /* OUTMIX */
+    wmcodec_write(LOUTMIX, 0x111 | (vol_l << 5) );
+    wmcodec_write(ROUTMIX, 0x111 | (vol_r << 5) );
+}
+
 void audiohw_set_bass(int value)
 {
     eq1_reg = (eq1_reg & ~EQ_GAIN_MASK) | EQ_GAIN_VALUE(value);
diff --git a/firmware/drivers/tuner/lv24020lp.c b/firmware/drivers/tuner/lv24020lp.c
index 769be8ac77..c6d396aca4 100644
--- a/firmware/drivers/tuner/lv24020lp.c
+++ b/firmware/drivers/tuner/lv24020lp.c
@@ -29,19 +29,17 @@
 #include "power.h"
 #include "fmradio.h" /* physical interface driver */
 #include "sound.h"
-#include "pp5024.h"
 #include "system.h"
 
 #ifndef BOOTLOADER
 
 static struct mutex tuner_mtx;
 
-#if 0
 /* define to enable tuner logging */
-#define SANYO_TUNER_LOG
-#endif
+#undef SANYO_TUNER_LOG_FILE
+#undef SANYO_TUNER_LOGF
 
-#ifdef SANYO_TUNER_LOG
+#ifdef SANYO_TUNER_LOG_FILE
 #include "sprintf.h"
 #include "file.h"
 
@@ -52,6 +50,15 @@ static int fd_log = -1;
 /* syncing required because close() is never called */
 #define TUNER_LOG_SYNC()    fsync(fd_log)
 #define TUNER_LOG(s...)     fdprintf(fd_log, s)
+
+#elif defined(SANYO_TUNER_LOGF)
+#define LOGF_ENABLE
+#include "logf.h"
+
+#define TUNER_LOG_OPEN()
+#define TUNER_LOG_SYNC()
+#define TUNER_LOG(s...)     logf(s)
+
 #else
 #define TUNER_LOG_OPEN()
 #define TUNER_LOG_SYNC()