From 0c7b7873984e04941c9f21fa272638018fdb9a16 Mon Sep 17 00:00:00 2001 From: Michael Sevakis Date: Fri, 12 Apr 2013 23:35:47 -0400 Subject: 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 --- firmware/export/as3514.h | 39 +++++++++++++++++++++++++-------------- 1 file changed, 25 insertions(+), 14 deletions(-) (limited to 'firmware/export/as3514.h') 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 @@ #include "config.h" -extern int tenthdb2master(int db); +#if 0 +#define AUDIOHW_CAPS (LINEOUT_CAP | LIN_GAIN_CAP | MIC_GAIN_CAP) +#endif + +#define AUDIOHW_CAPS (LIN_GAIN_CAP | MIC_GAIN_CAP) + +/*different volume ranges for different AMS chips*/ +#if CONFIG_CPU == AS3525v2 +/* Headphone volume goes from -81.0 ... +6dB */ +#define VOLUME_MIN -810 +#define VOLUME_MAX 60 +AUDIOHW_SETTING(VOLUME, "dB", 0, 1, -82, 6, -25) +#else /* AS3525v1 */ +/* Headphone volume goes from -73.5 ... +6dB */ +#define VOLUME_MIN -735 +#define VOLUME_MAX 60 +AUDIOHW_SETTING(VOLUME, "dB", 0, 1, -74, 6, -25) +#endif /* CONFIG_CPU == AS3525v2 */ -extern void audiohw_set_master_vol(int vol_l, int vol_r); -extern void audiohw_set_lineout_vol(int vol_l, int vol_r); -extern void audiohw_set_sampr_dividers(int fsel); +#ifdef HAVE_RECORDING +AUDIOHW_SETTING(MIC_GAIN, "dB", 1, 1, 0, 39, 23, (val - 23) * 15) +AUDIOHW_SETTING(LEFT_GAIN, "dB", 1, 1, 0, 31, 23, (val - 23) * 15) +AUDIOHW_SETTING(RIGHT_GAIN, "dB", 1, 1, 0, 31, 23, (val - 23) * 15) +#endif /* HAVE_RECORDING */ + +void audiohw_set_sampr_dividers(int fsel); /* Register Descriptions */ @@ -126,16 +147,6 @@ extern void audiohw_set_sampr_dividers(int fsel); #define AS3514_UID_LEN 16 #endif -/*different volume ranges for different AMS chips*/ -#if CONFIG_CPU == AS3525v2 -/* Headphone volume goes from -81.0 ... +6dB */ -#define VOLUME_MIN -810 -#else -/* Headphone volume goes from -73.5 ... +6dB */ -#define VOLUME_MIN -735 -#endif -#define VOLUME_MAX 60 - /*** Audio Registers ***/ /* 00h (LINE_OUT_R) to 16h (AUDIOSET3) */ -- cgit v1.2.3