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

1 files changed, 18 insertions, 87 deletions

diff --git a/firmware/drivers/audio/sdl.c b/firmware/drivers/audio/sdl.c
index 3c7cc55ce9..eea10ad12c 100644
--- a/firmware/drivers/audio/sdl.c
+++ b/firmware/drivers/audio/sdl.c
@@ -32,107 +32,32 @@
 #ifdef HAVE_SW_VOLUME_CONTROL
 #include "pcm_sw_volume.h"
 
-void audiohw_set_master_vol(int vol_l, int vol_r)
+void audiohw_set_volume(int vol_l, int vol_r)
 {
     pcm_set_master_volume(vol_l, vol_r);
 }
+
 #else /* ndef HAVE_SW_VOLUME_CONTROL */
+
 extern void pcm_set_mixer_volume(int);
 
 void audiohw_set_volume(int volume)
 {
 #if CONFIG_CODEC == SWCODEC
-#if (CONFIG_PLATFORM & PLATFORM_MAEMO5)
+#if !(CONFIG_PLATFORM & PLATFORM_MAEMO5)
+    if (volume < VOLUME_MIN)
+        volume = 0;
+    else
+        volume = SDL_MIX_MAXVOLUME * (volume - VOLUME_MIN + ONE_DB) /
+                    (VOLUME_RANGE + ONE_DB);
+#endif /* !(CONFIG_PLATFORM & PLATFORM_MAEMO5) */
+
     pcm_set_mixer_volume(volume);
-#else
-    pcm_set_mixer_volume(
-        SDL_MIX_MAXVOLUME * ((volume - VOLUME_MIN) / 10) / (VOLUME_RANGE / 10));
-#endif /* (CONFIG_PLATFORM & PLATFORM_MAEMO5) */
-#else
-    (void)volume;
 #endif /* CONFIG_CODEC == SWCODEC */
+    (void)volume;
 }
 #endif /* HAVE_SW_VOLUME_CONTROL */
 
-const struct sound_settings_info audiohw_settings[] = {
-    [SOUND_VOLUME]        = {"dB", 0,  1, VOLUME_MIN / 10, VOLUME_MAX / 10, -25},
-/* Bass and treble tone controls */
-#ifdef AUDIOHW_HAVE_BASS
-    [SOUND_BASS]          = {"dB", 0,  1, -24,  24,   0},
-#endif
-#ifdef AUDIOHW_HAVE_TREBLE
-    [SOUND_TREBLE]        = {"dB", 0,  1, -24,  24,   0},
-#endif
-    [SOUND_BALANCE]       = {"%",  0,  1,-100, 100,   0},
-    [SOUND_CHANNELS]      = {"",   0,  1,   0,   5,   0},
-    [SOUND_STEREO_WIDTH]  = {"%",  0,  5,   0, 250, 100},
-#if defined(HAVE_RECORDING)
-    [SOUND_LEFT_GAIN]     = {"dB", 1,  1,-128,  96,   0},
-    [SOUND_RIGHT_GAIN]    = {"dB", 1,  1,-128,  96,   0},
-    [SOUND_MIC_GAIN]      = {"dB", 1,  1,-128, 108,  16},
-#endif
-#if defined(AUDIOHW_HAVE_BASS_CUTOFF)
-    [SOUND_BASS_CUTOFF]   = {"",   0,  1,   1,   4,   1},
-#endif
-#if defined(AUDIOHW_HAVE_TREBLE_CUTOFF)
-    [SOUND_TREBLE_CUTOFF] = {"",   0,  1,   1,   4,   1},
-#endif
-#if defined(AUDIOHW_HAVE_DEPTH_3D)
-    [SOUND_DEPTH_3D]      = {"%",  0,   1,   0,  15,   0},
-#endif
-/* Hardware EQ tone controls */
-#if defined(AUDIOHW_HAVE_EQ_BAND1)
-    [SOUND_EQ_BAND1_GAIN] = {"dB", 0,  1, -12,  12,   0},
-#endif
-#if defined(AUDIOHW_HAVE_EQ_BAND2)
-    [SOUND_EQ_BAND2_GAIN] = {"dB", 0,  1, -12,  12,   0},
-#endif
-#if defined(AUDIOHW_HAVE_EQ_BAND3)
-    [SOUND_EQ_BAND3_GAIN] = {"dB", 0,  1, -12,  12,   0},
-#endif
-#if defined(AUDIOHW_HAVE_EQ_BAND4)
-    [SOUND_EQ_BAND4_GAIN] = {"dB", 0,  1, -12,  12,   0},
-#endif
-#if defined(AUDIOHW_HAVE_EQ_BAND5)
-    [SOUND_EQ_BAND5_GAIN] = {"dB", 0,  1, -12,  12,   0},
-#endif
-#if defined(AUDIOHW_HAVE_EQ_BAND1_FREQUENCY)
-    [SOUND_EQ_BAND1_FREQUENCY] = {"",   0,  1,   1,   4,   1},
-#endif
-#if defined(AUDIOHW_HAVE_EQ_BAND2_FREQUENCY)
-    [SOUND_EQ_BAND2_FREQUENCY] = {"",   0,  1,   1,   4,   1},
-#endif
-#if defined(AUDIOHW_HAVE_EQ_BAND3_FREQUENCY)
-    [SOUND_EQ_BAND3_FREQUENCY] = {"",   0,  1,   1,   4,   1},
-#endif
-#if defined(AUDIOHW_HAVE_EQ_BAND4_FREQUENCY)
-    [SOUND_EQ_BAND4_FREQUENCY] = {"",   0,  1,   1,   4,   1},
-#endif
-#if defined(AUDIOHW_HAVE_EQ_BAND5_FREQUENCY)
-    [SOUND_EQ_BAND5_FREQUENCY] = {"",   0,  1,   1,   4,   1},
-#endif
-#if defined(AUDIOHW_HAVE_EQ_BAND2_WIDTH)
-    [SOUND_EQ_BAND2_WIDTH]     = {"",   0,  1,   0,   1,   0},
-#endif
-#if defined(AUDIOHW_HAVE_EQ_BAND3_WIDTH)
-    [SOUND_EQ_BAND3_WIDTH]     = {"",   0,  1,   0,   1,   0},
-#endif
-#if defined(AUDIOHW_HAVE_EQ_BAND4_WIDTH)
-    [SOUND_EQ_BAND4_WIDTH]     = {"",   0,  1,   0,   1,   0},
-#endif
-
-#if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F)
-    [SOUND_LOUDNESS]      = {"dB", 0,  1,   0,  17,   0},
-    [SOUND_AVC]           = {"",   0,  1,  -1,   4,   0},
-    [SOUND_MDB_STRENGTH]  = {"dB", 0,  1,   0, 127,  48},
-    [SOUND_MDB_HARMONICS] = {"%",  0,  1,   0, 100,  50},
-    [SOUND_MDB_CENTER]    = {"Hz", 0, 10,  20, 300,  60},
-    [SOUND_MDB_SHAPE]     = {"Hz", 0, 10,  50, 300,  90},
-    [SOUND_MDB_ENABLE]    = {"",   0,  1,   0,   1,   0},
-    [SOUND_SUPERBASS]     = {"",   0,  1,   0,   1,   0},
-#endif /* (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) */
-};
-
 /**
  * stubs here, for the simulator
  **/
@@ -149,12 +74,14 @@ void audiohw_set_prescaler(int value)
 #if defined(AUDIOHW_HAVE_BALANCE)
 void audiohw_set_balance(int value)     { (void)value; }
 #endif
+#ifndef HAVE_SW_TONE_CONTROLS
 #if defined(AUDIOHW_HAVE_BASS)
 void audiohw_set_bass(int value)        { (void)value; }
 #endif
 #if defined(AUDIOHW_HAVE_TREBLE)
 void audiohw_set_treble(int value)      { (void)value; }
 #endif
+#endif /* HAVE_SW_TONE_CONTROLS */
 #if CONFIG_CODEC != SWCODEC
 void audiohw_set_channel(int value)     { (void)value; }
 void audiohw_set_stereo_width(int value){ (void)value; }
@@ -182,6 +109,10 @@ void audiohw_set_eq_band_width(unsigned int band, int value)
 void audiohw_set_depth_3d(int value)
     { (void)value; }
 #endif
+#if defined(AUDIOHW_HAVE_LINEOUT)
+void audiohw_set_lineout_volume(int vol_l, int vol_r)
+    { (void)vol_l; (void)vol_r; }
+#endif
 
 void audiohw_close(void) {}