3 files changed, 12 insertions, 21 deletions

diff --git a/firmware/target/coldfire/iaudio/m3/power-m3.c b/firmware/target/coldfire/iaudio/m3/power-m3.c
index 5dbeadf732..4c446e54d0 100644
--- a/firmware/target/coldfire/iaudio/m3/power-m3.c
+++ b/firmware/target/coldfire/iaudio/m3/power-m3.c
@@ -27,8 +27,6 @@
 #include "power.h"
 #include "system.h"
 
-#ifndef SIMULATOR
-
 void power_init(void)
 {   
     /* Set KEEPACT */
@@ -47,9 +45,10 @@ void power_init(void)
 #endif
 }
 
-bool charger_inserted(void)
-{     
-    return (GPIO1_READ & 0x00000020) == 0;
+unsigned int power_input_status(void)
+{
+    return ((GPIO1_READ & 0x00000020) == 0) ?
+        POWER_INPUT_MAIN_CHARGER : POWER_INPUT_NONE;
 }
 
 void ide_power_enable(bool on)
@@ -77,8 +76,6 @@ void power_off(void)
     asm("halt");
 }
 
-#endif /* SIMULATOR */
-
 bool tuner_power(bool status)
 {
     (void)status;
diff --git a/firmware/target/coldfire/iaudio/m5/power-m5.c b/firmware/target/coldfire/iaudio/m5/power-m5.c
index 987ce0f3c5..8bb36c663d 100644
--- a/firmware/target/coldfire/iaudio/m5/power-m5.c
+++ b/firmware/target/coldfire/iaudio/m5/power-m5.c
@@ -27,8 +27,6 @@
 #include "pcf50606.h"
 #include "lcd-remote-target.h"
 
-#ifndef SIMULATOR
-
 void power_init(void)
 {
     /* Charger detect */
@@ -38,9 +36,10 @@ void power_init(void)
     pcf50606_init();
 }
 
-bool charger_inserted(void)
-{     
-    return (GPIO1_READ & 0x01000000) != 0;
+unsigned int power_input_status(void)
+{
+    return (GPIO1_READ & 0x01000000) ?
+        POWER_INPUT_MAIN_CHARGER : POWER_INPUT_NONE;
 }
 
 void ide_power_enable(bool on)
@@ -66,5 +65,3 @@ void power_off(void)
     and_l(~0x00000008, &GPIO_OUT); /* Set KEEPACT low */
     asm("halt");
 }
-
-#endif /* SIMULATOR */
diff --git a/firmware/target/coldfire/iaudio/x5/power-x5.c b/firmware/target/coldfire/iaudio/x5/power-x5.c
index 22f56961bf..4feb9c15d0 100644
--- a/firmware/target/coldfire/iaudio/x5/power-x5.c
+++ b/firmware/target/coldfire/iaudio/x5/power-x5.c
@@ -27,8 +27,6 @@
 #include "pcf50606.h"
 #include "lcd-remote-target.h"
 
-#ifndef SIMULATOR
-
 void power_init(void)
 {
     /* Charger detect */
@@ -38,9 +36,10 @@ void power_init(void)
     pcf50606_init();
 }
 
-bool charger_inserted(void)
-{     
-    return (GPIO1_READ & 0x01000000) != 0;
+unsigned int power_input_status(void)
+{
+    return (GPIO1_READ & 0x01000000) ?
+        POWER_INPUT_MAIN_CHARGER : POWER_INPUT_NONE;
 }
 
 void ide_power_enable(bool on)
@@ -67,8 +66,6 @@ void power_off(void)
     asm("halt");
 }
 
-#endif /* SIMULATOR */
-
 bool tuner_power(bool status)
 {
     (void)status;