3 files changed, 18 insertions, 18 deletions

diff --git a/firmware/SOURCES b/firmware/SOURCES
index 5d59a6bd1e..7d93edaca1 100644
--- a/firmware/SOURCES
+++ b/firmware/SOURCES
@@ -210,10 +210,10 @@ drivers/isp1362.c
 drivers/m5636.c
 #endif
 
-#ifndef SIMULATOR
 #ifdef IAUDIO_X5
-drivers/generic_i2c.c
 target/coldfire/iaudio/x5/power-x5.c
+#ifndef SIMULATOR
+drivers/generic_i2c.c
 target/coldfire/iaudio/x5/lcd-x5.c
 target/coldfire/iaudio/x5/pcf50606-x5.c
 target/coldfire/iaudio/x5/adc-x5.c
diff --git a/firmware/export/config-iaudiox5.h b/firmware/export/config-iaudiox5.h
index cd77dc3c48..a04967c455 100644
--- a/firmware/export/config-iaudiox5.h
+++ b/firmware/export/config-iaudiox5.h
@@ -60,6 +60,8 @@
 
 #define BATTERY_CAPACITY_DEFAULT 950 /* default battery capacity */
 
+#define HAVE_TLV320
+
 #ifndef SIMULATOR
 
 /* Define this if you have a Motorola SCF5250 */
@@ -68,8 +70,6 @@
 /* Define this if you want to use coldfire's i2c interface */
 #define CONFIG_I2C I2C_COLDFIRE
 
-#define HAVE_TLV320
-
 /* Hardware controlled charging? FIXME */
 #define CONFIG_CHARGING CHARGING_SIMPLE
 
diff --git a/firmware/target/coldfire/iaudio/x5/power-x5.c b/firmware/target/coldfire/iaudio/x5/power-x5.c
index 4199993637..253c904588 100644
--- a/firmware/target/coldfire/iaudio/x5/power-x5.c
+++ b/firmware/target/coldfire/iaudio/x5/power-x5.c
@@ -64,20 +64,6 @@ void power_off(void)
         yield();
 }
 
-static bool powered = false;
-
-bool radio_powered()
-{
-    return powered;
-}
-
-bool radio_power(bool status)
-{
-    bool old_status = powered;
-    powered = status;
-    return old_status;
-}
-
 #else
 
 bool charger_inserted(void)
@@ -100,3 +86,17 @@ void ide_power_enable(bool on)
 }
 
 #endif /* SIMULATOR */
+
+static bool powered = false;
+
+bool radio_powered()
+{
+    return powered;
+}
+
+bool radio_power(bool status)
+{
+    bool old_status = powered;
+    powered = status;
+    return old_status;
+}