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/wm8758.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/wm8758.c')
-rw-r--r-- | firmware/drivers/audio/wm8758.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/firmware/drivers/audio/wm8758.c b/firmware/drivers/audio/wm8758.c index 3f3ac79229..f7d7a5bc22 100644 --- a/firmware/drivers/audio/wm8758.c +++ b/firmware/drivers/audio/wm8758.c | |||
@@ -38,7 +38,7 @@ static unsigned short eq1_reg = EQ1_EQ3DMODE | EQ_GAIN_VALUE(0); | |||
38 | static unsigned short eq5_reg = EQ_GAIN_VALUE(0); | 38 | static unsigned short eq5_reg = EQ_GAIN_VALUE(0); |
39 | 39 | ||
40 | /* convert tenth of dB volume (-89..6) to master volume register value */ | 40 | /* convert tenth of dB volume (-89..6) to master volume register value */ |
41 | int tenthdb2master(int db) | 41 | static int vol_tenthdb2hw(int db) |
42 | { | 42 | { |
43 | /* att DAC AMP result | 43 | /* att DAC AMP result |
44 | +6dB 0 +6 96 | 44 | +6dB 0 +6 96 |
@@ -47,10 +47,10 @@ int tenthdb2master(int db) | |||
47 | -58dB -1 -57 32 | 47 | -58dB -1 -57 32 |
48 | -89dB -32 -57 1 | 48 | -89dB -32 -57 1 |
49 | -90dB -oo -oo 0 */ | 49 | -90dB -oo -oo 0 */ |
50 | if (db < VOLUME_MIN) { | 50 | if (db <= -900) { |
51 | return 0; | 51 | return 0; |
52 | } else { | 52 | } else { |
53 | return (db-VOLUME_MIN)/10 + 1; | 53 | return db / 10 - -90; |
54 | } | 54 | } |
55 | } | 55 | } |
56 | 56 | ||
@@ -137,6 +137,10 @@ void audiohw_postinit(void) | |||
137 | void audiohw_set_volume(int vol_l, int vol_r) | 137 | void audiohw_set_volume(int vol_l, int vol_r) |
138 | { | 138 | { |
139 | int dac_l, amp_l, dac_r, amp_r; | 139 | int dac_l, amp_l, dac_r, amp_r; |
140 | |||
141 | vol_l = vol_tenthdb2hw(vol_l); | ||
142 | vol_r = vol_tenthdb2hw(vol_r); | ||
143 | |||
140 | get_volume_params(vol_l, &dac_l, &_l); | 144 | get_volume_params(vol_l, &dac_l, &_l); |
141 | get_volume_params(vol_r, &dac_r, &_r); | 145 | get_volume_params(vol_r, &dac_r, &_r); |
142 | 146 | ||