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/wm8758.h | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) (limited to 'firmware/export/wm8758.h') diff --git a/firmware/export/wm8758.h b/firmware/export/wm8758.h index ef5567e898..89b000cf8c 100644 --- a/firmware/export/wm8758.h +++ b/firmware/export/wm8758.h @@ -26,15 +26,22 @@ #define VOLUME_MIN -890 #define VOLUME_MAX 60 -#define AUDIOHW_CAPS (BASS_CAP | TREBLE_CAP | BASS_CUTOFF_CAP | TREBLE_CUTOFF_CAP) - -extern int tenthdb2master(int db); -extern int tenthdb2mixer(int db); - -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_mixer_vol(int channel1, int channel2); -extern void audiohw_enable_lineout(bool enable); +#define AUDIOHW_CAPS (BASS_CAP | TREBLE_CAP | BASS_CUTOFF_CAP | \ + TREBLE_CUTOFF_CAP | LINEOUT_CAP | LIN_GAIN_CAP | \ + MIC_GAIN_CAP) + +AUDIOHW_SETTING(VOLUME, "dB", 0, 1, -90, 6, -25) +AUDIOHW_SETTING(BASS, "dB", 0, 1, -12, 12, 0) +AUDIOHW_SETTING(TREBLE, "dB", 0, 1, -12, 12, 0) +AUDIOHW_SETTING(BASS_CUTOFF, "", 0, 1, 1, 4, 1) +AUDIOHW_SETTING(TREBLE_CUTOFF, "", 0, 1, 1, 4, 1) +#ifdef HAVE_RECORDING +AUDIOHW_SETTING(LEFT_GAIN, "dB", 1, 1, 0, 63, 16, ((val - 23) * 15) / 2 + 200) +AUDIOHW_SETTING(RIGHT_GAIN, "dB", 1, 1, 0, 63, 16, ((val - 23) * 15) / 2 + 200) +AUDIOHW_SETTING(MIC_GAIN, "dB", 1, 1, 0, 63, 16, ((val - 23) * 15) / 2 + 200) +#endif /* HAVE_RECORDING */ + +void audiohw_enable_lineout(bool enable); #define RESET 0x00 #define RESET_RESET 0x0 -- cgit v1.2.3