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

5 files changed, 241 insertions, 198 deletions

diff --git a/firmware/export/audiohw.h b/firmware/export/audiohw.h
index 56f4d3dbea..930c671c20 100644
--- a/firmware/export/audiohw.h
+++ b/firmware/export/audiohw.h
@@ -59,6 +59,9 @@
 #include "as3514.h"
 #elif defined(HAVE_MAS35XX)
 #include "mas35xx.h"
+#if defined(HAVE_DAC3550A)
+#include "dac3550a.h"
+#endif /* HAVE_DAC3550A */
 #elif defined(HAVE_TSC2100)
 #include "tsc2100.h"
 #elif defined(HAVE_JZ4740_CODEC)
diff --git a/firmware/export/dac3550a.h b/firmware/export/dac3550a.h
new file mode 100644
index 0000000000..3744b221ed
--- /dev/null
+++ b/firmware/export/dac3550a.h
@@ -0,0 +1,47 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id: dac.h 24158 2010-01-03 11:31:14Z Buschel $
+ *
+ * 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.
+ *
+ ****************************************************************************/
+#ifndef _DAC3550A_H_
+#define _DAC3550A_H_
+
+#include "config.h"
+
+/*
+    DAC I2C defs
+*/
+#define DAC_ADR         0x9a
+#define DAC_DEV_WRITE   (DAC_ADR | 0x00)
+
+#define DAC_REG_WRITE   0xc0
+
+/* registers..*/
+#define DAC_SR_REG      1
+#define DAC_AVOL        2
+#define DAC_GCFG        3
+
+/* function prototypes */
+extern int  tenthdb2reg(int db);
+extern int  dac_volume(unsigned int left, unsigned int right, bool deemph);
+extern void dac_enable(bool enable);
+extern void dac_line_in(bool enable);
+extern void dac_init(void);
+
+#endif /* _DAC3550A_H_ */
+
diff --git a/firmware/export/mas.h b/firmware/export/mas.h
deleted file mode 100644
index 9cbe970b94..0000000000
--- a/firmware/export/mas.h
+++ /dev/null
@@ -1,184 +0,0 @@
-/***************************************************************************
- *             __________               __   ___.
- *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
- *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
- *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
- *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
- *                     \/            \/     \/    \/            \/
- * $Id$
- *
- * 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.
- *
- ****************************************************************************/
-#ifndef _MAS_H_
-#define _MAS_H_
-
-#define MAS_BANK_D0 0
-#define MAS_BANK_D1 1
-
-#define MAX_PEAK 0x8000
-
-/*
-    MAS I2C defs
-*/
-#if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F)
-#define MAS_ADR         0x3c
-#define MAS_DEV_WRITE   (MAS_ADR | 0x00)
-#define MAS_DEV_READ    (MAS_ADR | 0x01)
-
-#elif CONFIG_CODEC == MAS3507D
-#define MAS_ADR         0x3a
-#define MAS_DEV_WRITE   (MAS_ADR | 0x00)
-#define MAS_DEV_READ    (MAS_ADR | 0x01)
-#endif
-
-/* registers..*/
-#if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F)
-#define MAS_DATA_WRITE   0x68
-#define MAS_DATA_READ    0x69
-#define MAS_CODEC_WRITE  0x6c
-#define MAS_CODEC_READ   0x6d
-#define MAS_CONTROL      0x6a
-#define MAS_DCCF         0x76
-#define MAS_DCFR         0x77
-
-#elif CONFIG_CODEC == MAS3507D
-#define MAS_DATA_WRITE   0x68
-#define MAS_DATA_READ    0x69
-#define MAS_CONTROL      0x6a
-#endif
-
-/*
- *  MAS register
- */
-#define MAS_REG_DCCF            0x8e
-#define MAS_REG_MUTE            0xaa
-#define MAS_REG_PIODATA         0xc8
-#define MAS_REG_StartUpConfig   0xe6
-#define MAS_REG_KPRESCALE       0xe7
-#if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F)
-#define MAS_REG_KMDB_SWITCH     0x21
-#define MAS_REG_KMDB_STR        0x22
-#define MAS_REG_KMDB_HAR        0x23
-#define MAS_REG_KMDB_FC         0x24
-#define MAS_REG_KLOUDNESS       0x1e
-#define MAS_REG_QPEAK_L         0x0a
-#define MAS_REG_QPEAK_R         0x0b
-#define MAS_REG_DQPEAK_L        0x0c
-#define MAS_REG_DQPEAK_R        0x0d
-#define MAS_REG_VOLUME_CONTROL  0x10
-#define MAS_REG_BALANCE         0x11
-#define MAS_REG_KAVC            0x12
-#define MAS_REG_KBASS           0x14
-#define MAS_REG_KTREBLE         0x15
-
-#elif CONFIG_CODEC == MAS3507D
-#define MAS_REG_KBASS           0x6b
-#define MAS_REG_KTREBLE         0x6f
-#endif
-
-/*
- * MAS commands
- */
-#if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F)
-#define MAS_CMD_READ_ANCILLARY  0x50
-#define MAS_CMD_FAST_PRG_DL     0x60
-#define MAS_CMD_READ_IC_VER     0x70
-#define MAS_CMD_READ_REG        0xa0
-#define MAS_CMD_WRITE_REG       0xb0
-#define MAS_CMD_READ_D0_MEM     0xc0
-#define MAS_CMD_READ_D1_MEM     0xd0
-#define MAS_CMD_WRITE_D0_MEM    0xe0
-#define MAS_CMD_WRITE_D1_MEM    0xf0
-
-#elif CONFIG_CODEC == MAS3507D
-#define MAS_CMD_READ_ANCILLARY  0x30
-#define MAS_CMD_WRITE_REG       0x90
-#define MAS_CMD_WRITE_D0_MEM    0xa0
-#define MAS_CMD_WRITE_D1_MEM    0xb0
-#define MAS_CMD_READ_REG        0xd0
-#define MAS_CMD_READ_D0_MEM     0xe0
-#define MAS_CMD_READ_D1_MEM     0xf0
-#endif
-
-/* 
- * MAS D0 memory cells (MAS3587F / MAS3539F)
- */
-#if CONFIG_CODEC == MAS3587F
-#define MAS_D0_APP_SELECT        0x7f6
-#define MAS_D0_APP_RUNNING       0x7f7
-#define MAS_D0_ENCODER_CONTROL   0x7f0
-#define MAS_D0_IO_CONTROL_MAIN   0x7f1
-#define MAS_D0_INTERFACE_CONTROL 0x7f2
-#define MAS_D0_OFREQ_CONTROL     0x7f3
-#define MAS_D0_OUT_CLK_CONFIG    0x7f4
-#define MAS_D0_SPD_OUT_BITS      0x7f8
-#define MAS_D0_SOFT_MUTE         0x7f9
-#define MAS_D0_OUT_LL            0x7fc
-#define MAS_D0_OUT_LR            0x7fd
-#define MAS_D0_OUT_RL            0x7fe
-#define MAS_D0_OUT_RR            0x7ff
-#define MAS_D0_MPEG_FRAME_COUNT  0xfd0
-#define MAS_D0_MPEG_STATUS_1     0xfd1
-#define MAS_D0_MPEG_STATUS_2     0xfd2
-#define MAS_D0_CRC_ERROR_COUNT   0xfd3
-
-#elif CONFIG_CODEC == MAS3539F
-#define MAS_D0_APP_SELECT        0x34b
-#define MAS_D0_APP_RUNNING       0x34c
-/* no encoder :( */
-#define MAS_D0_IO_CONTROL_MAIN   0x346
-#define MAS_D0_INTERFACE_CONTROL 0x347
-#define MAS_D0_OFREQ_CONTROL     0x348
-#define MAS_D0_OUT_CLK_CONFIG    0x349
-#define MAS_D0_SPD_OUT_BITS      0x351
-#define MAS_D0_SOFT_MUTE         0x350
-#define MAS_D0_OUT_LL            0x354
-#define MAS_D0_OUT_LR            0x355
-#define MAS_D0_OUT_RL            0x356
-#define MAS_D0_OUT_RR            0x357
-#define MAS_D0_MPEG_FRAME_COUNT  0xfd0
-#define MAS_D0_MPEG_STATUS_1     0xfd1
-#define MAS_D0_MPEG_STATUS_2     0xfd2
-#define MAS_D0_CRC_ERROR_COUNT   0xfd3
-
-#elif CONFIG_CODEC == MAS3507D
-#define MAS_D0_MPEG_FRAME_COUNT  0x300
-#define MAS_D0_MPEG_STATUS_1     0x301
-#define MAS_D0_MPEG_STATUS_2     0x302
-#define MAS_D0_CRC_ERROR_COUNT   0x303
-#define MAS_D0_OUT_LL            0x7f8
-#define MAS_D0_OUT_LR            0x7f9
-#define MAS_D0_OUT_RL            0x7fa
-#define MAS_D0_OUT_RR            0x7fb
-
-#endif
-
-int mas_default_read(unsigned short *buf);
-int mas_run(unsigned short address);
-int mas_readmem(int bank, int addr, unsigned long* dest, int len);
-int mas_writemem(int bank, int addr, const unsigned long* src, int len);
-int mas_readreg(int reg);
-int mas_writereg(int reg, unsigned int val);
-void mas_reset(void);
-int mas_direct_config_read(unsigned char reg);
-int mas_direct_config_write(unsigned char reg, unsigned int val);
-int mas_codec_writereg(int reg, unsigned int val);
-int mas_codec_readreg(int reg);
-unsigned long mas_readver(void);
-
-#endif
-
-#if CONFIG_TUNER & S1A0903X01
-void mas_store_pllfreq(int freq);
-int mas_get_pllfreq(void);
-#endif
-
diff --git a/firmware/export/mas35xx.h b/firmware/export/mas35xx.h
index 1c50b7f02b..f75658fce1 100644
--- a/firmware/export/mas35xx.h
+++ b/firmware/export/mas35xx.h
@@ -25,27 +25,55 @@
 #define _MAS35XX_H
 
 #include "config.h"
+#include "mascodec.h"
 
-#if CONFIG_CODEC == MAS3507D
+#define MAS_BANK_D0 0
+#define MAS_BANK_D1 1
 
-#define VOLUME_MIN -780
-#define VOLUME_MAX  180
-#define AUDIOHW_CAPS (BASS_CAP | TREBLE_CAP | PRESCALER_CAP)
+/* registers common to all MAS35xx */
+#define MAS_REG_DCCF            0x8e
+#define MAS_REG_MUTE            0xaa
+#define MAS_REG_PIODATA         0xc8
+#define MAS_REG_StartUpConfig   0xe6
+#define MAS_REG_KPRESCALE       0xe7
 
-#else /* CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F */
+#if CONFIG_CODEC == MAS3507D
 
-/* MAS3587F and MAS3539F handle clipping prevention internally so we do not need
- * the prescaler -> CLIPPING_CAP
- */
+/* I2C defines */
+#define MAS_ADR         0x3a
+#define MAS_DEV_WRITE   (MAS_ADR | 0x00)
+#define MAS_DEV_READ    (MAS_ADR | 0x01)
 
-#define VOLUME_MIN -400
-#define VOLUME_MAX  600
-#define AUDIOHW_CAPS (BASS_CAP | TREBLE_CAP | BALANCE_CAP | CLIPPING_CAP)
+/* MAS3507D registers */
+#define MAS_DATA_WRITE   0x68
+#define MAS_DATA_READ    0x69
+#define MAS_CONTROL      0x6a
 
-#endif
+#define MAS_REG_KBASS           0x6b
+#define MAS_REG_KTREBLE         0x6f
 
+/* MAS3507D commands */
+#define MAS_CMD_READ_ANCILLARY  0x30
+#define MAS_CMD_WRITE_REG       0x90
+#define MAS_CMD_WRITE_D0_MEM    0xa0
+#define MAS_CMD_WRITE_D1_MEM    0xb0
+#define MAS_CMD_READ_REG        0xd0
+#define MAS_CMD_READ_D0_MEM     0xe0
+#define MAS_CMD_READ_D1_MEM     0xf0
 
-#if CONFIG_CODEC == MAS3507D
+/* MAS3507D D0 memmory cells */
+#define MAS_D0_MPEG_FRAME_COUNT  0x300
+#define MAS_D0_MPEG_STATUS_1     0x301
+#define MAS_D0_MPEG_STATUS_2     0x302
+#define MAS_D0_CRC_ERROR_COUNT   0x303
+#define MAS_D0_OUT_LL            0x7f8
+#define MAS_D0_OUT_LR            0x7f9
+#define MAS_D0_OUT_RL            0x7fa
+#define MAS_D0_OUT_RR            0x7fb
+
+#define VOLUME_MIN -780
+#define VOLUME_MAX  180
+#define AUDIOHW_CAPS (BASS_CAP | TREBLE_CAP | PRESCALER_CAP)
 
 static const unsigned int bass_table[] =
 {
@@ -136,6 +164,112 @@ static const unsigned int prescale_table[] =
     0xe6800, /* 14dB */
     0xe9400  /* 15dB */
 };
-#endif /*CONFIG_CODEC == MAS3507D*/
+
+#else /* CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F */
+
+/* I2C defines */
+#define MAS_ADR         0x3c
+#define MAS_DEV_WRITE   (MAS_ADR | 0x00)
+#define MAS_DEV_READ    (MAS_ADR | 0x01)
+
+/* MAS3587F/MAS3539F registers */
+#define MAS_DATA_WRITE   0x68
+#define MAS_DATA_READ    0x69
+#define MAS_CODEC_WRITE  0x6c
+#define MAS_CODEC_READ   0x6d
+#define MAS_CONTROL      0x6a
+#define MAS_DCCF         0x76
+#define MAS_DCFR         0x77
+
+#define MAS_REG_KMDB_SWITCH     0x21
+#define MAS_REG_KMDB_STR        0x22
+#define MAS_REG_KMDB_HAR        0x23
+#define MAS_REG_KMDB_FC         0x24
+#define MAS_REG_KLOUDNESS       0x1e
+#define MAS_REG_QPEAK_L         0x0a
+#define MAS_REG_QPEAK_R         0x0b
+#define MAS_REG_DQPEAK_L        0x0c
+#define MAS_REG_DQPEAK_R        0x0d
+#define MAS_REG_VOLUME_CONTROL  0x10
+#define MAS_REG_BALANCE         0x11
+#define MAS_REG_KAVC            0x12
+#define MAS_REG_KBASS           0x14
+#define MAS_REG_KTREBLE         0x15
+
+/* MAS3587F/MAS3539F commands */
+#define MAS_CMD_READ_ANCILLARY  0x50
+#define MAS_CMD_FAST_PRG_DL     0x60
+#define MAS_CMD_READ_IC_VER     0x70
+#define MAS_CMD_READ_REG        0xa0
+#define MAS_CMD_WRITE_REG       0xb0
+#define MAS_CMD_READ_D0_MEM     0xc0
+#define MAS_CMD_READ_D1_MEM     0xd0
+#define MAS_CMD_WRITE_D0_MEM    0xe0
+#define MAS_CMD_WRITE_D1_MEM    0xf0
+
+/* MAS3587F D0 memory cells */
+#if CONFIG_CODEC == MAS3587F
+#define MAS_D0_APP_SELECT        0x7f6
+#define MAS_D0_APP_RUNNING       0x7f7
+#define MAS_D0_ENCODER_CONTROL   0x7f0
+#define MAS_D0_IO_CONTROL_MAIN   0x7f1
+#define MAS_D0_INTERFACE_CONTROL 0x7f2
+#define MAS_D0_OFREQ_CONTROL     0x7f3
+#define MAS_D0_OUT_CLK_CONFIG    0x7f4
+#define MAS_D0_SPD_OUT_BITS      0x7f8
+#define MAS_D0_SOFT_MUTE         0x7f9
+#define MAS_D0_OUT_LL            0x7fc
+#define MAS_D0_OUT_LR            0x7fd
+#define MAS_D0_OUT_RL            0x7fe
+#define MAS_D0_OUT_RR            0x7ff
+#define MAS_D0_MPEG_FRAME_COUNT  0xfd0
+#define MAS_D0_MPEG_STATUS_1     0xfd1
+#define MAS_D0_MPEG_STATUS_2     0xfd2
+#define MAS_D0_CRC_ERROR_COUNT   0xfd3
+
+/* MAS3539F D0 memory cells */
+#elif CONFIG_CODEC == MAS3539F
+#define MAS_D0_APP_SELECT        0x34b
+#define MAS_D0_APP_RUNNING       0x34c
+/* no encoder :( */
+#define MAS_D0_IO_CONTROL_MAIN   0x346
+#define MAS_D0_INTERFACE_CONTROL 0x347
+#define MAS_D0_OFREQ_CONTROL     0x348
+#define MAS_D0_OUT_CLK_CONFIG    0x349
+#define MAS_D0_SPD_OUT_BITS      0x351
+#define MAS_D0_SOFT_MUTE         0x350
+#define MAS_D0_OUT_LL            0x354
+#define MAS_D0_OUT_LR            0x355
+#define MAS_D0_OUT_RL            0x356
+#define MAS_D0_OUT_RR            0x357
+#define MAS_D0_MPEG_FRAME_COUNT  0xfd0
+#define MAS_D0_MPEG_STATUS_1     0xfd1
+#define MAS_D0_MPEG_STATUS_2     0xfd2
+#define MAS_D0_CRC_ERROR_COUNT   0xfd3
+#endif
+
+/* MAS3587F and MAS3539F handle clipping prevention internally so we do not need
+ * the prescaler -> CLIPPING_CAP
+ */
+
+#define VOLUME_MIN -400
+#define VOLUME_MAX  600
+#define AUDIOHW_CAPS (BASS_CAP | TREBLE_CAP | BALANCE_CAP | CLIPPING_CAP)
+
+#endif /* CONFIG_CODEC */
+
+/* Function prototypes */
+#if CONFIG_CODEC == MAS3587F || CONFIG_CODEC == MAS3539F
+extern void audiohw_set_loudness(int value);
+extern void audiohw_set_avc(int value);
+extern void audiohw_set_mdb_strength(int value);
+extern void audiohw_set_mdb_harmonics(int value);
+extern void audiohw_set_mdb_center(int value);
+extern void audiohw_set_mdb_shape(int value);
+extern void audiohw_set_mdb_enable(int value);
+extern void audiohw_set_superbass(int value);
+extern void audiohw_set_balance(int val);
+extern void audiohw_set_pitch(unsigned long val);
+#endif
 
 #endif /* _MAS35XX_H */
diff --git a/firmware/export/mascodec.h b/firmware/export/mascodec.h
new file mode 100644
index 0000000000..82a71e30c8
--- /dev/null
+++ b/firmware/export/mascodec.h
@@ -0,0 +1,43 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id: mas.h 24154 2010-01-03 10:27:43Z Buschel $
+ *
+ * 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.
+ *
+ ****************************************************************************/
+#ifndef _MASCODEC_H_
+#define _MASCODEC_H_
+
+int mas_default_read(unsigned short *buf);
+int mas_run(unsigned short address);
+int mas_readmem(int bank, int addr, unsigned long* dest, int len);
+int mas_writemem(int bank, int addr, const unsigned long* src, int len);
+int mas_readreg(int reg);
+int mas_writereg(int reg, unsigned int val);
+void mas_reset(void);
+int mas_direct_config_read(unsigned char reg);
+int mas_direct_config_write(unsigned char reg, unsigned int val);
+int mas_codec_writereg(int reg, unsigned int val);
+int mas_codec_readreg(int reg);
+unsigned long mas_readver(void);
+
+#endif
+
+#if CONFIG_TUNER & S1A0903X01
+void mas_store_pllfreq(int freq);
+int mas_get_pllfreq(void);
+#endif
+