9 files changed, 18 insertions, 18 deletions

diff --git a/firmware/drivers/fmradio.c b/firmware/drivers/fmradio.c
index b7b245e0ce..c64d06e066 100644
--- a/firmware/drivers/fmradio.c
+++ b/firmware/drivers/fmradio.c
@@ -23,7 +23,7 @@
 #include "debug.h"
 #include "system.h"
 
-#ifdef CONFIG_TUNER
+#if CONFIG_TUNER
 
 /* Signals:
    DI (Data In)     - PB0 (doubles as data pin for the LCD)
diff --git a/firmware/drivers/power.c b/firmware/drivers/power.c
index 78e70f7466..9334b8e54a 100644
--- a/firmware/drivers/power.c
+++ b/firmware/drivers/power.c
@@ -34,7 +34,7 @@ bool charger_enabled;
 #endif
 
 
-#ifdef CONFIG_TUNER
+#if CONFIG_TUNER
 
 static bool powered = false;
 
@@ -59,7 +59,7 @@ bool radio_power(bool status)
     return old_status;
 }
 
-#endif /* #ifdef CONFIG_TUNER */
+#endif /* #if CONFIG_TUNER */
 
 #ifndef SIMULATOR
 
diff --git a/firmware/export/audio.h b/firmware/export/audio.h
index 716b1ad5d3..ebcb316cd9 100644
--- a/firmware/export/audio.h
+++ b/firmware/export/audio.h
@@ -136,14 +136,14 @@ enum audio_sources
 #ifdef HAVE_SPDIF_IN
     AUDIO_SRC_SPDIF,            /* monitor spdif */
 #endif
-#if defined(HAVE_FMRADIO_IN) || defined(CONFIG_TUNER)
+#if defined(HAVE_FMRADIO_IN) || CONFIG_TUNER
     AUDIO_SRC_FMRADIO,          /* monitor fm radio */
 #endif
     /* define new audio sources above this line */
     AUDIO_SOURCE_LIST_END,
-    /* AUDIO_SRC_FMRADIO must be declared #ifdef CONFIG_TUNER but is not in
+    /* AUDIO_SRC_FMRADIO must be declared #if CONFIG_TUNER but is not in
        the list of recordable sources. HAVE_FMRADIO_IN implies CONFIG_TUNER. */
-#if defined(HAVE_FMRADIO_IN) || !defined(CONFIG_TUNER)
+#if defined(HAVE_FMRADIO_IN) || (CONFIG_TUNER == 0)
     AUDIO_NUM_SOURCES = AUDIO_SOURCE_LIST_END,
 #else
     AUDIO_NUM_SOURCES = AUDIO_SOURCE_LIST_END-1,
@@ -155,7 +155,7 @@ enum audio_sources
 /* selects an audio source for recording or playback */
 #define SRCF_PLAYBACK         0x0000    /* default */
 #define SRCF_RECORDING        0x1000
-#ifdef CONFIG_TUNER
+#if CONFIG_TUNER
 /* for AUDIO_SRC_FMRADIO */
 #define SRCF_FMRADIO_PLAYING  0x0000    /* default */
 #define SRCF_FMRADIO_PAUSED   0x2000
diff --git a/firmware/export/power.h b/firmware/export/power.h
index 9eed1929fe..cafd6f87c8 100644
--- a/firmware/export/power.h
+++ b/firmware/export/power.h
@@ -47,7 +47,7 @@ void spdif_power_enable(bool on);
 bool spdif_powered(void);
 #endif
 
-#ifdef CONFIG_TUNER
+#if CONFIG_TUNER
 extern bool radio_power(bool status);
 extern bool radio_powered(void);
 #endif
diff --git a/firmware/export/tuner.h b/firmware/export/tuner.h
index 48d9bc97d1..0a13613711 100644
--- a/firmware/export/tuner.h
+++ b/firmware/export/tuner.h
@@ -37,7 +37,7 @@
 #define RADIO_STEREO 2
 #define RADIO_ALL 3 /* debug */
 
-#ifdef CONFIG_TUNER
+#if CONFIG_TUNER
 
 #if (CONFIG_TUNER & S1A0903X01)
 void samsung_set(int setting, int value);
@@ -49,6 +49,6 @@ void philips_set(int setting, int value);
 int philips_get(int setting);
 #endif
 
-#endif /* #ifdef CONFIG_TUNER */
+#endif /* #if CONFIG_TUNER */
 
 #endif
diff --git a/firmware/target/arm/iriver/h10/power-h10.c b/firmware/target/arm/iriver/h10/power-h10.c
index d53bf88fa6..a3be8125b9 100644
--- a/firmware/target/arm/iriver/h10/power-h10.c
+++ b/firmware/target/arm/iriver/h10/power-h10.c
@@ -37,7 +37,7 @@ bool charger_enabled;
 #endif
 
 #if 0
-#ifdef CONFIG_TUNER
+#if CONFIG_TUNER
 
 static bool powered = false;
 
@@ -62,7 +62,7 @@ bool radio_power(bool status)
     return old_status;
 }
 
-#endif /* #ifdef CONFIG_TUNER */
+#endif /* #if CONFIG_TUNER */
 #endif
 
 void power_init(void)
diff --git a/firmware/target/arm/iriver/ifp7xx/power-ifp7xx.c b/firmware/target/arm/iriver/ifp7xx/power-ifp7xx.c
index 6c5114a84e..1c3cc2b4bf 100644
--- a/firmware/target/arm/iriver/ifp7xx/power-ifp7xx.c
+++ b/firmware/target/arm/iriver/ifp7xx/power-ifp7xx.c
@@ -27,7 +27,7 @@
 #include "logf.h"
 #include "usb.h"
 
-#ifdef CONFIG_TUNER
+#if CONFIG_TUNER
 
 static bool powered = false;
 
@@ -44,7 +44,7 @@ bool radio_power(bool status)
     return old_status;
 }
 
-#endif /* #ifdef CONFIG_TUNER */
+#endif /* #if CONFIG_TUNER */
 
 #ifndef SIMULATOR
 
diff --git a/firmware/target/coldfire/iriver/h100/power-h100.c b/firmware/target/coldfire/iriver/h100/power-h100.c
index 9effeef7c8..75c8bea9dd 100644
--- a/firmware/target/coldfire/iriver/h100/power-h100.c
+++ b/firmware/target/coldfire/iriver/h100/power-h100.c
@@ -25,7 +25,7 @@
 #include "spdif.h"
 
 
-#ifdef CONFIG_TUNER
+#if CONFIG_TUNER
 
 static bool powered = false;
 
@@ -41,7 +41,7 @@ bool radio_power(bool status)
     return old_status;
 }
 
-#endif /* #ifdef CONFIG_TUNER */
+#endif /* #if CONFIG_TUNER */
 
 #ifndef SIMULATOR
 
diff --git a/firmware/target/coldfire/iriver/h300/power-h300.c b/firmware/target/coldfire/iriver/h300/power-h300.c
index 3d726d0714..2875fa2a47 100644
--- a/firmware/target/coldfire/iriver/h300/power-h300.c
+++ b/firmware/target/coldfire/iriver/h300/power-h300.c
@@ -25,7 +25,7 @@
 #include "pcf50606.h"
 
 
-#ifdef CONFIG_TUNER
+#if CONFIG_TUNER
 
 static bool powered = false;
 
@@ -41,7 +41,7 @@ bool radio_power(bool status)
     return old_status;
 }
 
-#endif /* #ifdef CONFIG_TUNER */
+#endif /* #if CONFIG_TUNER */
 
 #ifndef SIMULATOR