diff --git a/apps/codecs.c b/apps/codecs.c
index 8976871..8ba038b 100644
--- a/apps/codecs.c
+++ b/apps/codecs.c
@@ -34,7 +34,6 @@
 #include "sprintf.h"
 #include "screens.h"
 #include "misc.h"
-#include "mas.h"
 #include "codecs.h"
 #include "lang.h"
 #include "keyboard.h"
diff --git a/apps/debug_menu.c b/apps/debug_menu.c
index 22ec63a..c8e0128 100644
--- a/apps/debug_menu.c
+++ b/apps/debug_menu.c
@@ -62,7 +62,7 @@
 #include "rtc.h"
 #include "storage.h"
 #include "fat.h"
-#include "mas.h"
+#include "mas35xx.h"
 #include "eeprom_24cxx.h"
 #if (CONFIG_STORAGE & STORAGE_MMC) || (CONFIG_STORAGE & STORAGE_SD)
 #include "hotswap.h"
diff --git a/apps/menus/recording_menu.c b/apps/menus/recording_menu.c
index 800918b..63e9a8f 100644
--- a/apps/menus/recording_menu.c
+++ b/apps/menus/recording_menu.c
@@ -50,7 +50,6 @@
 #endif
 #ifdef HAVE_RECORDING
 #include "peakmeter.h"
-#include "mas.h"
 #endif
 #include "splash.h"
 #if CONFIG_CODEC == SWCODEC
diff --git a/apps/mpeg.c b/apps/mpeg.c
index f903e86..2eb69dc 100644
--- a/apps/mpeg.c
+++ b/apps/mpeg.c
@@ -44,7 +44,7 @@
 #include "settings.h"
 #ifndef SIMULATOR
 #include "i2c.h"
-#include "mas.h"
+#include "mas35xx.h"
 #include "system.h"
 #include "usb.h"
 #include "file.h"
@@ -52,7 +52,7 @@
 #endif /* !SIMULATOR */
 #ifdef HAVE_LCD_BITMAP
 #include "lcd.h"
-#endif
+#endif /* CONFIG_CODEC != SWCODEC */
 
 #define MPEG_SWAP_CHUNKSIZE  0x2000
 #define MPEG_HIGH_WATER  2 /* We leave 2 bytes empty because otherwise we
diff --git a/apps/plugin.h b/apps/plugin.h
index 31c8743..142dde6 100644
--- a/apps/plugin.h
+++ b/apps/plugin.h
@@ -72,7 +72,7 @@ void* plugin_get_buffer(size_t *buffer_size);
 #include "recording.h"
 #endif
 #else
-#include "mas.h"
+#include "mas35xx.h"
 #endif /* CONFIG_CODEC == SWCODEC */
 #include "settings.h"
 #include "timer.h"
diff --git a/apps/recorder/peakmeter.c b/apps/recorder/peakmeter.c
index 8f32a83..a7d2e6f 100644
--- a/apps/recorder/peakmeter.c
+++ b/apps/recorder/peakmeter.c
@@ -22,7 +22,7 @@
 #include <stdlib.h> /* sim uses rand for peakmeter simulation */
 #endif
 #include "config.h"
-#include "mas.h"
+#include "mas35xx.h"
 #include "thread.h"
 #include "kernel.h"
 #include "settings.h"
diff --git a/apps/recorder/radio.c b/apps/recorder/radio.c
index 0523f1e..ac9fa44 100644
--- a/apps/recorder/radio.c
+++ b/apps/recorder/radio.c
@@ -24,7 +24,6 @@
 #include <stdbool.h>
 #include <stdlib.h>
 #include "sprintf.h"
-#include "mas.h"
 #include "settings.h"
 #include "button.h"
 #include "status.h"
diff --git a/apps/recorder/recording.c b/apps/recorder/recording.c
index fc52792..32ab885 100644
--- a/apps/recorder/recording.c
+++ b/apps/recorder/recording.c
@@ -41,7 +41,6 @@
 #include "pcm_record.h"
 #include "recording.h"
 #include "mp3_playback.h"
-#include "mas.h"
 #include "button.h"
 #include "kernel.h"
 #include "settings.h"
diff --git a/firmware/SOURCES b/firmware/SOURCES
index 95131ab..aa8f00a 100644
--- a/firmware/SOURCES
+++ b/firmware/SOURCES
@@ -118,7 +118,7 @@ drivers/led.c
 drivers/button.c
 #ifndef SIMULATOR
 #ifdef HAVE_DAC3550A
-drivers/dac.c
+drivers/audio/dac3550a.c
 #endif
 #ifdef HAVE_SERIAL
 drivers/serial.c
@@ -243,15 +243,6 @@ pcm.c
 enc_base.c
 #endif /* HAVE_RECORDING */
 #endif /* BOOTLOADER */
-
-#else  /* !SWCODEC */
-
-#ifndef BOOTLOADER
-#ifndef SIMULATOR
-drivers/mas.c
-#endif /* SIMULATOR */
-#endif /* BOOTLOADER */
-
 #endif /* SWCODEC */
 
 /* Audio codec */
@@ -511,6 +502,7 @@ target/sh/archos/player/lcd-player.c
 target/sh/archos/player/power-player.c
 target/sh/archos/player/powermgmt-player.c
 target/sh/archos/player/usb-player.c
+target/sh/archos/mascodec-archos.c
 #endif /* SIMULATOR */
 #endif /* ARCHOS_PLAYER */
 
@@ -525,6 +517,7 @@ target/sh/archos/recorder/button-recorder.c
 target/sh/archos/recorder/power-recorder.c
 target/sh/archos/recorder/powermgmt-recorder.c
 target/sh/archos/recorder/usb-recorder.c
+target/sh/archos/mascodec-archos.c
 #endif /* SIMULATOR */
 #endif /* ARCHOS_RECORDER */
 
@@ -539,6 +532,7 @@ target/sh/archos/fm_v2/button-fm_v2.c
 target/sh/archos/fm_v2/power-fm_v2.c
 target/sh/archos/fm_v2/powermgmt-fm_v2.c
 target/sh/archos/fm_v2/usb-fm_v2.c
+target/sh/archos/mascodec-archos.c
 #endif /* SIMULATOR */
 #endif /* ARCHOS_FMRECORDER || ARCHOS_RECORDERV2 */
 
@@ -551,6 +545,7 @@ target/sh/archos/ondio/button-ondio.c
 target/sh/archos/ondio/power-ondio.c
 target/sh/archos/ondio/powermgmt-ondio.c
 target/sh/archos/ondio/usb-ondio.c
+target/sh/archos/mascodec-archos.c
 #if (CONFIG_TUNER & TEA5767)
 target/sh/archos/ondio/fmradio_i2c-ondio.c
 #endif
diff --git a/firmware/drivers/audio/dac3550a.c b/firmware/drivers/audio/dac3550a.c
new file mode 100644
index 0000000..e13602e
--- /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 342d8a3..e6cc665 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 */
+
diff --git a/firmware/drivers/dac.c b/firmware/drivers/dac.c
deleted file mode 100644
index f21ef9a..0000000
--- a/firmware/drivers/dac.c
+++ /dev/null
@@ -1,119 +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.
- *
- ****************************************************************************/
-#include "config.h"
-#include "stdbool.h"
-#include "i2c.h"
-#include "debug.h"
-#include "dac.h"
-
-#ifdef HAVE_DAC3550A
-
-static bool line_in_enabled = false;
-static bool dac_enabled = false;
-
-
-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();
-}
-
-#endif
diff --git a/firmware/drivers/dac.h b/firmware/drivers/dac.h
deleted file mode 100644
index 121ce74..0000000
--- a/firmware/drivers/dac.h
+++ /dev/null
@@ -1,48 +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 _DAC_H_
-#define _DAC_H_
-
-#include "config.h"
-
-#ifdef HAVE_DAC3550A
-
-/*
-    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
-
-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
-
-#endif
diff --git a/firmware/drivers/mas.c b/firmware/drivers/mas.c
deleted file mode 100644
index 4f384d3..0000000
--- a/firmware/drivers/mas.c
+++ /dev/null
@@ -1,485 +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.
- *
- ****************************************************************************/
-#include "stdbool.h"
-#include "config.h"
-#include "sh7034.h"
-#include "i2c.h"
-#include "debug.h"
-#include "mas.h"
-#include "kernel.h"
-#include "system.h"
-#include "hwcompat.h"
-
-static int mas_devread(unsigned long *dest, int len);
-
-int mas_default_read(unsigned short *buf)
-{
-    unsigned char *dest = (unsigned char *)buf;
-    int ret = 0;
-
-    i2c_begin();
-    
-    i2c_start();
-    i2c_outb(MAS_DEV_WRITE);
-    if (i2c_getack()) {
-        i2c_outb(MAS_DATA_READ);
-        if (i2c_getack()) {
-            i2c_start();
-            i2c_outb(MAS_DEV_READ);
-            if (i2c_getack()) {
-                    dest[0] = i2c_inb(0);
-                    dest[1] = i2c_inb(1);
-            }
-            else
-                ret = -3;
-        }
-        else
-            ret = -2;
-    }
-    else
-        ret = -1;
-    
-    i2c_stop();
-
-    i2c_end();
-    return ret;
-}
-
-int mas_run(unsigned short address)
-{
-    int ret = 0;
-    unsigned char buf[3];
-
-    i2c_begin();
-    
-    buf[0] = MAS_DATA_WRITE;
-    buf[1] = address >> 8;
-    buf[2] = address & 0xff;
-
-    /* send run command */
-    if (i2c_write(MAS_DEV_WRITE,buf,3))
-    {
-        ret = -1;
-    }
-
-    i2c_end();
-    return ret;
-}
-
-/* note: 'len' is number of 32-bit words, not number of bytes! */
-int mas_readmem(int bank, int addr, unsigned long* dest, int len)
-{
-    int ret = 0;
-    unsigned char buf[7];
-
-    i2c_begin();
-
-    buf[0] = MAS_DATA_WRITE;
-    buf[1] = bank?MAS_CMD_READ_D1_MEM:MAS_CMD_READ_D0_MEM;
-    buf[2] = 0x00;
-    buf[3] = (len & 0xff00) >> 8;
-    buf[4] = len & 0xff;
-    buf[5] = (addr & 0xff00) >> 8;
-    buf[6] = addr & 0xff;
-
-    /* send read command */
-    if (i2c_write(MAS_DEV_WRITE,buf,7))
-    {
-        ret = -1;
-    }
-
-    ret = mas_devread(dest, len);
-
-    i2c_end();
-    return ret;
-}
-
-/* note: 'len' is number of 32-bit words, not number of bytes! */
-int mas_writemem(int bank, int addr, const unsigned long* src, int len)
-{
-    int ret = 0;
-    int i, j;
-    unsigned char buf[60];
-    const unsigned char* ptr = (const unsigned char*)src;
-
-    i2c_begin();
-
-    i=0;
-    buf[i++] = MAS_DATA_WRITE;
-    buf[i++] = bank?MAS_CMD_WRITE_D1_MEM:MAS_CMD_WRITE_D0_MEM;
-    buf[i++] = 0x00;
-    buf[i++] = (len & 0xff00) >> 8;
-    buf[i++] = len & 0xff;
-    buf[i++] = (addr & 0xff00) >> 8;
-    buf[i++] = addr & 0xff;
-
-    j = 0;
-    while(len--) {
-#if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F)
-        buf[i++] = 0;
-        buf[i++] = ptr[j+1];
-        buf[i++] = ptr[j+2];
-        buf[i++] = ptr[j+3];
-#else
-        buf[i++] = ptr[j+2];
-        buf[i++] = ptr[j+3];
-        buf[i++] = 0;
-        buf[i++] = ptr[j+1];
-#endif
-        j += 4;
-    }
-    
-    /* send write command */
-    if (i2c_write(MAS_DEV_WRITE,buf,i))
-    {
-        ret = -1;
-    }
-
-    i2c_end();
-    return ret;
-}
-
-int mas_readreg(int reg)
-{
-    int ret = 0;
-    unsigned char buf[16];
-    unsigned long value;
-
-    i2c_begin();
-
-    buf[0] = MAS_DATA_WRITE;
-    buf[1] = MAS_CMD_READ_REG | (reg >> 4);
-    buf[2] = (reg & 0x0f) << 4;
-
-    /* send read command */
-    if (i2c_write(MAS_DEV_WRITE,buf,3))
-    {
-        ret = -1;
-    }
-    else
-    {
-        if(mas_devread(&value, 1))
-        {
-            ret = -2;
-        }
-        else
-        {
-            ret = value;
-        }
-    }
-
-    i2c_end();
-    return ret;
-}
-
-int mas_writereg(int reg, unsigned int val)
-{
-    int ret = 0;
-    unsigned char buf[5];
-
-    i2c_begin();
-
-    buf[0] = MAS_DATA_WRITE;
-    buf[1] = MAS_CMD_WRITE_REG | (reg >> 4);
-#if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F)
-    buf[2] = ((reg & 0x0f) << 4) | (val >> 16 & 0x0f);
-    buf[3] = (val >> 8) & 0xff;
-    buf[4] = val & 0xff;
-#else
-    buf[2] = ((reg & 0x0f) << 4) | (val & 0x0f);
-    buf[3] = (val >> 12) & 0xff;
-    buf[4] = (val >> 4) & 0xff;
-#endif
-
-    /* send write command */
-    if (i2c_write(MAS_DEV_WRITE,buf,5))
-    {
-        ret = -1;
-    }
-
-    i2c_end();
-    return ret;
-}
-
-/* note: 'len' is number of 32-bit words, not number of bytes! */
-static int mas_devread(unsigned long *dest, int len)
-{
-    int ret = 0;
-    unsigned char* ptr = (unsigned char*)dest;
-    int i;
-    
-    /* handle read-back */
-    /* Remember, the MAS values are only 20 bits, so we set
-       the upper 12 bits to 0 */
-    i2c_start();
-    i2c_outb(MAS_DEV_WRITE);
-    if (i2c_getack()) {
-        i2c_outb(MAS_DATA_READ);
-        if (i2c_getack()) {
-            i2c_start();
-            i2c_outb(MAS_DEV_READ);
-            if (i2c_getack()) {
-                for (i=0;len;i++) {
-                    len--;
-#if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F)
-                    i2c_inb(0); /* Dummy read */
-                    ptr[i*4+0] = 0;
-                    ptr[i*4+1] = i2c_inb(0) & 0x0f;
-                    ptr[i*4+2] = i2c_inb(0);
-                    if(len)
-                        ptr[i*4+3] = i2c_inb(0);
-                    else
-                        ptr[i*4+3] = i2c_inb(1); /* NAK the last byte */
-#else
-                    ptr[i*4+2] = i2c_inb(0);
-                    ptr[i*4+3] = i2c_inb(0);
-                    ptr[i*4+0] = i2c_inb(0);
-                    if(len)
-                        ptr[i*4+1] = i2c_inb(0);
-                    else
-                        ptr[i*4+1] = i2c_inb(1); /* NAK the last byte */
-#endif
-                }
-            }
-            else
-                ret = -3;
-        }
-        else
-            ret = -2;
-    }
-    else
-        ret = -1;
-    
-    i2c_stop();
-
-    return ret;
-}
-
-void mas_reset(void)
-{
-    or_b(0x01, &PAIORH);
-
-#if CONFIG_CODEC == MAS3507D
-    /* PB5 is "MAS enable". make it GPIO output and high */
-    PBCR2 &= ~0x0c00;
-    or_b(0x20, &PBIORL);
-    or_b(0x20, &PBDRL);
-
-    and_b(~0x01, &PADRH);
-    sleep(HZ/100);
-    or_b(0x01, &PADRH);
-    sleep(HZ/5);
-#elif (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F)
-    if (HW_MASK & ATA_ADDRESS_200)
-    {
-        and_b(~0x01, &PADRH);
-        sleep(HZ/100);
-        or_b(0x01, &PADRH);
-        sleep(HZ/5);
-    }
-    else
-    {
-        /* Older recorder models don't invert the POR signal */
-        or_b(0x01, &PADRH);
-        sleep(HZ/100);
-        and_b(~0x01, &PADRH);
-        sleep(HZ/5);
-    }
-#endif
-}
-
-#if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F)
-int mas_direct_config_read(unsigned char reg)
-{
-    int ret = 0;
-    unsigned char tmp[2];
-    
-    i2c_begin();
-
-    i2c_start();
-    i2c_outb(MAS_DEV_WRITE);
-    if (i2c_getack()) {
-        i2c_outb(reg);
-        if (i2c_getack()) {
-            i2c_start();
-            i2c_outb(MAS_DEV_READ);
-            if (i2c_getack()) {
-                tmp[0] = i2c_inb(0);
-                tmp[1] = i2c_inb(1); /* NAK the last byte */
-                ret = (tmp[0] << 8) | tmp[1];
-            }
-            else
-                ret = -3;
-        }
-        else
-            ret = -2;
-    }
-    else
-        ret = -1;
-    
-    i2c_stop();
-
-    i2c_end();
-    return ret;
-}
-
-int mas_direct_config_write(unsigned char reg, unsigned int val)
-{
-    int ret = 0;
-    unsigned char buf[3];
-
-    i2c_begin();
-
-    buf[0] = reg;
-    buf[1] = (val >> 8) & 0xff;
-    buf[2] = val & 0xff;
-
-    /* send write command */
-    if (i2c_write(MAS_DEV_WRITE,buf,3))
-    {
-        ret = -1;
-    }
-
-    i2c_end();
-    return ret;
-}
-
-int mas_codec_writereg(int reg, unsigned int val)
-{
-    int ret = 0;
-    unsigned char buf[5];
-
-    i2c_begin();
-
-    buf[0] = MAS_CODEC_WRITE;
-    buf[1] = (reg >> 8) & 0xff;
-    buf[2] = reg & 0xff;
-    buf[3] = (val >> 8) & 0xff;
-    buf[4] = val & 0xff;
-
-    /* send write command */
-    if (i2c_write(MAS_DEV_WRITE,buf,5))
-    {
-        ret = -1;
-    }
-    
-    i2c_end();
-    return ret;
-}
-
-int mas_codec_readreg(int reg)
-{
-    int ret = 0;
-    unsigned char buf[16];
-    unsigned char tmp[2];
-
-    i2c_begin();
-
-    buf[0] = MAS_CODEC_WRITE;
-    buf[1] = (reg >> 8) & 0xff;
-    buf[2] = reg & 0xff;
-
-    /* send read command */
-    if (i2c_write(MAS_DEV_WRITE,buf,3))
-    {
-        ret = -1;
-    }
-    else
-    {
-        i2c_start();
-        i2c_outb(MAS_DEV_WRITE);
-        if (i2c_getack()) {
-            i2c_outb(MAS_CODEC_READ);
-            if (i2c_getack()) {
-                i2c_start();
-                i2c_outb(MAS_DEV_READ);
-                if (i2c_getack()) {
-                    tmp[0] = i2c_inb(0);
-                    tmp[1] = i2c_inb(1); /* NAK the last byte */
-                    ret = (tmp[0] << 8) | tmp[1];
-                }
-                else
-                    ret = -4;
-            }
-            else
-                ret = -3;
-        }
-        else
-            ret = -2;
-
-        i2c_stop();
-    }
-    
-    i2c_end();
-    return ret;
-}
-
-unsigned long mas_readver(void)
-{
-    int ret = 0;
-    unsigned char buf[16];
-    unsigned long value;
-
-    i2c_begin();
-
-    buf[0] = MAS_DATA_WRITE;
-    buf[1] = MAS_CMD_READ_IC_VER;
-    buf[2] = 0;
-
-    /* send read command */
-    if (i2c_write(MAS_DEV_WRITE,buf,3))
-    {
-        ret = -1;
-    }
-    else
-    {
-        if(mas_devread(&value, 1))
-        {
-            ret = -2;
-        }
-        else
-        {
-            ret = value;
-        }
-    }
-
-    i2c_end();
-    return ret;
-}
-
-#endif
-
-#if CONFIG_TUNER & S1A0903X01
-static int pllfreq;
-
-void mas_store_pllfreq(int freq)
-{
-    pllfreq = freq;
-}
-
-int mas_get_pllfreq(void)
-{
-    return pllfreq;
-}
-#endif
-
-
-
diff --git a/firmware/drivers/tuner/s1a0903x01.c b/firmware/drivers/tuner/s1a0903x01.c
index 3a417d7..2c93ebd 100644
--- a/firmware/drivers/tuner/s1a0903x01.c
+++ b/firmware/drivers/tuner/s1a0903x01.c
@@ -27,7 +27,7 @@
 #include "tuner.h" /* tuner abstraction interface */
 #include "fmradio.h" /* physical interface driver */
 #include "sound.h"
-#include "mas.h"
+#include "mas35xx.h"
 #include "power.h"
 
 #define DEFAULT_IN1 0x100003 /* Mute */
diff --git a/firmware/export/audiohw.h b/firmware/export/audiohw.h
index 91df2dd..73b41c9 100644
--- a/firmware/export/audiohw.h
+++ b/firmware/export/audiohw.h
@@ -57,6 +57,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 0000000..3744b22
--- /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 9cbe970..0000000
--- 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 1c50b7f..049f191 100644
--- a/firmware/export/mas35xx.h
+++ b/firmware/export/mas35xx.h
@@ -25,27 +25,57 @@
 #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)
+#define MAX_PEAK 0x8000
 
-#else /* CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F */
+/* 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
 
-/* MAS3587F and MAS3539F handle clipping prevention internally so we do not need
- * the prescaler -> CLIPPING_CAP
- */
+#if CONFIG_CODEC == MAS3507D
 
-#define VOLUME_MIN -400
-#define VOLUME_MAX  600
-#define AUDIOHW_CAPS (BASS_CAP | TREBLE_CAP | BALANCE_CAP | CLIPPING_CAP)
+/* I2C defines */
+#define MAS_ADR         0x3a
+#define MAS_DEV_WRITE   (MAS_ADR | 0x00)
+#define MAS_DEV_READ    (MAS_ADR | 0x01)
 
-#endif
+/* MAS3507D registers */
+#define MAS_DATA_WRITE   0x68
+#define MAS_DATA_READ    0x69
+#define MAS_CONTROL      0x6a
 
+#define MAS_REG_KBASS           0x6b
+#define MAS_REG_KTREBLE         0x6f
 
-#if CONFIG_CODEC == MAS3507D
+/* 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
+
+/* 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 +166,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 0000000..82a71e3
--- /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
+
diff --git a/firmware/mp3_playback.c b/firmware/mp3_playback.c
index 2bbd08d..fd744a7 100644
--- a/firmware/mp3_playback.c
+++ b/firmware/mp3_playback.c
@@ -30,10 +30,8 @@
 #include "sound.h"
 #ifndef SIMULATOR
 #include "i2c.h"
-#include "mas.h"
-#include "dac.h"
 #include "system.h"
-#endif
+#endif /* !SIMULATOR */
 #include "audiohw.h"
 
 /* hacking into mpeg.c, recording is still there */
diff --git a/firmware/sound.c b/firmware/sound.c
index d66a93a..7e92f5d 100644
--- a/firmware/sound.c
+++ b/firmware/sound.c
@@ -27,15 +27,16 @@
 #include "system.h"
 #ifndef SIMULATOR
 #include "i2c.h"
-#include "mas.h"
 #if CONFIG_CPU == PNX0101
 #include "pnx0101.h"
-#endif
-#include "dac.h"
+#endif /* CONFIG_CPU == PNX101 */
 #if CONFIG_CODEC == SWCODEC
 #include "pcm.h"
+#else /* !CONFIG_CODEC == HWCODEC */
+#include "mas35xx.h"
+#include "dac3550a.h"
 #endif
-#endif
+#endif /* !SIMULATOR */
 
 /* TODO
  * find a nice way to handle 1.5db steps -> see wm8751 ifdef in sound_set_bass/treble
@@ -54,11 +55,6 @@
 
 #ifndef SIMULATOR
 extern bool audio_is_initialized;
-
-#if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F)
-extern unsigned long shadow_io_control_main;
-extern unsigned shadow_codec_reg0;
-#endif
 #endif /* SIMULATOR */
 
 #ifdef SIMULATOR
@@ -167,18 +163,6 @@ void sound_set_dsp_callback(int (*func)(int, intptr_t))
 #endif
 
 #ifndef SIMULATOR
-#if CONFIG_CODEC == MAS3507D
-/* convert tenth of dB volume (-780..+180) to dac3550 register value */
-static int tenthdb2reg(int db)
-{
-    if (db < -540)                  /* 3 dB steps */
-        return (db + 780) / 30;
-    else                            /* 1.5 dB steps */
-        return (db + 660) / 15;
-}
-#endif
-
-
 #if !defined(AUDIOHW_HAVE_CLIPPING)
 /*
  * The prescaler compensates for any kind of boosts, to prevent clipping.
@@ -269,11 +253,6 @@ static void set_prescaled_volume(void)
 
 #ifndef SIMULATOR
 
-#if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F)
-unsigned long mdb_shape_shadow = 0;
-unsigned long loudness_shadow = 0;
-#endif
-
 void sound_set_volume(int value)
 {
     if(!audio_is_initialized)
@@ -400,86 +379,64 @@ void sound_set_loudness(int value)
 {
     if(!audio_is_initialized)
         return;
-    loudness_shadow = (loudness_shadow & 0x04) |
-                       (MAX(MIN(value * 4, 0x44), 0) << 8);
-    mas_codec_writereg(MAS_REG_KLOUDNESS, loudness_shadow);
+
+    audiohw_set_loudness(value);
 }
 
 void sound_set_avc(int value)
 {
     if(!audio_is_initialized)
         return;
-    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);     
+    audiohw_set_avc(value);
 }
 
 void sound_set_mdb_strength(int value)
 {
     if(!audio_is_initialized)
         return;
-    mas_codec_writereg(MAS_REG_KMDB_STR, (value & 0x7f) << 8); 
+
+    audiohw_set_mdb_strength(value);
 }
 
 void sound_set_mdb_harmonics(int value)
 {
     if(!audio_is_initialized)
         return;
-    int tmp = value * 127 / 100;
-    mas_codec_writereg(MAS_REG_KMDB_HAR, (tmp & 0x7f) << 8);
+
+    audiohw_set_mdb_harmonics(value);
 }
 
 void sound_set_mdb_center(int value)
 {
     if(!audio_is_initialized)
         return;
-    mas_codec_writereg(MAS_REG_KMDB_FC, (value/10) << 8);
+
+    audiohw_set_mdb_center(value);
 }
 
 void sound_set_mdb_shape(int value)
 {
     if(!audio_is_initialized)
         return;
-    mdb_shape_shadow = (mdb_shape_shadow & 0x02) | ((value/10) << 8);
-    mas_codec_writereg(MAS_REG_KMDB_SWITCH, mdb_shape_shadow);
+
+    audiohw_set_mdb_shape(value);
 }
 
 void sound_set_mdb_enable(int value)
 {
     if(!audio_is_initialized)
         return;
-    mdb_shape_shadow = (mdb_shape_shadow & ~0x02) | (value?2:0);
-    mas_codec_writereg(MAS_REG_KMDB_SWITCH, mdb_shape_shadow);
+
+    audiohw_set_mdb_enable(value);
 }
 
 void sound_set_superbass(int value)
 {
     if(!audio_is_initialized)
         return;
-    loudness_shadow = (loudness_shadow & ~0x04) | (value?4:0);
-    mas_codec_writereg(MAS_REG_KLOUDNESS, loudness_shadow);
+
+    audiohw_set_superbass(value);
 }
 #endif /* (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) */
 
@@ -706,11 +663,7 @@ void sound_set_pitch(int32_t pitch)
         /* Calculate the new (bogus) frequency */
         val = 18432 * PITCH_SPEED_100 / pitch;
 
-        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);
+        audiohw_set_pitch(val);
 
         last_pitch = pitch;
     }
diff --git a/firmware/target/sh/archos/mascodec-archos.c b/firmware/target/sh/archos/mascodec-archos.c
new file mode 100644
index 0000000..3f93216
--- /dev/null
+++ b/firmware/target/sh/archos/mascodec-archos.c
@@ -0,0 +1,485 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id: mas.c 18807 2008-10-14 11:12:20Z zagor $
+ *
+ * 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 "stdbool.h"
+#include "config.h"
+#include "sh7034.h"
+#include "i2c.h"
+#include "debug.h"
+#include "mas35xx.h"
+#include "kernel.h"
+#include "system.h"
+#include "hwcompat.h"
+
+static int mas_devread(unsigned long *dest, int len);
+
+int mas_default_read(unsigned short *buf)
+{
+    unsigned char *dest = (unsigned char *)buf;
+    int ret = 0;
+
+    i2c_begin();
+    
+    i2c_start();
+    i2c_outb(MAS_DEV_WRITE);
+    if (i2c_getack()) {
+        i2c_outb(MAS_DATA_READ);
+        if (i2c_getack()) {
+            i2c_start();
+            i2c_outb(MAS_DEV_READ);
+            if (i2c_getack()) {
+                    dest[0] = i2c_inb(0);
+                    dest[1] = i2c_inb(1);
+            }
+            else
+                ret = -3;
+        }
+        else
+            ret = -2;
+    }
+    else
+        ret = -1;
+    
+    i2c_stop();
+
+    i2c_end();
+    return ret;
+}
+
+int mas_run(unsigned short address)
+{
+    int ret = 0;
+    unsigned char buf[3];
+
+    i2c_begin();
+    
+    buf[0] = MAS_DATA_WRITE;
+    buf[1] = address >> 8;
+    buf[2] = address & 0xff;
+
+    /* send run command */
+    if (i2c_write(MAS_DEV_WRITE,buf,3))
+    {
+        ret = -1;
+    }
+
+    i2c_end();
+    return ret;
+}
+
+/* note: 'len' is number of 32-bit words, not number of bytes! */
+int mas_readmem(int bank, int addr, unsigned long* dest, int len)
+{
+    int ret = 0;
+    unsigned char buf[7];
+
+    i2c_begin();
+
+    buf[0] = MAS_DATA_WRITE;
+    buf[1] = bank?MAS_CMD_READ_D1_MEM:MAS_CMD_READ_D0_MEM;
+    buf[2] = 0x00;
+    buf[3] = (len & 0xff00) >> 8;
+    buf[4] = len & 0xff;
+    buf[5] = (addr & 0xff00) >> 8;
+    buf[6] = addr & 0xff;
+
+    /* send read command */
+    if (i2c_write(MAS_DEV_WRITE,buf,7))
+    {
+        ret = -1;
+    }
+
+    ret = mas_devread(dest, len);
+
+    i2c_end();
+    return ret;
+}
+
+/* note: 'len' is number of 32-bit words, not number of bytes! */
+int mas_writemem(int bank, int addr, const unsigned long* src, int len)
+{
+    int ret = 0;
+    int i, j;
+    unsigned char buf[60];
+    const unsigned char* ptr = (const unsigned char*)src;
+
+    i2c_begin();
+
+    i=0;
+    buf[i++] = MAS_DATA_WRITE;
+    buf[i++] = bank?MAS_CMD_WRITE_D1_MEM:MAS_CMD_WRITE_D0_MEM;
+    buf[i++] = 0x00;
+    buf[i++] = (len & 0xff00) >> 8;
+    buf[i++] = len & 0xff;
+    buf[i++] = (addr & 0xff00) >> 8;
+    buf[i++] = addr & 0xff;
+
+    j = 0;
+    while(len--) {
+#if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F)
+        buf[i++] = 0;
+        buf[i++] = ptr[j+1];
+        buf[i++] = ptr[j+2];
+        buf[i++] = ptr[j+3];
+#else
+        buf[i++] = ptr[j+2];
+        buf[i++] = ptr[j+3];
+        buf[i++] = 0;
+        buf[i++] = ptr[j+1];
+#endif
+        j += 4;
+    }
+    
+    /* send write command */
+    if (i2c_write(MAS_DEV_WRITE,buf,i))
+    {
+        ret = -1;
+    }
+
+    i2c_end();
+    return ret;
+}
+
+int mas_readreg(int reg)
+{
+    int ret = 0;
+    unsigned char buf[16];
+    unsigned long value;
+
+    i2c_begin();
+
+    buf[0] = MAS_DATA_WRITE;
+    buf[1] = MAS_CMD_READ_REG | (reg >> 4);
+    buf[2] = (reg & 0x0f) << 4;
+
+    /* send read command */
+    if (i2c_write(MAS_DEV_WRITE,buf,3))
+    {
+        ret = -1;
+    }
+    else
+    {
+        if(mas_devread(&value, 1))
+        {
+            ret = -2;
+        }
+        else
+        {
+            ret = value;
+        }
+    }
+
+    i2c_end();
+    return ret;
+}
+
+int mas_writereg(int reg, unsigned int val)
+{
+    int ret = 0;
+    unsigned char buf[5];
+
+    i2c_begin();
+
+    buf[0] = MAS_DATA_WRITE;
+    buf[1] = MAS_CMD_WRITE_REG | (reg >> 4);
+#if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F)
+    buf[2] = ((reg & 0x0f) << 4) | (val >> 16 & 0x0f);
+    buf[3] = (val >> 8) & 0xff;
+    buf[4] = val & 0xff;
+#else
+    buf[2] = ((reg & 0x0f) << 4) | (val & 0x0f);
+    buf[3] = (val >> 12) & 0xff;
+    buf[4] = (val >> 4) & 0xff;
+#endif
+
+    /* send write command */
+    if (i2c_write(MAS_DEV_WRITE,buf,5))
+    {
+        ret = -1;
+    }
+
+    i2c_end();
+    return ret;
+}
+
+/* note: 'len' is number of 32-bit words, not number of bytes! */
+static int mas_devread(unsigned long *dest, int len)
+{
+    int ret = 0;
+    unsigned char* ptr = (unsigned char*)dest;
+    int i;
+    
+    /* handle read-back */
+    /* Remember, the MAS values are only 20 bits, so we set
+       the upper 12 bits to 0 */
+    i2c_start();
+    i2c_outb(MAS_DEV_WRITE);
+    if (i2c_getack()) {
+        i2c_outb(MAS_DATA_READ);
+        if (i2c_getack()) {
+            i2c_start();
+            i2c_outb(MAS_DEV_READ);
+            if (i2c_getack()) {
+                for (i=0;len;i++) {
+                    len--;
+#if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F)
+                    i2c_inb(0); /* Dummy read */
+                    ptr[i*4+0] = 0;
+                    ptr[i*4+1] = i2c_inb(0) & 0x0f;
+                    ptr[i*4+2] = i2c_inb(0);
+                    if(len)
+                        ptr[i*4+3] = i2c_inb(0);
+                    else
+                        ptr[i*4+3] = i2c_inb(1); /* NAK the last byte */
+#else
+                    ptr[i*4+2] = i2c_inb(0);
+                    ptr[i*4+3] = i2c_inb(0);
+                    ptr[i*4+0] = i2c_inb(0);
+                    if(len)
+                        ptr[i*4+1] = i2c_inb(0);
+                    else
+                        ptr[i*4+1] = i2c_inb(1); /* NAK the last byte */
+#endif
+                }
+            }
+            else
+                ret = -3;
+        }
+        else
+            ret = -2;
+    }
+    else
+        ret = -1;
+    
+    i2c_stop();
+
+    return ret;
+}
+
+void mas_reset(void)
+{
+    or_b(0x01, &PAIORH);
+
+#if CONFIG_CODEC == MAS3507D
+    /* PB5 is "MAS enable". make it GPIO output and high */
+    PBCR2 &= ~0x0c00;
+    or_b(0x20, &PBIORL);
+    or_b(0x20, &PBDRL);
+
+    and_b(~0x01, &PADRH);
+    sleep(HZ/100);
+    or_b(0x01, &PADRH);
+    sleep(HZ/5);
+#elif (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F)
+    if (HW_MASK & ATA_ADDRESS_200)
+    {
+        and_b(~0x01, &PADRH);
+        sleep(HZ/100);
+        or_b(0x01, &PADRH);
+        sleep(HZ/5);
+    }
+    else
+    {
+        /* Older recorder models don't invert the POR signal */
+        or_b(0x01, &PADRH);
+        sleep(HZ/100);
+        and_b(~0x01, &PADRH);
+        sleep(HZ/5);
+    }
+#endif
+}
+
+#if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F)
+int mas_direct_config_read(unsigned char reg)
+{
+    int ret = 0;
+    unsigned char tmp[2];
+    
+    i2c_begin();
+
+    i2c_start();
+    i2c_outb(MAS_DEV_WRITE);
+    if (i2c_getack()) {
+        i2c_outb(reg);
+        if (i2c_getack()) {
+            i2c_start();
+            i2c_outb(MAS_DEV_READ);
+            if (i2c_getack()) {
+                tmp[0] = i2c_inb(0);
+                tmp[1] = i2c_inb(1); /* NAK the last byte */
+                ret = (tmp[0] << 8) | tmp[1];
+            }
+            else
+                ret = -3;
+        }
+        else
+            ret = -2;
+    }
+    else
+        ret = -1;
+    
+    i2c_stop();
+
+    i2c_end();
+    return ret;
+}
+
+int mas_direct_config_write(unsigned char reg, unsigned int val)
+{
+    int ret = 0;
+    unsigned char buf[3];
+
+    i2c_begin();
+
+    buf[0] = reg;
+    buf[1] = (val >> 8) & 0xff;
+    buf[2] = val & 0xff;
+
+    /* send write command */
+    if (i2c_write(MAS_DEV_WRITE,buf,3))
+    {
+        ret = -1;
+    }
+
+    i2c_end();
+    return ret;
+}
+
+int mas_codec_writereg(int reg, unsigned int val)
+{
+    int ret = 0;
+    unsigned char buf[5];
+
+    i2c_begin();
+
+    buf[0] = MAS_CODEC_WRITE;
+    buf[1] = (reg >> 8) & 0xff;
+    buf[2] = reg & 0xff;
+    buf[3] = (val >> 8) & 0xff;
+    buf[4] = val & 0xff;
+
+    /* send write command */
+    if (i2c_write(MAS_DEV_WRITE,buf,5))
+    {
+        ret = -1;
+    }
+    
+    i2c_end();
+    return ret;
+}
+
+int mas_codec_readreg(int reg)
+{
+    int ret = 0;
+    unsigned char buf[16];
+    unsigned char tmp[2];
+
+    i2c_begin();
+
+    buf[0] = MAS_CODEC_WRITE;
+    buf[1] = (reg >> 8) & 0xff;
+    buf[2] = reg & 0xff;
+
+    /* send read command */
+    if (i2c_write(MAS_DEV_WRITE,buf,3))
+    {
+        ret = -1;
+    }
+    else
+    {
+        i2c_start();
+        i2c_outb(MAS_DEV_WRITE);
+        if (i2c_getack()) {
+            i2c_outb(MAS_CODEC_READ);
+            if (i2c_getack()) {
+                i2c_start();
+                i2c_outb(MAS_DEV_READ);
+                if (i2c_getack()) {
+                    tmp[0] = i2c_inb(0);
+                    tmp[1] = i2c_inb(1); /* NAK the last byte */
+                    ret = (tmp[0] << 8) | tmp[1];
+                }
+                else
+                    ret = -4;
+            }
+            else
+                ret = -3;
+        }
+        else
+            ret = -2;
+
+        i2c_stop();
+    }
+    
+    i2c_end();
+    return ret;
+}
+
+unsigned long mas_readver(void)
+{
+    int ret = 0;
+    unsigned char buf[16];
+    unsigned long value;
+
+    i2c_begin();
+
+    buf[0] = MAS_DATA_WRITE;
+    buf[1] = MAS_CMD_READ_IC_VER;
+    buf[2] = 0;
+
+    /* send read command */
+    if (i2c_write(MAS_DEV_WRITE,buf,3))
+    {
+        ret = -1;
+    }
+    else
+    {
+        if(mas_devread(&value, 1))
+        {
+            ret = -2;
+        }
+        else
+        {
+            ret = value;
+        }
+    }
+
+    i2c_end();
+    return ret;
+}
+
+#endif
+
+#if CONFIG_TUNER & S1A0903X01
+static int pllfreq;
+
+void mas_store_pllfreq(int freq)
+{
+    pllfreq = freq;
+}
+
+int mas_get_pllfreq(void)
+{
+    return pllfreq;
+}
+#endif
+
+
+
diff --git a/firmware/test/i2c/main.c b/firmware/test/i2c/main.c
index ad0f8ef..7a2ff49 100644
--- a/firmware/test/i2c/main.c
+++ b/firmware/test/i2c/main.c
@@ -46,9 +46,9 @@
 
 #include "i2c.h"
 
-#include "mas.h"
+#include "mas35xx.h"
 
-#include "dac.h"
+#include "dac3550a.h"
 
 #include "sh7034.h"