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, 18 insertions, 6 deletions

diff --git a/firmware/powermgmt.c b/firmware/powermgmt.c
index 6f0c37b3c7..899e103d59 100644
--- a/firmware/powermgmt.c
+++ b/firmware/powermgmt.c
@@ -935,6 +935,23 @@ static inline void charging_algorithm_close(void)
 }
 #endif /* CONFIG_CHARGING == CHARGING_CONTROL */
 
+#if CONFIG_CHARGING
+/* Shortcut function calls - compatibility, simplicity. */
+
+/* Returns true if any power input is capable of charging. */
+bool charger_inserted(void)
+{
+    return power_input_status() & POWER_INPUT_CHARGER;
+}
+
+/* Returns true if any power input is connected - charging-capable
+ * or not. */
+bool power_input_present(void)
+{
+    return power_input_status() & POWER_INPUT;
+}
+#endif /* CONFIG_CHARGING */
+
 /*
  * This function is called to do the relativly long sleep waits from within the
  * main power_thread loop while at the same time servicing any other periodic
@@ -957,12 +974,7 @@ static void power_thread_sleep(int ticks)
          * loop (including the subroutines), and end up back here where we
          * transition to the appropriate steady state charger on/off state.
          */
-        if(charger_inserted()
-#ifdef HAVE_USB_POWER /* USB powered or USB inserted both provide power */
-                || usb_powered()
-                || (usb_inserted() && usb_charging_enabled())
-#endif
-                ) {
+        if(power_input_status() & POWER_INPUT_CHARGER) {
             switch(charger_input_state) {
                 case NO_CHARGER:
                 case CHARGER_UNPLUGGED: