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/tsc2100.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/tsc2100.c')
-rw-r--r-- | firmware/drivers/audio/tsc2100.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/firmware/drivers/audio/tsc2100.c b/firmware/drivers/audio/tsc2100.c index fda192a62a..b74d445056 100644 --- a/firmware/drivers/audio/tsc2100.c +++ b/firmware/drivers/audio/tsc2100.c | |||
@@ -34,12 +34,12 @@ static bool is_muted = false; | |||
34 | static int vol_tenthdb2hw(int db) | 34 | static int vol_tenthdb2hw(int db) |
35 | { | 35 | { |
36 | /* 0 to -63.0dB in 1dB steps, tsc2100 can goto -63.5 in 0.5dB steps */ | 36 | /* 0 to -63.0dB in 1dB steps, tsc2100 can goto -63.5 in 0.5dB steps */ |
37 | if (db < VOLUME_MIN) { | 37 | if (db <= -640) { |
38 | return 0x7E; | 38 | return 0x7E; |
39 | } else if (db >= VOLUME_MAX) { | 39 | } else if (db >= 0) { |
40 | return 0x00; | 40 | return 0x00; |
41 | } else { | 41 | } else { |
42 | return(-((db)/5)); /* VOLUME_MIN is negative */ | 42 | return(-((db)/5)); |
43 | } | 43 | } |
44 | } | 44 | } |
45 | 45 | ||