5 files changed, 20 insertions, 6 deletions

diff --git a/firmware/export/config-iaudiox5.h b/firmware/export/config-iaudiox5.h
index d224b3b45e..cd77dc3c48 100644
--- a/firmware/export/config-iaudiox5.h
+++ b/firmware/export/config-iaudiox5.h
@@ -6,7 +6,7 @@
 #define MODEL_NUMBER 10
 
 /* define this if you have recording possibility */
-/*#define HAVE_RECORDING 1*/
+#define HAVE_RECORDING 1
 
 /* define this if you have a bitmap LCD display */
 #define HAVE_LCD_BITMAP 1
@@ -53,6 +53,11 @@
 /* The number of bytes reserved for loadable plugins */
 #define PLUGIN_BUFFER_SIZE 0x80000
 
+/* FM Tuner */
+#define CONFIG_TUNER       TEA5767
+#define CONFIG_TUNER_XTAL  32768
+
+
 #define BATTERY_CAPACITY_DEFAULT 950 /* default battery capacity */
 
 #ifndef SIMULATOR
diff --git a/firmware/export/fmradio_i2c.h b/firmware/export/fmradio_i2c.h
index b7007a80dd..6483594d04 100644
--- a/firmware/export/fmradio_i2c.h
+++ b/firmware/export/fmradio_i2c.h
@@ -20,7 +20,7 @@
 #ifndef FMRADIO_I2C_H
 #define FMRADIO_I2C_H
 
-int fmradio_i2c_write(int address, const unsigned char* buf, int count);
-int fmradio_i2c_read(int address, unsigned char* buf, int count);
+int fmradio_i2c_write(unsigned char address, const unsigned char* buf, int count);
+int fmradio_i2c_read(unsigned char address, unsigned char* buf, int count);
 
 #endif
diff --git a/firmware/export/i2c-coldfire.h b/firmware/export/i2c-coldfire.h
index d4a5781116..544a3169cf 100644
--- a/firmware/export/i2c-coldfire.h
+++ b/firmware/export/i2c-coldfire.h
@@ -26,10 +26,18 @@
 #ifndef _I2C_COLDFIRE_H
 #define _I2C_COLDFIRE_H
 
+#include "cpu.h"
+
 void i2c_init(void);
-int i2c_write(int device, unsigned char *buf, int count);
+int i2c_read (volatile unsigned char *iface, unsigned char addr, 
+              unsigned char *buf, int count);
+int i2c_write(volatile unsigned char *iface, unsigned char addr, 
+              const unsigned char *buf, int count);
 void i2c_close(void);
+void i2c_adjust_prescale(int multiplier);
 
+#define I2C_IFACE_0  ((volatile unsigned char *)&MADR)
+#define I2C_IFACE_1  ((volatile unsigned char *)&MADR2)
 
 #define MAX_LOOP    0x100     /* TODO: select a better value */
 
diff --git a/firmware/export/sound.h b/firmware/export/sound.h
index a49cb99263..33175e4166 100644
--- a/firmware/export/sound.h
+++ b/firmware/export/sound.h
@@ -36,7 +36,7 @@ enum {
     SOUND_MDB_ENABLE,
     SOUND_SUPERBASS,
 #endif
-#if CONFIG_CODEC == MAS3587F || defined(HAVE_UDA1380)
+#if CONFIG_CODEC == MAS3587F || defined(HAVE_UDA1380) || defined(HAVE_TLV320)
     SOUND_LEFT_GAIN,
     SOUND_RIGHT_GAIN,
     SOUND_MIC_GAIN,
diff --git a/firmware/export/tlv320.h b/firmware/export/tlv320.h
index 93a79780c0..45ebfee569 100644
--- a/firmware/export/tlv320.h
+++ b/firmware/export/tlv320.h
@@ -26,11 +26,12 @@ extern void tlv320_init(void);
 extern void tlv320_reset(void);
 extern void tlv320_enable_output(bool enable);
 extern void tlv320_set_headphone_vol(int vol_l, int vol_r);
-extern void tlv320_set_linein_vol(int vol_l, int vol_r);
+extern void tlv320_set_recvol(int left, int right, int type);
 extern void tlv320_mute(bool mute);
 extern void tlv320_close(void);
 extern void tlv320_enable_recording(bool source_mic);
 extern void tlv320_disable_recording(void);
+extern void tlv320_set_monitor(bool enable);
 
 #define HEADPHONE_MUTE 0x30 /* 0110000 = -73db */