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/export/wm8985.h | |
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/export/wm8985.h')
-rw-r--r-- | firmware/export/wm8985.h | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/firmware/export/wm8985.h b/firmware/export/wm8985.h index 4538b5edc5..a5eb59f159 100644 --- a/firmware/export/wm8985.h +++ b/firmware/export/wm8985.h | |||
@@ -29,15 +29,25 @@ | |||
29 | #ifdef COWON_D2 | 29 | #ifdef COWON_D2 |
30 | /* FIXME: somehow something was out of sync in the .lang, settings and caps. Keep the | 30 | /* FIXME: somehow something was out of sync in the .lang, settings and caps. Keep the |
31 | * cutoffs disabled until someone with the device works it out. */ | 31 | * cutoffs disabled until someone with the device works it out. */ |
32 | #define AUDIOHW_CAPS (BASS_CAP | TREBLE_CAP) | 32 | #define AUDIOHW_CAPS (BASS_CAP | TREBLE_CAP | LINEOUT_CAP | \ |
33 | LIN_GAIN_CAP | MIC_GAIN_CAP) | ||
33 | #else | 34 | #else |
34 | #define AUDIOHW_CAPS (BASS_CAP | TREBLE_CAP | BASS_CUTOFF_CAP | TREBLE_CUTOFF_CAP) | 35 | #define AUDIOHW_CAPS (BASS_CAP | TREBLE_CAP | BASS_CUTOFF_CAP | \ |
36 | TREBLE_CUTOFF_CAP | LINEOUT_CAP | LIN_GAIN_CAP | \ | ||
37 | MIC_GAIN_CAP) | ||
38 | AUDIOHW_SETTING(BASS_CUTOFF, "", 0, 1, 1, 4, 1) | ||
39 | AUDIOHW_SETTING(TREBLE_CUTOFF, "", 0, 1, 1, 4, 1) | ||
35 | #endif | 40 | #endif |
36 | 41 | ||
37 | extern int tenthdb2master(int db); | 42 | AUDIOHW_SETTING(VOLUME, "dB", 0, 1, -90, 6, -25) |
43 | AUDIOHW_SETTING(BASS, "dB", 0, 1, -12, 12, 0) | ||
44 | AUDIOHW_SETTING(TREBLE, "dB", 0, 1, -12, 12, 0) | ||
45 | #ifdef HAVE_RECORDING | ||
46 | AUDIOHW_SETTING(LEFT_GAIN, "dB", 1, 1,-128, 96, 0) | ||
47 | AUDIOHW_SETTING(RIGHT_GAIN, "dB", 1, 1,-128, 96, 0) | ||
48 | AUDIOHW_SETTING(MIC_GAIN, "dB", 1, 1,-128, 108, 16) | ||
49 | #endif /* HAVE_RECORDING */ | ||
38 | 50 | ||
39 | extern void audiohw_set_headphone_vol(int vol_l, int vol_r); | 51 | void audiohw_set_aux_vol(int vol_l, int vol_r); |
40 | extern void audiohw_set_lineout_vol(int vol_l, int vol_r); | ||
41 | extern void audiohw_set_aux_vol(int vol_l, int vol_r); | ||
42 | 52 | ||
43 | #endif /* _WM8985_H */ | 53 | #endif /* _WM8985_H */ |