Fix all the red this time?

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13884 a1c6a512-1295-4272-9138-f99709370657

6 files changed, 32 insertions, 25 deletions

diff --git a/apps/recorder/radio.c b/apps/recorder/radio.c
index c15f519..eb457fc 100644
--- a/apps/recorder/radio.c
+++ b/apps/recorder/radio.c
@@ -1304,9 +1304,12 @@ void toggle_mono_mode(bool mono)
 
 void set_radio_region(int region)
 {
+#ifdef HAVE_RADIO_REGION
     tuner_set(RADIO_REGION, region);
+#endif
     next_station(0);
     remember_frequency();
+    (void)region;
 }
 
 MENUITEM_SETTING(set_region, &global_settings.fm_region, NULL);
diff --git a/firmware/SOURCES b/firmware/SOURCES
index 2db8e9e..d899551 100644
--- a/firmware/SOURCES
+++ b/firmware/SOURCES
@@ -150,8 +150,8 @@ drivers/rtc/rtc_as3514.c
 
 /* Tuner */
 #if CONFIG_TUNER
-#ifndef SIMULATOR
 tuner.c
+#ifndef SIMULATOR
 #if (CONFIG_TUNER & LV24020LP)
 drivers/tuner/lv24020lp.c
 #endif /* (CONFIG_TUNER & LV24020LP) */
diff --git a/firmware/export/hwcompat.h b/firmware/export/hwcompat.h
index bebca68..2261a91 100644
--- a/firmware/export/hwcompat.h
+++ b/firmware/export/hwcompat.h
@@ -40,12 +40,6 @@
 #define HW_MASK (*(short *)0x020000fc)
 #endif
 
-#endif /* (CONFIG_CPU == SH7034) && !SIMULATOR */
-
-#ifdef ARCHOS_PLAYER
-bool is_new_player(void);
-#endif
-
 #ifdef CONFIG_TUNER_MULTI
 static inline int tuner_detect_type(void)
 {
@@ -53,4 +47,10 @@ static inline int tuner_detect_type(void)
 }
 #endif
 
+#endif /* (CONFIG_CPU == SH7034) && !SIMULATOR */
+
+#ifdef ARCHOS_PLAYER
+bool is_new_player(void);
+#endif
+
 #endif /* HWCOMPAT_H */
diff --git a/firmware/export/s1a0903x01.h b/firmware/export/s1a0903x01.h
index bf49762..f36cfff 100644
--- a/firmware/export/s1a0903x01.h
+++ b/firmware/export/s1a0903x01.h
@@ -33,8 +33,8 @@ int s1a0903x01_set(int setting, int value);
 int s1a0903x01_get(int setting);
 
 #ifndef CONFIG_TUNER_MULTI
-#define tuner_set s1a0903x01_get
-#define tuner_get s1a0903x01_set
+#define tuner_get s1a0903x01_get
+#define tuner_set s1a0903x01_set
 #endif
 
 #endif /* _S1A0903X01_H_ */
diff --git a/firmware/tuner.c b/firmware/tuner.c
index 85f56b8..1ee42a5 100644
--- a/firmware/tuner.c
+++ b/firmware/tuner.c
@@ -23,22 +23,6 @@
 #include "tuner.h"
 #include "fmradio.h"
 
-#ifdef CONFIG_TUNER_MULTI
-int (*tuner_set)(int setting, int value);
-int (*tuner_get)(int setting);
-
-#define TUNER_TYPE_CASE(type, set, get, region_data) \
-    case type:                                       \
-        tuner_set = set;                             \
-        tuner_get = get;                             \
-        break;
-
-#else
-
-#define TUNER_TYPE_CASE(type, set, get, region_data)
-
-#endif /* CONFIG_TUNER_MULTI */
-
 /* General region information */
 const struct fm_region_data fm_region_data[TUNER_NUM_REGIONS] =
 {
@@ -48,6 +32,8 @@ const struct fm_region_data fm_region_data[TUNER_NUM_REGIONS] =
     [REGION_KOREA]     = { 87500000, 108000000, 100000 }
 };
 
+#ifndef SIMULATOR
+
 /* Tuner-specific region information */
 
 #if (CONFIG_TUNER & LV24020LP)
@@ -71,6 +57,18 @@ const struct tea5767_region_data tea5767_region_data[TUNER_NUM_REGIONS] =
 };
 #endif /* (CONFIG_TUNER & TEA5767) */
 
+#ifdef CONFIG_TUNER_MULTI
+int (*tuner_set)(int setting, int value);
+int (*tuner_get)(int setting);
+#define TUNER_TYPE_CASE(type, set, get, region_data) \
+    case type:                                       \
+        tuner_set = set;                             \
+        tuner_get = get;                             \
+        break;
+#else
+#define TUNER_TYPE_CASE(type, set, get, region_data)
+#endif /* CONFIG_TUNER_MULTI */
+
 void tuner_init(void)
 {
 #ifdef CONFIG_TUNER_MULTI
@@ -97,3 +95,5 @@ void tuner_init(void)
     #endif
     }
 }
+
+#endif /* SIMULATOR */
diff --git a/uisimulator/common/fmradio.c b/uisimulator/common/fmradio.c
index 372fd10..63edd9d 100644
--- a/uisimulator/common/fmradio.c
+++ b/uisimulator/common/fmradio.c
@@ -30,6 +30,10 @@ static bool mono = false;
 static bool powered = false;
 #endif
 
+void tuner_init(void)
+{
+}
+
 int tuner_set(int setting, int value)
 {
     switch(setting)