diff options
author | Michael Sevakis <jethead71@rockbox.org> | 2013-04-20 04:06:13 -0400 |
---|---|---|
committer | Michael Sevakis <jethead71@rockbox.org> | 2013-04-22 20:38:17 -0400 |
commit | e61e9c61d0ba6990576d59efca07afa13fd97566 (patch) | |
tree | 4b17b22dd4f56568666e25292f38224529ec7113 /firmware/drivers/audio/as3514.c | |
parent | 91b33d5a3e92d62cf6fb6be875437d35b632caf5 (diff) | |
download | rockbox-e61e9c61d0ba6990576d59efca07afa13fd97566.tar.gz rockbox-e61e9c61d0ba6990576d59efca07afa13fd97566.zip |
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
Diffstat (limited to 'firmware/drivers/audio/as3514.c')
-rw-r--r-- | firmware/drivers/audio/as3514.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/firmware/drivers/audio/as3514.c b/firmware/drivers/audio/as3514.c index e1c7f6575e..1f79277423 100644 --- a/firmware/drivers/audio/as3514.c +++ b/firmware/drivers/audio/as3514.c @@ -31,6 +31,16 @@ #include "i2s.h" #include "ascodec.h" +#if CONFIG_CPU == AS3525v2 +/* Headphone volume goes from -81.0 ... +6dB */ +#define VOLUME_MIN -820 +#define VOLUME_MAX 60 +#else +/* Headphone volume goes from -73.5 ... +6dB */ +#define VOLUME_MIN -740 +#define VOLUME_MAX 60 +#endif + /* * This drivers supports: * as3514 , as used in the PP targets @@ -99,13 +109,12 @@ static void as3514_write_masked(unsigned int reg, unsigned int bits, /* convert tenth of dB volume to master volume register value */ static int vol_tenthdb2hw(int db) { - /* +6 to -73.5dB (or -81.0 dB) in 1.5dB steps == 53 (or 58) levels */ - if (db < VOLUME_MIN) { + if (db <= VOLUME_MIN) { return 0x0; } else if (db > VOLUME_MAX) { - return (VOLUME_MAX-VOLUME_MIN)/15; + return (VOLUME_MAX - VOLUME_MIN) / 15; } else { - return((db-VOLUME_MIN)/15); /* VOLUME_MIN is negative */ + return (db - VOLUME_MIN) / 15; } } |