diff options
author | Michael Sevakis <jethead71@rockbox.org> | 2013-04-12 23:35:47 -0400 |
---|---|---|
committer | Michael Sevakis <jethead71@rockbox.org> | 2013-04-15 12:02:05 -0400 |
commit | 0c7b7873984e04941c9f21fa272638018fdb9a16 (patch) | |
tree | fb6afca45d2bef0a2c91732a39ffc0b965f5c557 /firmware/drivers/audio/tlv320.c | |
parent | fd9e2568908f91b5bcf7378dc28f6ec070d6027a (diff) | |
download | rockbox-0c7b7873984e04941c9f21fa272638018fdb9a16.tar.gz rockbox-0c7b7873984e04941c9f21fa272638018fdb9a16.zip |
Straighten out the mad twisted state of sound.c and related areas.
This is going right in since it's long overdue. If anything is goofed,
drop me a line or just tweak it yourself if you know what's wrong. :-)
Make HW/SW codec interface more uniform when emulating HW functionality
on SWCODEC for functions such as "audiohw_set_pitch". The firmware-to-
DSP plumbing is in firmware/drivers/audiohw-swcodec.c. "sound_XXX"
APIs are all in sound.c with none in DSP code any longer.
Reduce number of settings definitions needed by each codec by providing
defaults for common ones like balance, channels and SW tone controls.
Remove need for separate SIM code and tables and add virtual codec header
for hosted targets.
Change-Id: I3f23702bca054fc9bda40f49824ce681bb7f777b
Diffstat (limited to 'firmware/drivers/audio/tlv320.c')
-rw-r--r-- | firmware/drivers/audio/tlv320.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/firmware/drivers/audio/tlv320.c b/firmware/drivers/audio/tlv320.c index 6b96ed212f..23d2fea3a1 100644 --- a/firmware/drivers/audio/tlv320.c +++ b/firmware/drivers/audio/tlv320.c | |||
@@ -46,8 +46,8 @@ const struct sound_settings_info audiohw_settings[] = { | |||
46 | #endif | 46 | #endif |
47 | }; | 47 | }; |
48 | 48 | ||
49 | /* convert tenth of dB volume (-840..0) to master volume register value */ | 49 | /* convert tenth of dB volume (-73..6) to master volume register value */ |
50 | int tenthdb2master(int db) | 50 | static int vol_tenthdb2hw(int db) |
51 | { | 51 | { |
52 | /* +6 to -73dB 1dB steps (plus mute == 80levels) 7bits */ | 52 | /* +6 to -73dB 1dB steps (plus mute == 80levels) 7bits */ |
53 | /* 1111111 == +6dB (0x7f) */ | 53 | /* 1111111 == +6dB (0x7f) */ |
@@ -210,8 +210,11 @@ void audiohw_set_frequency(int fsel) | |||
210 | * | 210 | * |
211 | * Left & Right: 48 .. 121 .. 127 => Volume -73dB (mute) .. +0 dB .. +6 dB | 211 | * Left & Right: 48 .. 121 .. 127 => Volume -73dB (mute) .. +0 dB .. +6 dB |
212 | */ | 212 | */ |
213 | void audiohw_set_headphone_vol(int vol_l, int vol_r) | 213 | void audiohw_set_volume(int vol_l, int vol_r) |
214 | { | 214 | { |
215 | vol_l = vol_tenthdb2hw(vol_l); | ||
216 | vol_r = vol_tenthdb2hw(vol_r); | ||
217 | |||
215 | unsigned value_dap = tlv320_regs[REG_DAP]; | 218 | unsigned value_dap = tlv320_regs[REG_DAP]; |
216 | unsigned value_dap_last = value_dap; | 219 | unsigned value_dap_last = value_dap; |
217 | unsigned value_l = LHV_LHV(vol_l); | 220 | unsigned value_l = LHV_LHV(vol_l); |