D2: Beginnings of a WM8985 driver (based on WM8758, using EQ1 and EQ5 as HW treble/bass). Untested, but harmless.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17057 a1c6a512-1295-4272-9138-f99709370657

3 files changed, 8 insertions, 10 deletions

diff --git a/firmware/export/audiohw.h b/firmware/export/audiohw.h
index ca706811a0..a4ff75c22c 100644
--- a/firmware/export/audiohw.h
+++ b/firmware/export/audiohw.h
@@ -69,7 +69,7 @@ enum {
     SOUND_RIGHT_GAIN,
     SOUND_MIC_GAIN,
 #endif
-#ifdef HAVE_WM8758
+#if defined(HAVE_WM8758) || defined(HAVE_WM8985)
     SOUND_BASS_CUTOFF,
     SOUND_TREBLE_CUTOFF,
 #endif
diff --git a/firmware/export/config-cowond2.h b/firmware/export/config-cowond2.h
index 78becb3161..74cf90eac4 100644
--- a/firmware/export/config-cowond2.h
+++ b/firmware/export/config-cowond2.h
@@ -83,8 +83,8 @@
 /* The D2 uses a WM8985 codec */
 #define HAVE_WM8985
 
-/* There is no hardware tone control */
-#define HAVE_SW_TONE_CONTROLS
+/* Use WM8985 EQ1 & EQ5 as hardware tone controls */
+/* #define HAVE_SW_TONE_CONTROLS */
 
 /* Define this for LCD backlight available */
 #define HAVE_BACKLIGHT
diff --git a/firmware/export/wm8985.h b/firmware/export/wm8985.h
index a12d7cda57..8fa58425bf 100644
--- a/firmware/export/wm8985.h
+++ b/firmware/export/wm8985.h
@@ -21,22 +21,20 @@
 #define _WM8985_H
 
 /* volume/balance/treble/bass interdependency */
-#define VOLUME_MIN -730
+#define VOLUME_MIN -570
 #define VOLUME_MAX  60
 
 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_set_bass(int value);
+extern void audiohw_set_bass_cutoff(int value);
 extern void audiohw_set_treble(int value);
+extern void audiohw_set_treble_cutoff(int value);
 extern void audiohw_set_nsorder(int order);
 extern void audiohw_set_sample_rate(int sampling_control);
 
-/* Register addresses */
-// .. tbc
-
-/* Register settings for the supported samplerates: */
-// .. tbc
-
 #endif /* _WM8985_H */