Fix some red. The stubs in bootloaders are giving some trouble.

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

2 files changed, 24 insertions, 17 deletions

diff --git a/firmware/target/arm/tms320dm320/creative-zvm/power-creativezvm.c b/firmware/target/arm/tms320dm320/creative-zvm/power-creativezvm.c
index 9c0f9c3cb7..90c30d326c 100644
--- a/firmware/target/arm/tms320dm320/creative-zvm/power-creativezvm.c
+++ b/firmware/target/arm/tms320dm320/creative-zvm/power-creativezvm.c
@@ -35,6 +35,7 @@ void power_init(void)
     /* Charger detect */
 }
 
+#if CONFIG_CHARGING
 unsigned int power_input_status(void)
 {
     return POWER_INPUT_NONE;
@@ -45,6 +46,7 @@ bool charging_state(void)
 {
     return false;
 }
+#endif
 
 void power_off(void)
 {
diff --git a/uisimulator/common/stubs.c b/uisimulator/common/stubs.c
index 8991bd73ca..31278371ee 100644
--- a/uisimulator/common/stubs.c
+++ b/uisimulator/common/stubs.c
@@ -209,20 +209,6 @@ bool lcd_enabled(void)
 }
 #endif
 
-bool charging_state(void)
-{
-    return false;
-}
-
-unsigned int power_input_status(void)
-{
-#ifdef HAVE_BATTERY_SWITCH
-    return POWER_INPUT_BATTERY;
-#else
-    return POWER_INPUT_NONE;
-#endif
-}
-
 #ifdef HAVE_SPDIF_POWER
 void spdif_power_enable(bool on)
 {
@@ -246,19 +232,38 @@ bool usb_powered(void)
     return false;
 }
 
+bool usb_charging_enable(bool on)
+{
+    (void)on;
+    return false;
+}
+#endif
+
 #if CONFIG_CHARGING
 bool charger_inserted(void)
 {
     return false;
 }
 
-bool usb_charging_enable(bool on)
+bool power_input_present(void)
 {
-    (void)on;
     return false;
 }
+
+unsigned int power_input_status(void)
+{
+#ifdef HAVE_BATTERY_SWITCH
+    return POWER_INPUT_BATTERY;
+#else
+    return POWER_INPUT_NONE;
 #endif
-#endif
+}
+
+bool charging_state(void)
+{
+    return false;
+}
+#endif /* CONFIG_CHARGING */
 
 bool usb_inserted(void)
 {