5 files changed, 63 insertions, 1 deletions

diff --git a/firmware/export/config.h b/firmware/export/config.h
index a2ba3f9f98..7f77514116 100644
--- a/firmware/export/config.h
+++ b/firmware/export/config.h
@@ -41,6 +41,7 @@
 #define TEA5760    0x10 /* Philips */
 #define LV240000   0x20 /* Sanyo */
 #define IPOD_REMOTE_TUNER   0x40 /* Apple */
+#define FMCLIPPLUS 0x80 /* Mystery SiLabs FM tuner in some clip+ */
 
 /* CONFIG_CODEC */
 #define MAS3587F 3587
diff --git a/firmware/export/config/sansaclipplus.h b/firmware/export/config/sansaclipplus.h
index 9382b22cbd..883a71ea21 100644
--- a/firmware/export/config/sansaclipplus.h
+++ b/firmware/export/config/sansaclipplus.h
@@ -123,7 +123,7 @@
 #define AB_REPEAT_ENABLE 1
 
 /* FM Tuner */
-#define CONFIG_TUNER SI4700 /* in fact SI4702 */
+#define CONFIG_TUNER (SI4700|FMCLIPPLUS) /* in fact SI4702 */
 //#define HAVE_TUNER_PWR_CTRL
 
 /* Define this for LCD backlight available */
diff --git a/firmware/export/fmclipplus.h b/firmware/export/fmclipplus.h
new file mode 100644
index 0000000000..20961f47be
--- /dev/null
+++ b/firmware/export/fmclipplus.h
@@ -0,0 +1,54 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ *
+ * $Id$
+ *
+ * Tuner header for the Silicon Labs Mystery radio chip in some Sansa Clip+
+ *
+ * Copyright (C) 2010 Bertrik Sikken
+ *
+ * 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 _FMCLIPPLUS_H_
+#define _FMCLIPPLUS_H_
+
+#define HAVE_RADIO_REGION
+
+struct fmclipplus_region_data
+{
+    unsigned char deemphasis; /* 0: 75us, 1: 50us */
+    unsigned char band; /* 0: us/europe, 1: japan */
+} __attribute__((packed));
+
+extern const struct fmclipplus_region_data fmclipplus_region_data[TUNER_NUM_REGIONS];
+
+struct fmclipplus_dbg_info
+{
+    uint16_t regs[32];  /* Read registers */
+};
+
+bool fmclipplus_detect(void);
+void fmclipplus_init(void);
+int fmclipplus_set(int setting, int value);
+int fmclipplus_get(int setting);
+void fmclipplus_dbg_info(struct fmclipplus_dbg_info *nfo);
+
+#ifndef CONFIG_TUNER_MULTI
+#define tuner_set fmclipplus_set
+#define tuner_get fmclipplus_get
+#endif
+
+#endif /* _FMCLIPPLUS_H_ */
diff --git a/firmware/export/si4700.h b/firmware/export/si4700.h
index fcc71cb282..d6c4e73b6e 100644
--- a/firmware/export/si4700.h
+++ b/firmware/export/si4700.h
@@ -41,6 +41,7 @@ struct si4700_dbg_info
     uint16_t regs[16];  /* Read registers */
 };
 
+bool si4700_detect(void);
 void si4700_init(void);
 int si4700_set(int setting, int value);
 int si4700_get(int setting);
diff --git a/firmware/export/tuner.h b/firmware/export/tuner.h
index 03b6bd79d1..9101bb9241 100644
--- a/firmware/export/tuner.h
+++ b/firmware/export/tuner.h
@@ -99,6 +99,7 @@ char* tuner_get_rds_info(int setting);
 #else
 
 #ifdef CONFIG_TUNER_MULTI
+extern int tuner_detect_type(void);
 extern int (*tuner_set)(int setting, int value);
 extern int (*tuner_get)(int setting);
 #endif /* CONFIG_TUNER_MULTI */
@@ -131,6 +132,11 @@ extern int (*tuner_get)(int setting);
 #include "si4700.h"
 #endif
 
+/* Silicon Labs mystery radio chip in some Sansa Clip+ */
+#if (CONFIG_TUNER & FMCLIPPLUS)
+#include "fmclipplus.h"
+#endif
+
 /* Apple remote tuner */
 #if (CONFIG_TUNER & IPOD_REMOTE_TUNER)
 #include "ipod_remote_tuner.h"