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/as3514.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/as3514.h')
-rw-r--r-- | firmware/export/as3514.h | 39 |
1 files changed, 25 insertions, 14 deletions
diff --git a/firmware/export/as3514.h b/firmware/export/as3514.h index 85da14493f..e9e48fab63 100644 --- a/firmware/export/as3514.h +++ b/firmware/export/as3514.h | |||
@@ -24,11 +24,32 @@ | |||
24 | 24 | ||
25 | #include "config.h" | 25 | #include "config.h" |
26 | 26 | ||
27 | extern int tenthdb2master(int db); | 27 | #if 0 |
28 | #define AUDIOHW_CAPS (LINEOUT_CAP | LIN_GAIN_CAP | MIC_GAIN_CAP) | ||
29 | #endif | ||
30 | |||
31 | #define AUDIOHW_CAPS (LIN_GAIN_CAP | MIC_GAIN_CAP) | ||
32 | |||
33 | /*different volume ranges for different AMS chips*/ | ||
34 | #if CONFIG_CPU == AS3525v2 | ||
35 | /* Headphone volume goes from -81.0 ... +6dB */ | ||
36 | #define VOLUME_MIN -810 | ||
37 | #define VOLUME_MAX 60 | ||
38 | AUDIOHW_SETTING(VOLUME, "dB", 0, 1, -82, 6, -25) | ||
39 | #else /* AS3525v1 */ | ||
40 | /* Headphone volume goes from -73.5 ... +6dB */ | ||
41 | #define VOLUME_MIN -735 | ||
42 | #define VOLUME_MAX 60 | ||
43 | AUDIOHW_SETTING(VOLUME, "dB", 0, 1, -74, 6, -25) | ||
44 | #endif /* CONFIG_CPU == AS3525v2 */ | ||
28 | 45 | ||
29 | extern void audiohw_set_master_vol(int vol_l, int vol_r); | 46 | #ifdef HAVE_RECORDING |
30 | extern void audiohw_set_lineout_vol(int vol_l, int vol_r); | 47 | AUDIOHW_SETTING(MIC_GAIN, "dB", 1, 1, 0, 39, 23, (val - 23) * 15) |
31 | extern void audiohw_set_sampr_dividers(int fsel); | 48 | AUDIOHW_SETTING(LEFT_GAIN, "dB", 1, 1, 0, 31, 23, (val - 23) * 15) |
49 | AUDIOHW_SETTING(RIGHT_GAIN, "dB", 1, 1, 0, 31, 23, (val - 23) * 15) | ||
50 | #endif /* HAVE_RECORDING */ | ||
51 | |||
52 | void audiohw_set_sampr_dividers(int fsel); | ||
32 | 53 | ||
33 | /* Register Descriptions */ | 54 | /* Register Descriptions */ |
34 | 55 | ||
@@ -126,16 +147,6 @@ extern void audiohw_set_sampr_dividers(int fsel); | |||
126 | #define AS3514_UID_LEN 16 | 147 | #define AS3514_UID_LEN 16 |
127 | #endif | 148 | #endif |
128 | 149 | ||
129 | /*different volume ranges for different AMS chips*/ | ||
130 | #if CONFIG_CPU == AS3525v2 | ||
131 | /* Headphone volume goes from -81.0 ... +6dB */ | ||
132 | #define VOLUME_MIN -810 | ||
133 | #else | ||
134 | /* Headphone volume goes from -73.5 ... +6dB */ | ||
135 | #define VOLUME_MIN -735 | ||
136 | #endif | ||
137 | #define VOLUME_MAX 60 | ||
138 | |||
139 | /*** Audio Registers ***/ | 150 | /*** Audio Registers ***/ |
140 | 151 | ||
141 | /* 00h (LINE_OUT_R) to 16h (AUDIOSET3) */ | 152 | /* 00h (LINE_OUT_R) to 16h (AUDIOSET3) */ |