4 files changed, 149 insertions, 5 deletions

diff --git a/firmware/export/audiohw.h b/firmware/export/audiohw.h
index 66fc19f923..91df2dd8b9 100644
--- a/firmware/export/audiohw.h
+++ b/firmware/export/audiohw.h
@@ -36,6 +36,8 @@
 
 #ifdef HAVE_UDA1380
 #include "uda1380.h"
+#elif defined(HAVE_UDA1341)
+#include "uda1341.h"
 #elif defined(HAVE_WM8751)
 #include "wm8751.h"
 #elif defined(HAVE_WM8978)
diff --git a/firmware/export/config-mini2440.h b/firmware/export/config-mini2440.h
index 0db027c7a0..b9d5dadf9c 100644
--- a/firmware/export/config-mini2440.h
+++ b/firmware/export/config-mini2440.h
@@ -39,9 +39,11 @@
 /* define the storage type */
 #define CONFIG_STORAGE STORAGE_SD
 
+/*
 #define HAVE_MULTIDRIVE
 #define NUM_DRIVES 2
 #define HAVE_HOTSWAP
+*/
 
 /* Disk storage */
 /* define this if you have a disk storage, i.e. something
@@ -62,7 +64,7 @@
 #define LCD_DEPTH  16          /* 65536 colours */
 #define LCD_PIXELFORMAT RGB565 /* rgb565 */
 /* Define this for LCD backlight available */
-/* The Mini2440 supports backight brightness depending on LCD type */
+/* The Mini2440 supports backlight brightness depending on LCD type */
 /* But the 3.5" LCD touch screen does not support brightness*/
 #define HAVE_BACKLIGHT
 #define HAVE_BACKLIGHT_BRIGHTNESS
@@ -71,15 +73,17 @@
 #define CONFIG_KEYPAD MINI2440_PAD
 
 /* I2C */
-/* Do not use I2C */
-#define CONFIG_I2C I2C_NONE
+/* We do not use currently use hardware I2C, but does not build without */
+#define CONFIG_I2C I2C_S3C2440
 
 /* Define DAC/Codec */
-/*#define HAVE_UDA1341*/
-#define HAVE_TLV320
+#define HAVE_UDA1341
 /* ... tone controls, use the software ones */
 #define HAVE_SW_TONE_CONTROLS
 
+#define HW_SAMPR_CAPS (SAMPR_CAP_64 | SAMPR_CAP_44 | SAMPR_CAP_22 | \
+                       SAMPR_CAP_11)
+
 /* Battery */
 #define BATTERY_CAPACITY_DEFAULT 1100   /* default battery capacity */
 #define BATTERY_CAPACITY_MIN      500   /* min. capacity selectable */
@@ -89,6 +93,9 @@
 
 /* USB */
 /* TODO:#define HAVE_USBSTACK */
+#define USB_NONE
+
+#define HAVE_SERIAL
 
 /***************************************************************************/
 /* Application Config */
diff --git a/firmware/export/s3c2440.h b/firmware/export/s3c2440.h
index c783b37f29..b6ba79a34e 100644
--- a/firmware/export/s3c2440.h
+++ b/firmware/export/s3c2440.h
@@ -462,6 +462,39 @@
 #define IISFCON (*(volatile unsigned long *)0x5500000C) /* IIS FIFO control */
 #define IISFIFO (*(volatile unsigned short *)0x55000010) /* IIS FIFO entry */
 
+#define IISCON_RIGHT_CHANNEL            (1 << 8)
+#define IISCON_TX_FIFO_NOT_EMPTY        (1 << 7)
+#define IISCON_RX_FIFO_NOT_FULL         (1 << 6)
+#define IISCON_TX_DMA_REQUEST           (1 << 5)
+#define IISCON_RX_DMA_REQUEST           (1 << 4)
+#define IISCON_TX_IDLE                  (1 << 3)
+#define IISCON_RX_IDLE                  (1 << 2)
+#define IISCON_IIS_PRESCALER_ENABLE     (1 << 1)
+#define IISCON_IIS_INTERFACE_ENABLE     (1 << 0)
+         
+#define IISMOD_MASTER_CLOCK_PCLK        (0 << 9)
+#define IISMOD_MASTER_CLOCK_MPLLIN      (1 << 9)
+#define IISMOD_MASTER_MODE              (0 << 8)
+#define IISMOD_SLAVE_MODE               (1 << 8)
+#define IISMOD_NO_TRANSFER              (0 << 6)
+#define IISMOD_RECEIVE_MODE             (1 << 6)
+#define IISMOD_TRANSMIT_MODE            (2 << 6)
+#define IISMOD_TRANSMIT_RECEIVE_MODE    (3 << 6)
+#define IISMOD_LOW_LEFT                 (0 << 5)
+#define IISMOD_HIGH_LEFT                (1 << 5)
+#define IISMOD_IIS                      (0 << 4)
+#define IISMOD_MSB                      (1 << 4)
+#define IISMOD_8_BIT                    (0 << 3)
+#define IISMOD_16_BIT                   (1 << 3)
+#define IISMOD_MASTER_CLOCK_256FS       (0 << 2)
+#define IISMOD_MASTER_CLOCK_384FS       (1 << 2)
+#define IISMOD_BIT_CLOCK_16FS           (0 << 0)
+#define IISMOD_BIT_CLOCK_32FS           (1 << 0)
+#define IISMOD_BIT_CLOCK_48FS           (2 << 0)
+
+#define IISPSR_PRESCALER_A              (1 << 5)
+#define IISPSR_PRESCALER_B              (1 << 0)
+
 /* I/O port */
 
 #define GPACON (*(volatile unsigned long *)0x56000000) /* Port A control */
diff --git a/firmware/export/uda1341.h b/firmware/export/uda1341.h
new file mode 100644
index 0000000000..dcbbeef8e5
--- /dev/null
+++ b/firmware/export/uda1341.h
@@ -0,0 +1,102 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2009 by Bob Cousins
+ *
+ * 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 _UDA1341_H
+#define _UDA1341_H
+
+/* volume/balance/treble/bass interdependency */
+#define VOLUME_MIN -840
+#define VOLUME_MAX  0
+
+#define AUDIOHW_CAPS (BASS_CAP | TREBLE_CAP | PRESCALER_CAP)
+
+extern int tenthdb2master(int db);
+extern int tenthdb2mixer(int db);
+
+extern void audiohw_set_master_vol(int vol_l, int vol_r);
+extern void audiohw_set_mixer_vol(int channel1, int channel2);
+
+/* Address byte */
+#define UDA1341_ADDR            0x14
+#define UDA_REG_DATA0           0x00
+#define UDA_REG_DATA1           0x01
+#define UDA_REG_STATUS          0x02
+
+/* STATUS */
+#define UDA_STATUS_0            (0 << 7)
+#define UDA_STATUS_1            (1 << 7)
+
+#define UDA_RESET               (1 << 6)
+#define UDA_SYSCLK_512FS        (0 << 4)
+#define UDA_SYSCLK_384FS        (1 << 4)
+#define UDA_SYSCLK_256FS        (2 << 4)
+#define I2S_IFMT_IIS            (0 << 1)
+#define I2S_IFMT_LSB16          (1 << 1)
+#define I2S_IFMT_LSB18          (2 << 1)
+#define I2S_IFMT_LSB20          (3 << 1)
+#define I2S_IFMT_MSB            (4 << 1)
+#define I2S_IFMT_LSB16_OFMT_MSB (5 << 1)
+#define I2S_IFMT_LSB18_OFMT_MSB (6 << 1)
+#define I2S_IFMT_LSB20_OFMT_MSB (7 << 1)
+#define UDA_DC_FILTER           (1 << 0)
+
+#define UDA_OUTPUT_GAIN         (1 << 6)
+#define UDA_INPUT_GAIN          (1 << 5)
+#define UDA_ADC_INVERT          (1 << 4)
+#define UDA_DAC_INVERT          (1 << 3)
+#define UDA_DOUBLE_SPEED        (1 << 2)
+#define UDA_POWER_ADC_ON        (1 << 1)
+#define UDA_POWER_DAC_ON        (1 << 0)
+
+/* DATA0 */
+#define UDA_DATA_CTRL0          (0 << 6)
+#define UDA_DATA_CTRL1          (1 << 6)
+#define UDA_DATA_CTRL2          (2 << 6)
+#define UDA_DATA_EXT_ADDR       (6 << 5)
+#define UDA_DATA_EXT_DATA       (7 << 5)
+
+#define UDA_VOLUME(x)           ((x) << 8)  /* 1=0dB, 61=-60dB */
+
+#define UDA_BASS_BOOST(x)       ((x) << 2)  /* see datasheet */
+#define UDA_TREBLE(x)           ((x) << 0)  /* see datasheet */
+
+#define UDA_PEAK_DETECT_POS     (1 << 5)
+#define UDA_DE_EMPHASIS_NONE    (0 << 3)
+#define UDA_DE_EMPHASIS_32      (1 << 3)
+#define UDA_DE_EMPHASIS_44_1    (2 << 3)
+#define UDA_DE_EMPHASIS_48      (3 << 3)
+#define UDA_MUTE                (1 << 2)
+#define UDA_MODE_SWITCH_FLAT    (0 << 0)
+#define UDA_MODE_SWITCH_MIN     (1 << 0)
+#define UDA_MODE_SWITCH_MAX     (3 << 0)
+
+#define UDA_EXT_0               (0 << 5)    /* Mixer Gain Chan 1 */
+#define UDA_EXT_1               (1 << 5)    /* Mixer Gain Chan 2 */
+#define UDA_EXT_2               (2 << 5)    /* Mic sens and mixer mode */
+#define UDA_EXT_4               (4 << 5)    /* AGC, Input amp gain */
+#define UDA_EXT_5               (5 << 5)    /* Input amp gain */
+#define UDA_EXT_6               (6 << 5)    /* AGC settings */
+
+/* TODO: DATA0 extended registers */
+
+/* DATA1: see datasheet */
+
+#endif /* _UDA_1341_H */