From e61e9c61d0ba6990576d59efca07afa13fd97566 Mon Sep 17 00:00:00 2001 From: Michael Sevakis Date: Sat, 20 Apr 2013 04:06:13 -0400 Subject: 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 --- firmware/drivers/audio/ak4537.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'firmware/drivers/audio/ak4537.c') diff --git a/firmware/drivers/audio/ak4537.c b/firmware/drivers/audio/ak4537.c index 1628af8a5c..90d264e445 100644 --- a/firmware/drivers/audio/ak4537.c +++ b/firmware/drivers/audio/ak4537.c @@ -67,9 +67,9 @@ static void codec_set_active(int active) /* convert tenth of dB volume (-1270..0) to master volume register value */ static int vol_tenthdb2hw(int db) { - if (db < VOLUME_MIN) + if (db <= -1280) return 0xff; /* mute */ - else if (db >= VOLUME_MAX) + else if (db >= 0) return 0x00; else return ((-db)/5); -- cgit v1.2.3