8 files changed, 132 insertions, 18 deletions

diff --git a/firmware/SOURCES b/firmware/SOURCES
index a120c88fa2..6717ccaf93 100644
--- a/firmware/SOURCES
+++ b/firmware/SOURCES
@@ -987,8 +987,10 @@ target/arm/tcc77x/usb-tcc77x.c
 target/arm/tcc77x/logikdax/button-logikdax.c
 target/arm/tcc77x/logikdax/power-logikdax.c
 #ifndef BOOTLOADER
+target/arm/wmcodec-telechips.c
 target/arm/tcc77x/debug-tcc77x.c
 target/arm/pcm-telechips.c
+target/arm/tcc77x/logikdax/audio-logikdax.c
 #endif /* BOOTLOADER */
 #endif /* SIMULATOR */
 #endif /* LOGIK_DAX */
@@ -1007,8 +1009,10 @@ target/arm/tcc77x/usb-tcc77x.c
 target/arm/tcc77x/m200/button-m200.c
 target/arm/tcc77x/m200/power-m200.c
 #ifndef BOOTLOADER
+target/arm/wmcodec-telechips.c
 target/arm/tcc77x/debug-tcc77x.c
 target/arm/pcm-telechips.c
+target/arm/tcc77x/m200/audio-m200.c
 #endif /* BOOTLOADER */
 #endif /* SIMULATOR */
 #endif /* SANSA_M200 */
diff --git a/firmware/export/config-logikdax.h b/firmware/export/config-logikdax.h
index c66a2ab581..4b205de425 100644
--- a/firmware/export/config-logikdax.h
+++ b/firmware/export/config-logikdax.h
@@ -32,6 +32,8 @@
 /* define this if you would like tagcache to build on this target */
 #define HAVE_TAGCACHE
 
+#define HAVE_FAT16SUPPORT
+
 /* define this if you have a flash memory storage */
 #define HAVE_FLASH_STORAGE
 
@@ -54,14 +56,22 @@
 /* Define this if you have a software controlled poweroff */
 #define HAVE_SW_POWEROFF
 
+/* The number of bytes reserved for loadable codecs */
+#define CODEC_SIZE 0x9c000
+
 /* The number of bytes reserved for loadable plugins */
-#define PLUGIN_BUFFER_SIZE 0x8000
+#define PLUGIN_BUFFER_SIZE 0x8c000
 
 #define AB_REPEAT_ENABLE 1
 
 /* Define this if you do software codec */
 #define CONFIG_CODEC SWCODEC
 
+/* The DAX uses built-in WM8731 codec */
+#define HAVE_WM8731
+/* Codec is slave on serial bus */
+#define CODEC_SLAVE
+
 /* Define this for LCD backlight available */
 #define HAVE_BACKLIGHT
 
@@ -109,4 +119,14 @@
 #define BOOTFILE "rockbox." BOOTFILE_EXT
 #define BOOTDIR "/"
 
+#define IBSS_ATTR_VOICE_STACK
+#define ICODE_ATTR_TREMOR_NOT_MDCT
+#define ICODE_ATTR_TREMOR_MDCT
+#define ICODE_ATTR_FLAC
+#define IBSS_ATTR_FLAC_DECODED0
+#define ICONST_ATTR_MPA_HUFFMAN
+#define IBSS_ATTR_MPC_SAMPLE_BUF
+#define ICODE_ATTR_ALAC
+#define IBSS_ATTR_SHORTEN_DECODED0
+
 #endif /* SIMULATOR */
diff --git a/firmware/export/config-m200.h b/firmware/export/config-m200.h
index f7ab78d87e..eeac509970 100644
--- a/firmware/export/config-m200.h
+++ b/firmware/export/config-m200.h
@@ -57,8 +57,11 @@
 /* Define this if you have a software controlled poweroff */
 #define HAVE_SW_POWEROFF
 
+/* The number of bytes reserved for loadable codecs */
+#define CODEC_SIZE 0x20000
+
 /* The number of bytes reserved for loadable plugins */
-#define PLUGIN_BUFFER_SIZE 0x8000
+#define PLUGIN_BUFFER_SIZE 0x10000
 
 #define AB_REPEAT_ENABLE 1
 
@@ -118,4 +121,14 @@
 #define BOOTFILE "rockbox." BOOTFILE_EXT
 #define BOOTDIR "/"
 
+#define IBSS_ATTR_VOICE_STACK
+#define ICODE_ATTR_TREMOR_NOT_MDCT
+#define ICODE_ATTR_TREMOR_MDCT
+#define ICODE_ATTR_FLAC
+#define IBSS_ATTR_FLAC_DECODED0
+#define ICONST_ATTR_MPA_HUFFMAN
+#define IBSS_ATTR_MPC_SAMPLE_BUF
+#define ICODE_ATTR_ALAC
+#define IBSS_ATTR_SHORTEN_DECODED0
+
 #endif /* SIMULATOR */
diff --git a/firmware/target/arm/pcm-telechips.c b/firmware/target/arm/pcm-telechips.c
index 63f50f7d78..b3fd9216dc 100644
--- a/firmware/target/arm/pcm-telechips.c
+++ b/firmware/target/arm/pcm-telechips.c
@@ -94,6 +94,10 @@ void pcm_play_dma_init(void)
     BCLKCTR |= DEV_DAI;
     /* Master mode, 256->64fs, 16bit LSB*/
     DAMR = 0x3cce20;
+#elif defined(LOGIK_DAX)
+    /* TODO */
+#elif defined(SANSA_M200)
+    /* TODO */
 #else
 #error "Target isn't supported"
 #endif
diff --git a/firmware/target/arm/tcc77x/lcd-ssd1815.c b/firmware/target/arm/tcc77x/lcd-ssd1815.c
index a6e4481fb2..b41c8d26ef 100644
--- a/firmware/target/arm/tcc77x/lcd-ssd1815.c
+++ b/firmware/target/arm/tcc77x/lcd-ssd1815.c
@@ -129,21 +129,8 @@ void lcd_set_invert_display(bool yesno)
 /* turn the display upside down (call lcd_update() afterwards) */
 void lcd_set_flip(bool yesno)
 {
-    /* TODO: flip mode isn't working.  The commands in the else part of
-       this function are how the original firmware inits the LCD */
-
-    if (yesno)
-    {
-        lcd_write_command(LCD_SET_SEGMENT_REMAP | 0x01);
-        lcd_write_command(LCD_SET_COM_OUTPUT_SCAN_DIRECTION);
-        xoffset = 132 - LCD_WIDTH; /* 132 colums minus the 128 we have */
-    }
-    else 
-    {
-        lcd_write_command(LCD_SET_SEGMENT_REMAP);
-        lcd_write_command(LCD_SET_COM_OUTPUT_SCAN_DIRECTION | 0x08);
-        xoffset = 0;
-    }
+    (void)yesno;
+    /* TODO */
 }
 
 
diff --git a/firmware/target/arm/tcc77x/logikdax/audio-logikdax.c b/firmware/target/arm/tcc77x/logikdax/audio-logikdax.c
new file mode 100644
index 0000000000..bd85e0b573
--- /dev/null
+++ b/firmware/target/arm/tcc77x/logikdax/audio-logikdax.c
@@ -0,0 +1,43 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2007 by Michael Sevakis
+ *
+ * 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 "system.h"
+#include "cpu.h"
+#include "audio.h"
+#include "sound.h"
+
+int audio_channels = 2;
+int audio_output_source = AUDIO_SRC_PLAYBACK;
+
+void audiohw_enable_output(bool on)
+{
+    (void)on;
+}
+
+void audio_set_output_source(int source)
+{
+    (void)source;
+}
+
+void audio_input_mux(int source, unsigned flags)
+{
+    (void)source;
+    (void)flags;
+}
diff --git a/firmware/target/arm/tcc77x/m200/audio-m200.c b/firmware/target/arm/tcc77x/m200/audio-m200.c
new file mode 100644
index 0000000000..bd85e0b573
--- /dev/null
+++ b/firmware/target/arm/tcc77x/m200/audio-m200.c
@@ -0,0 +1,43 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2007 by Michael Sevakis
+ *
+ * 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 "system.h"
+#include "cpu.h"
+#include "audio.h"
+#include "sound.h"
+
+int audio_channels = 2;
+int audio_output_source = AUDIO_SRC_PLAYBACK;
+
+void audiohw_enable_output(bool on)
+{
+    (void)on;
+}
+
+void audio_set_output_source(int source)
+{
+    (void)source;
+}
+
+void audio_input_mux(int source, unsigned flags)
+{
+    (void)source;
+    (void)flags;
+}
diff --git a/firmware/target/arm/wmcodec-telechips.c b/firmware/target/arm/wmcodec-telechips.c
index 5fcc46154b..de3a29c8c7 100644
--- a/firmware/target/arm/wmcodec-telechips.c
+++ b/firmware/target/arm/wmcodec-telechips.c
@@ -34,7 +34,7 @@
 #if defined(COWON_D2)
 /* The D2's audio codec uses an I2C address of 0x34 */
 #define I2C_AUDIO_ADDRESS 0x34
-#elif defined (IAUDIO_7)
+#elif defined (IAUDIO_7) || defined(LOGIK_DAX) || defined(SANSA_M200)
 #define I2C_AUDIO_ADDRESS 0x34
 #else
 #error wmcodec not implemented for this target!