From fc865cb5a85d2c465159b64e459fbf4e02a8e987 Mon Sep 17 00:00:00 2001
From: Dave Chapman <dave@dchapman.com>
Date: Thu, 12 Oct 2006 20:45:31 +0000
Subject: Revert change to screen_access.c (adding the native-bitmap drawing
 function) that caused warnings on the H3x0.  We now draw the USB logo using
 the normal lcd_bitmap() and lcd_remote_bitmap() functions instead of the
 screens API, which doesn't handle the differing bitmaps types well.  Remove
 apps/gui/logo.[ch] as they are now longer used.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11208 a1c6a512-1295-4272-9138-f99709370657
---
 apps/screens.c | 38 +++++++++++++++++++++++++++++++++-----
 1 file changed, 33 insertions(+), 5 deletions(-)

(limited to 'apps/screens.c')

diff --git a/apps/screens.c b/apps/screens.c
index b27dae1916..811b0b3df0 100644
--- a/apps/screens.c
+++ b/apps/screens.c
@@ -23,6 +23,9 @@
 #include "backlight.h"
 #include "action.h"
 #include "lcd.h"
+#ifdef HAVE_REMOTE_LCD
+#include "lcd-remote.h"
+#endif
 #include "lang.h"
 #include "icons.h"
 #include "font.h"
@@ -51,10 +54,17 @@
 #include "statusbar.h"
 #include "screen_access.h"
 #include "quickscreen.h"
-#include "logo.h"
 #include "pcmbuf.h"
 #include "list.h"
 
+#ifdef HAVE_LCD_BITMAP
+#include <bitmaps/usblogo.h>
+#endif
+
+#ifdef HAVE_REMOTE_LCD
+#include <bitmaps/remote_usblogo.h>
+#endif
+
 #if defined(HAVE_LCD_BITMAP)
 #include "widgets.h"
 #endif
@@ -82,15 +92,33 @@ void usb_screen(void)
 #ifdef HAVE_LCD_COLOR
     show_main_backdrop();
 #endif
-    FOR_NB_SCREENS(i) {
+
+    FOR_NB_SCREENS(i)
         screens[i].backlight_on();
-        gui_logo_draw(&usb_logos[i], &screens[i]);
-    }
-#ifdef HAVE_LCD_CHARCELLS
+
+#ifdef HAVE_REMOTE_LCD
+    lcd_remote_clear_display();
+    lcd_remote_bitmap(remote_usblogo, 
+                      (LCD_REMOTE_WIDTH-BMPWIDTH_remote_usblogo)/2, 
+                      (LCD_REMOTE_HEIGHT-BMPHEIGHT_remote_usblogo)/2,
+                      BMPWIDTH_remote_usblogo, BMPHEIGHT_remote_usblogo);
+    lcd_remote_update();
+#endif
+
+#ifdef HAVE_LCD_BITMAP
+    lcd_clear_display();
+    lcd_bitmap(usblogo, (LCD_WIDTH-BMPWIDTH_usblogo)/2, 
+                        (LCD_HEIGHT-BMPHEIGHT_usblogo)/2,
+                        BMPWIDTH_usblogo, BMPHEIGHT_usblogo);
+    lcd_update();
+#else
+    lcd_double_height(false);
+    lcd_puts_scroll(0, 0, "[USB Mode]");
     status_set_param(false);
     status_set_audio(false);
     status_set_usb(true);
 #endif /* HAVE_LCD_BITMAP */
+
     gui_syncstatusbar_draw(&statusbars, true);
 #ifdef SIMULATOR
     while (button_get(true) & BUTTON_REL);
-- 
cgit v1.2.3