Straighten out some powermanagement stuff. Give target complete control over how power inputs are sensed. Clean SIMULATOR stuff out of target files. Get rid of USB charging option on targets that don't support it or don't implement it yet. Menu string remains to avoid language incompatibility but should be removed on next cleanup for targets not using it (notice in english.lang). global_settings becomes incompatible for some builds and so plugin API version is incremented.

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

1 files changed, 17 insertions, 7 deletions

diff --git a/firmware/target/arm/sandisk/power-c200_e200.c b/firmware/target/arm/sandisk/power-c200_e200.c
index d6319f44bb..cc9d16f466 100644
--- a/firmware/target/arm/sandisk/power-c200_e200.c
+++ b/firmware/target/arm/sandisk/power-c200_e200.c
@@ -26,6 +26,7 @@
 #include "tuner.h"
 #include "as3514.h"
 #include "power.h"
+#include "usb.h"
 
 void power_init(void)
 {
@@ -53,15 +54,24 @@ void power_off(void)
     }
 }
 
-bool charger_inserted(void)
+unsigned int power_input_status(void)
 {
-#ifdef SANSA_E200
-    if(GPIOB_INPUT_VAL & 0x10)
-#else /* SANSA_C200 */
-    if(GPIOH_INPUT_VAL & 0x2)
+    unsigned int status = POWER_INPUT_NONE;
+
+#if defined(SANSA_E200)
+    #define _charger_present() (GPIOB_INPUT_VAL & 0x10)
+#elif defined(SANSA_C200)
+    #define _charger_present() (GPIOH_INPUT_VAL & 0x2)
+#else
+    #define _charger_present() 0
 #endif
-        return true;
-    return false;
+    
+    if (_charger_present())
+        status = POWER_INPUT_MAIN_CHARGER;
+
+    /* No separate source for USB */
+
+    return status;
 }
 
 void ide_power_enable(bool on)