From a452c7410dcc50cd12ad6d09a639c18b435d7ec9 Mon Sep 17 00:00:00 2001
From: Brandon Low <lostlogic@rockbox.org>
Date: Thu, 19 Jan 2006 19:39:51 +0000
Subject: Start cleaning up some #ifdefs in charging code

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8391 a1c6a512-1295-4272-9138-f99709370657
---
 apps/gui/gwps-common.c | 12 +++---------
 apps/gui/statusbar.c   |  2 --
 2 files changed, 3 insertions(+), 11 deletions(-)

(limited to 'apps/gui')

diff --git a/apps/gui/gwps-common.c b/apps/gui/gwps-common.c
index c9d093963e..b9b3e9bcd0 100644
--- a/apps/gui/gwps-common.c
+++ b/apps/gui/gwps-common.c
@@ -653,27 +653,21 @@ static char* get_tag(struct wps_data* wps_data,
                     return buf;
                 }
 
+#ifdef HAVE_CHARGING
                 case 'p': /* External power plugged in? */
                 {
-#ifdef HAVE_CHARGING             
                     if(charger_input_state==CHARGER)
-#else
-                    if(charger_inserted())
-#endif
                         return "p";
                     else
                         return NULL;
                 }
+#endif
 #if defined(HAVE_CHARGE_CTRL) || \
     defined (HAVE_CHARGE_STATE) || \
     CONFIG_BATTERY == BATT_LIION2200
                 case 'c': /* Charging */
                 {
-                    if (charge_state == CHARGING
-#ifdef HAVE_CHARGE_CTRL
-                            || charge_state == TOPOFF
-#endif
-                            ) {
+                    if (charge_state == CHARGING || charge_state == TOPOFF) {
                         return "c";
                     } else {
                         return NULL;
diff --git a/apps/gui/statusbar.c b/apps/gui/statusbar.c
index 57308c52f2..d8e611af85 100644
--- a/apps/gui/statusbar.c
+++ b/apps/gui/statusbar.c
@@ -129,8 +129,6 @@ void gui_statusbar_draw(struct gui_statusbar * bar, bool force_redraw)
     bar->info.volume = sound_val2phys(SOUND_VOLUME, global_settings.volume);
 #ifdef HAVE_CHARGING
     bar->info.inserted = (charger_input_state == CHARGER);
-#else
-    bar->info.inserted = charger_inserted();
 #endif
     bar->info.battlevel = battery_level();
     bar->info.battery_safe = battery_level_safe();
-- 
cgit v1.2.3