4 files changed, 36 insertions, 15 deletions

diff --git a/apps/main.c b/apps/main.c
index 568a7efd09..9b9bae5098 100644
--- a/apps/main.c
+++ b/apps/main.c
@@ -230,6 +230,10 @@ void init(void)
                 usb_screen();
                 mounted = true; /* mounting done @ end of USB mode */
             }
+#ifdef HAVE_USB_POWER
+        if (usb_powered())      /* avoid deadlock */
+            break;
+#endif
     }
 
     if (!mounted)
diff --git a/apps/recorder/icons.c b/apps/recorder/icons.c
index c77050e322..a10f2e1699 100644
--- a/apps/recorder/icons.c
+++ b/apps/recorder/icons.c
@@ -58,6 +58,7 @@ const unsigned char bitmap_icons_6x8[LastIcon][6] =
 const unsigned char bitmap_icons_7x8[][7] =
 {
     {0x08,0x1c,0x3e,0x3e,0x3e,0x14,0x14}, /* Power plug */
+    {0x1c,0x14,0x3e,0x2a,0x22,0x1c,0x08}, /* USB plug */
     {0x00,0x1c,0x1c,0x3e,0x7f,0x00,0x00}, /* Speaker */
     {0x01,0x1e,0x1c,0x3e,0x7f,0x20,0x40}, /* Speaker mute */
     {0x00,0x7f,0x7f,0x3e,0x1c,0x08,0x00}, /* Play */
@@ -239,7 +240,7 @@ const unsigned char rockbox160x53[] = {
 /*
  * Print battery icon to status bar
  */
-void statusbar_icon_battery(int percent, bool charging)
+void statusbar_icon_battery(int percent)
 {
     int i;
     int fill;
@@ -292,11 +293,6 @@ void statusbar_icon_battery(int percent, bool charging)
                    STATUSBAR_Y_POS, "?");
         lcd_setfont(FONT_UI);
     }
-    
-    /* draw power plug if charging */
-    if (charging)
-        lcd_bitmap(bitmap_icons_7x8[Icon_Plug], ICON_PLUG_X_POS,
-                   STATUSBAR_Y_POS, ICON_PLUG_WIDTH, STATUSBAR_HEIGHT, false);
 }
 
 /*
diff --git a/apps/recorder/icons.h b/apps/recorder/icons.h
index 77a310d053..b2900a1566 100644
--- a/apps/recorder/icons.h
+++ b/apps/recorder/icons.h
@@ -43,6 +43,7 @@ enum icons_5x8 {
 
 enum icons_7x8 {
     Icon_Plug,
+    Icon_USBPlug,
     Icon_Speaker,
     Icon_Mute,
     Icon_Play,
@@ -97,7 +98,7 @@ extern const unsigned char rockbox160x53[];
 #define TIME_X_END            STATUSBAR_WIDTH-1
 
 extern void statusbar_wipe(void);
-extern void statusbar_icon_battery(int percent, bool charging);
+extern void statusbar_icon_battery(int percent);
 extern bool statusbar_icon_volume(int percent);
 extern void statusbar_icon_play_state(int state);
 extern void statusbar_icon_play_mode(int mode);
diff --git a/apps/status.c b/apps/status.c
index 8d3d1748cb..2218768451 100644
--- a/apps/status.c
+++ b/apps/status.c
@@ -40,13 +40,15 @@
 #if CONFIG_KEYPAD == IRIVER_H100_PAD
 #include "button.h"
 #endif
+#include "usb.h"
 
 static enum playmode ff_mode;
 
 static long switch_tick;
-static int  battery_charge_step = 0;
-static bool plug_state;
 static bool battery_state = true;
+#ifdef HAVE_CHARGING
+static int  battery_charge_step = 0;
+#endif
 
 struct status_info {
     int battlevel;
@@ -63,6 +65,10 @@ struct status_info {
 #if CONFIG_LED == LED_VIRTUAL
         bool led; /* disk LED simulation in the status bar */
 #endif
+#ifdef HAVE_USB_POWER
+    bool usb_power;
+#endif
+
 };
 
 void status_init(void)
@@ -170,6 +176,9 @@ void status_draw(bool force_redraw)
 #if CONFIG_LED == LED_VIRTUAL
     info.led = led_read(HZ/2); /* delay should match polling interval */
 #endif
+#ifdef HAVE_USB_POWER
+    info.usb_power = usb_powered();
+#endif
 
     /* only redraw if forced to, or info has changed */
     if (force_redraw ||
@@ -183,10 +192,10 @@ void status_draw(bool force_redraw)
     /* players always "redraw" */
     {
 #endif
-        
+
+#ifdef HAVE_CHARGING
         if (info.inserted) {
             battery_state = true;
-            plug_state = true;
 #if defined(HAVE_CHARGE_CTRL) || CONFIG_BATTERY == BATT_LIION2200
             /* zero battery run time if charging */
             if (charge_state > 0) {
@@ -212,8 +221,9 @@ void status_draw(bool force_redraw)
                 }
             }
         }
-        else {
-            plug_state=false;
+        else
+#endif /* HAVE_CHARGING */
+        {
             if (info.battery_safe)
                 battery_state = true;
             else {
@@ -228,8 +238,18 @@ void status_draw(bool force_redraw)
 
 #ifdef HAVE_LCD_BITMAP
         if (battery_state)
-            statusbar_icon_battery(info.battlevel, plug_state);
-            
+            statusbar_icon_battery(info.battlevel);
+
+        /* draw power plug if charging */
+        if (info.inserted)
+            lcd_bitmap(bitmap_icons_7x8[Icon_Plug], ICON_PLUG_X_POS,
+                       STATUSBAR_Y_POS, ICON_PLUG_WIDTH, STATUSBAR_HEIGHT, false);
+#ifdef HAVE_USB_POWER
+        else if (info.usb_power)
+            lcd_bitmap(bitmap_icons_7x8[Icon_USBPlug], ICON_PLUG_X_POS,
+                       STATUSBAR_Y_POS, ICON_PLUG_WIDTH, STATUSBAR_HEIGHT, false);
+#endif
+
         info.redraw_volume = statusbar_icon_volume(info.volume);
         statusbar_icon_play_state(current_playmode() + Icon_Play);
         switch (info.repeat) {