4 files changed, 77 insertions, 1 deletions

diff --git a/apps/screens.c b/apps/screens.c
index c990f6d445..6ec0695e24 100644
--- a/apps/screens.c
+++ b/apps/screens.c
@@ -28,14 +28,83 @@
 #include "mpeg.h"
 #include "usb.h"
 #include "settings.h"
+#include "status.h"
 #include "playlist.h"
 
+#ifdef HAVE_LCD_BITMAP
+#define BMPHEIGHT_usb_logo 32
+#define BMPWIDTH_usb_logo 100
+static unsigned char usb_logo[] = {
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x20, 0x10, 0x08,
+    0x04, 0x04, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+    0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x81, 0x81, 0x81, 0x81,
+    0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+    0x01, 0x01, 0x01, 0x01, 0xf1, 0x4f, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40,
+    0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0xc0, 
+    0x00, 0x00, 0xe0, 0x1c, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04,
+    0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04,
+    0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x06, 0x81, 0xc0, 0xe0, 0xe0, 0xe0, 0xe0,
+    0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0x70, 0x38, 0x1c, 0x1c,
+    0x0c, 0x0e, 0x0e, 0x06, 0x06, 0x06, 0x06, 0x06, 0x0f, 0x1f, 0x1f, 0x1f, 0x1f,
+    0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xc0, 0xc0, 0x80, 0x80, 0x00, 0x00,
+    0x00, 0x00, 0xe0, 0x1f, 0x00, 0xf8, 0x06, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
+    0x02, 0x02, 0x02, 0x82, 0x7e, 0x00, 0xc0, 0x3e, 0x01, 
+    0x70, 0x4f, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40,
+    0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40,
+    0x40, 0x40, 0x40, 0x40, 0x40, 0x80, 0x00, 0x07, 0x0f, 0x1f, 0x1f, 0x1f, 0x1f,
+    0x0f, 0x07, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x07, 0x0f,
+    0x1f, 0x3f, 0x7b, 0xf3, 0xe3, 0xc3, 0x83, 0x83, 0x83, 0x83, 0xe3, 0xe3, 0xe3,
+    0xe3, 0xe3, 0xe3, 0x03, 0x03, 0x03, 0x3f, 0x1f, 0x1f, 0x0f, 0x0f, 0x07, 0x02,
+    0xc0, 0x3e, 0x01, 0xe0, 0x9f, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+    0x80, 0x80, 0xf0, 0x0f, 0x80, 0x78, 0x07, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x0c, 0x10, 0x20, 0x40, 0x40, 0x80, 0x80,
+    0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+    0x80, 0x80, 0x80, 0x80, 0x80, 0x81, 0x81, 0x81, 0x81, 0x81, 0x87, 0x87, 0x87,
+    0x87, 0x87, 0x87, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0xf0,
+    0x0f, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04,
+    0x04, 0x04, 0x04, 0x04, 0x07, 0x00, 0x00, 0x00, 0x00, 
+};
+#endif
+
+void usb_display_info(void)
+{
+    lcd_stop_scroll();
+    lcd_clear_display();
+
+#ifdef HAVE_LCD_BITMAP
+    /* lcd_bitmap() only supports 16 pixels height! */
+    lcd_bitmap(usb_logo, 6, 16,
+               BMPWIDTH_usb_logo, 8, false);
+    lcd_bitmap(usb_logo+BMPWIDTH_usb_logo, 6, 24,
+               BMPWIDTH_usb_logo, 8, false);
+    lcd_bitmap(usb_logo+BMPWIDTH_usb_logo*2, 6, 32,
+               BMPWIDTH_usb_logo, 8, false);
+    lcd_bitmap(usb_logo+BMPWIDTH_usb_logo*3, 6, 40,
+               BMPWIDTH_usb_logo, 8, false);
+    status_draw();
+    lcd_update();
+#else
+    lcd_puts(0, 0, "[USB Mode]");
+    lcd_icon(ICON_PARAM, false);
+    lcd_icon(ICON_AUDIO, false);
+    lcd_icon(ICON_USB, true);
+#endif
+}
+
 void usb_screen(void)
 {
 #ifndef SIMULATOR
     backlight_on();
     usb_acknowledge(SYS_USB_CONNECTED_ACK);
-    usb_wait_for_disconnect(&button_queue);
+    while(usb_wait_for_disconnect_w_tmo(&button_queue, HZ)) {
+        if(usb_inserted()) {
+            usb_display_info();
+        }
+    }
     backlight_on();
 #endif
 }
diff --git a/apps/screens.h b/apps/screens.h
index 22eebb8053..27b156b895 100644
--- a/apps/screens.h
+++ b/apps/screens.h
@@ -19,6 +19,7 @@
 #ifndef _SCREENS_H_
 #define _SCREENS_H_
 
+void usb_display_info(void);
 void usb_screen(void);
 
 #ifdef HAVE_RECORDER_KEYPAD
diff --git a/apps/tree.c b/apps/tree.c
index f31811b9a5..5cd803adfe 100644
--- a/apps/tree.c
+++ b/apps/tree.c
@@ -1047,6 +1047,7 @@ bool dirbrowse(char *root)
 #endif
 
             case SYS_USB_CONNECTED:
+                status_set_playmode(STATUS_STOP);
                 usb_screen();
                 reload_root = true;
                 break;
diff --git a/apps/wps.c b/apps/wps.c
index e740216d96..82b62ca1b1 100644
--- a/apps/wps.c
+++ b/apps/wps.c
@@ -284,6 +284,7 @@ static int browse_id3(void)
                 break;
 
             case SYS_USB_CONNECTED: 
+                status_set_playmode(STATUS_STOP);
                 usb_screen();
                 return SYS_USB_CONNECTED;
                 break;
@@ -397,6 +398,7 @@ static bool ffwd_rew(int button)
                 break;
 
             case SYS_USB_CONNECTED:
+                status_set_playmode(STATUS_STOP);
                 usb_screen();
                 usb = true;
                 exit = true;
@@ -482,6 +484,7 @@ static bool keylock(void)
                 break;
 
             case SYS_USB_CONNECTED:
+                status_set_playmode(STATUS_STOP);
                 usb_screen();
                 return true;
 
@@ -603,6 +606,7 @@ static bool menu(void)
                 break;
 
             case SYS_USB_CONNECTED:
+                status_set_playmode(STATUS_STOP);
                 usb_screen();
                 return true;
         }
@@ -852,6 +856,7 @@ int wps_show(void)
                 return 0;
                     
             case SYS_USB_CONNECTED:
+                status_set_playmode(STATUS_STOP);
                 usb_screen();
                 return SYS_USB_CONNECTED;