Separate mas35xx lowlevel stuff. Move SH specific bits to target tree. FS#11189 by me.

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

2 files changed, 218 insertions, 5 deletions

diff --git a/firmware/drivers/audio/dac3550a.c b/firmware/drivers/audio/dac3550a.c
new file mode 100644
index 0000000000..e13602e481
--- /dev/null
+++ b/firmware/drivers/audio/dac3550a.c
@@ -0,0 +1,124 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id: dac.c 17847 2008-06-28 18:10:04Z bagder $
+ *
+ * Copyright (C) 2002 by Linus Nielsen Feltzing
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+#include "config.h"
+#include "stdbool.h"
+#include "i2c.h"
+#include "debug.h"
+#include "dac3550a.h"
+
+static bool line_in_enabled = false;
+static bool dac_enabled = false;
+
+/* convert tenth of dB volume (-780..+180) to dac3550 register value */
+int tenthdb2reg(int db)
+{
+    if (db < -540)                  /* 3 dB steps */
+        return (db + 780) / 30;
+    else                            /* 1.5 dB steps */
+        return (db + 660) / 15;
+}
+
+int dac_volume(unsigned int left, unsigned int right, bool deemph)
+{
+    int ret = 0;
+    unsigned char buf[3];
+
+    i2c_begin();
+
+    if (left > 0x38)
+        left = 0x38;
+    if (right > 0x38)
+        right = 0x38;
+
+    buf[0] = DAC_REG_WRITE | DAC_AVOL;
+    buf[1] = (left & 0x3f) | (deemph ? 0x40 : 0);
+    buf[2] = right & 0x3f;
+
+    /* send write command */
+    if (i2c_write(DAC_DEV_WRITE,buf,3))
+    {
+        ret = -1;
+    }
+
+    i2c_end();
+    return ret;
+}
+
+/******************************************************************
+** Bit6:  0 = 3V        1 = 5V
+** Bit5:  0 = normal    1 = low power
+** Bit4:  0 = AUX2 off  1 = AUX2 on
+** Bit3:  0 = AUX1 off  1 = AUX1 on
+** Bit2:  0 = DAC off   1 = DAC on
+** Bit1:  0 = stereo    1 = mono
+** Bit0:  0 = normal right amp   1 = inverted right amp
+******************************************************************/
+/* dac_config is called once to initialize it. we will apply
+   our static settings because of the init flow.
+   dac_init -> dac_line_in -> mpeg_init -> dac_config
+*/
+static int dac_config(void)
+{
+    int ret = 0;
+    unsigned char buf[2];
+
+    i2c_begin();
+
+    buf[0] = DAC_REG_WRITE | DAC_GCFG;
+    buf[1] = (dac_enabled ? 0x04 : 0) |
+        (line_in_enabled ? 0x08 : 0);
+
+    /* send write command */
+    if (i2c_write(DAC_DEV_WRITE,buf,2))
+    {
+        ret = -1;
+    }
+
+    i2c_end();
+    return ret;
+}
+
+void dac_enable(bool enable)
+{
+    dac_enabled = enable;
+    dac_config();
+}
+
+void dac_line_in(bool enable)
+{
+    line_in_enabled = enable;
+    dac_config();
+}
+
+void dac_init(void)
+{
+    unsigned char buf[2];
+
+    i2c_begin();
+
+    buf[0] = DAC_REG_WRITE | DAC_SR_REG;
+    buf[1] = 0x07;
+
+    /* send write command */
+    i2c_write(DAC_DEV_WRITE,buf,2);
+    i2c_end();
+}
+
diff --git a/firmware/drivers/audio/mas35xx.c b/firmware/drivers/audio/mas35xx.c
index 342d8a3c2e..e6cc665109 100644
--- a/firmware/drivers/audio/mas35xx.c
+++ b/firmware/drivers/audio/mas35xx.c
@@ -23,8 +23,8 @@
  ****************************************************************************/
 
 #include "config.h"
+#include "system.h" /* MAX MIN macros */
 #include "audiohw.h"
-#include "mas.h"
 
 const struct sound_settings_info audiohw_settings[] = {
 #if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F)
@@ -56,10 +56,15 @@ const struct sound_settings_info audiohw_settings[] = {
 #endif
 };
 
-
 int channel_configuration = SOUND_CHAN_STEREO;
 int stereo_width = 100;
 
+#if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F)
+unsigned long mdb_shape_shadow = 0;
+unsigned long loudness_shadow = 0;
+unsigned long shadow_io_control_main;
+#endif
+
 
 static void set_channel_config(void)
 {
@@ -181,13 +186,97 @@ void audiohw_set_treble(int val)
 }
 
 #if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F)
-void audiohw_set_volume(int val) {
+void audiohw_set_volume(int val) 
+{
     unsigned tmp = ((unsigned)(val + 115) & 0xff) << 8;
     mas_codec_writereg(MAS_REG_VOLUME_CONTROL, tmp);
 }
 
-void audiohw_set_balance(int val) {
+void audiohw_set_loudness(int value)
+{
+    loudness_shadow = (loudness_shadow & 0x04) |
+                       (MAX(MIN(value * 4, 0x44), 0) << 8);
+    mas_codec_writereg(MAS_REG_KLOUDNESS, loudness_shadow);
+}
+
+void audiohw_set_avc(int value)
+{
+    int tmp;
+
+    static const uint16_t avc_vals[] =
+    {
+        (0x1 << 8) | (0x8 << 12), /* 20ms */
+        (0x2 << 8) | (0x8 << 12), /* 2s */
+        (0x4 << 8) | (0x8 << 12), /* 4s */
+        (0x8 << 8) | (0x8 << 12), /* 8s */
+    };
+    switch (value) {
+        case 1:
+        case 2:
+        case 3:
+        case 4:
+            tmp = avc_vals[value -1];
+            break;
+        case -1: /* turn off and then turn on again to decay quickly */
+            tmp = mas_codec_readreg(MAS_REG_KAVC);
+            mas_codec_writereg(MAS_REG_KAVC, 0);
+            break;
+        default: /* off */
+            tmp = 0;
+            break;
+    }
+    mas_codec_writereg(MAS_REG_KAVC, tmp);
+}
+
+void audiohw_set_mdb_strength(int value)
+{
+    mas_codec_writereg(MAS_REG_KMDB_STR, (value & 0x7f) << 8);
+}
+
+void audiohw_set_mdb_harmonics(int value)
+{
+    int tmp = value * 127 / 100;
+    mas_codec_writereg(MAS_REG_KMDB_HAR, (tmp & 0x7f) << 8);
+}
+
+void audiohw_set_mdb_center(int value)
+{
+    mas_codec_writereg(MAS_REG_KMDB_FC, (value/10) << 8);
+}
+
+void audiohw_set_mdb_shape(int value)
+{
+    mdb_shape_shadow = (mdb_shape_shadow & 0x02) | ((value/10) << 8);
+    mas_codec_writereg(MAS_REG_KMDB_SWITCH, mdb_shape_shadow);
+}
+
+void audiohw_set_mdb_enable(int value)
+{
+    mdb_shape_shadow = (mdb_shape_shadow & ~0x02) | (value?2:0);
+    mas_codec_writereg(MAS_REG_KMDB_SWITCH, mdb_shape_shadow);
+}
+
+void audiohw_set_superbass(int value)
+{
+    loudness_shadow = (loudness_shadow & ~0x04) | (value?4:0);
+    mas_codec_writereg(MAS_REG_KLOUDNESS, loudness_shadow);
+}
+
+void audiohw_set_balance(int val) 
+{
     unsigned tmp = ((unsigned)(val * 127 / 100) & 0xff) << 8;
     mas_codec_writereg(MAS_REG_BALANCE, tmp);
 }
-#endif
+
+void audiohw_set_pitch(unsigned long val)
+{
+    mas_writemem(MAS_BANK_D0, MAS_D0_OFREQ_CONTROL, &val, 1);
+
+    /* We must tell the MAS that the frequency has changed.
+     * This will unfortunately cause a short silence. */
+
+    mas_writemem(MAS_BANK_D0, MAS_D0_IO_CONTROL_MAIN, &shadow_io_control_main, 1);
+}
+
+#endif /* CONFIG_CODEC == MAS3587F || CONFIG_CODEC == MAS3539F */
+