From fc865cb5a85d2c465159b64e459fbf4e02a8e987 Mon Sep 17 00:00:00 2001 From: Dave Chapman 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/screen_access.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'apps/screen_access.c') diff --git a/apps/screen_access.c b/apps/screen_access.c index cac0b862ca..704cab1a37 100644 --- a/apps/screen_access.c +++ b/apps/screen_access.c @@ -54,12 +54,7 @@ void screen_init(struct screen * screen, enum screen_type screen_type) screen->mono_bitmap=&lcd_remote_mono_bitmap; screen->mono_bitmap_part=&lcd_remote_mono_bitmap_part; screen->set_drawmode=&lcd_remote_set_drawmode; -#if LCD_REMOTE_DEPTH == 1 - screen->bitmap=&lcd_remote_mono_bitmap; - screen->bitmap_part=&lcd_remote_mono_bitmap_part; -#else - screen->bitmap=&lcd_remote_bitmap; - screen->bitmap_part=&lcd_remote_bitmap_part; +#if LCD_REMOTE_DEPTH > 1 screen->get_background=&lcd_remote_get_background; screen->get_foreground=&lcd_remote_get_foreground; screen->set_background=&lcd_remote_set_background; @@ -131,9 +126,9 @@ void screen_init(struct screen * screen, enum screen_type screen_type) screen->mono_bitmap=&lcd_mono_bitmap; screen->mono_bitmap_part=&lcd_mono_bitmap_part; screen->set_drawmode=&lcd_set_drawmode; +#if LCD_DEPTH > 1 screen->bitmap=&lcd_bitmap; screen->bitmap_part=&lcd_bitmap_part; -#if LCD_DEPTH > 1 #if LCD_DEPTH == 2 /* No transparency yet for grayscale lcd */ screen->transparent_bitmap=&lcd_bitmap; -- cgit v1.2.3