Simplify powermgmt thread loops so it calls functions turn (no more power_thread_sleep). Do other target-friendly simplifications, generic battery switch handling and split sim-specific code. Whoever can, please verify charging on the Archos Recorder (due to change in the charger duty cycle code).

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

1 files changed, 3 insertions, 5 deletions

diff --git a/apps/screens.c b/apps/screens.c
index 992c740460..230e9ae53c 100644
--- a/apps/screens.c
+++ b/apps/screens.c
@@ -209,8 +209,7 @@ static void charging_display_info(bool animate)
         lcd_puts(0, 7, buf);
     }
 
-#if CONFIG_CHARGING == CHARGING_CONTROL
-
+#ifdef ARCHOS_RECORER
     snprintf(buf, 32, "Charge mode:");
     lcd_puts(0, 2, buf);
 
@@ -224,10 +223,9 @@ static void charging_display_info(bool animate)
         snprintf(buf, 32, "not charging");
 
     lcd_puts(0, 3, buf);
-    if (!charger_enabled)
+    if (!charger_enabled())
         animate = false;
-#endif /* CONFIG_CHARGING == CHARGING_CONTROL */
-
+#endif /* ARCHOS_RECORER */
 
     /* middle part */
     memset(charging_logo+3, 0x00, 32);