Make sure that no targets lose charging related features from those red builds yesterday.

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

apps/gui/gwps-common.c

@@ -653,15 +653,17 @@ static char* get_tag(struct wps_data* wps_data,
                     return buf;
                 }
 
+                case 'p': /* External power plugged in? */
+                {
 #ifdef HAVE_CHARGING             
-		case 'p': /* External power plugged in? */
+                    if(charger_input_state==CHARGER)
-		{
+#else
-		    if(charger_input_state==CHARGER)
+                    if(charger_inserted())
-			return "p";
-		    else
-			return NULL;
-		}
 #endif
+                        return "p";
+                    else
+                        return NULL;
+                }
 #if defined(HAVE_CHARGE_CTRL) || \
     defined (HAVE_CHARGE_STATE) || \
     CONFIG_BATTERY == BATT_LIION2200

apps/gui/statusbar.c

@@ -129,6 +129,8 @@ 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();

firmware/export/powermgmt.h

@@ -85,9 +85,7 @@ extern int trickle_sec;          /* trickle charge: How many seconds per minute
 typedef enum {
     DISCHARGING,
     CHARGING,
-#ifdef HAVE_CHARGE_CTRL
     TOPOFF,
-#endif
     TRICKLE
 } charge_state_type;