diff options
| author | Dave Chapman <dave@dchapman.com> | 2006-10-12 20:45:31 +0000 |
|---|---|---|
| committer | Dave Chapman <dave@dchapman.com> | 2006-10-12 20:45:31 +0000 |
| commit | fc865cb5a85d2c465159b64e459fbf4e02a8e987 (patch) | |
| tree | ed764aba712679e22b782535db26db8af3276de9 /apps/gui/logo.c | |
| parent | 00d218257be50f7f572deeed49f2ba9b2e235834 (diff) | |
| download | rockbox-fc865cb5a85d2c465159b64e459fbf4e02a8e987.zip rockbox-fc865cb5a85d2c465159b64e459fbf4e02a8e987.tar.gz rockbox-fc865cb5a85d2c465159b64e459fbf4e02a8e987.tar.bz2 rockbox-fc865cb5a85d2c465159b64e459fbf4e02a8e987.tar.xz | |
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
Diffstat (limited to 'apps/gui/logo.c')
| -rw-r--r-- | apps/gui/logo.c | 63 |
1 files changed, 0 insertions, 63 deletions
diff --git a/apps/gui/logo.c b/apps/gui/logo.c deleted file mode 100644 index f1a4786..0000000 --- a/apps/gui/logo.c +++ /dev/null @@ -1,63 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2002 Björn Stenberg - * - * All files in this archive are subject to the GNU General Public License. - * See the file COPYING in the source tree root for full license agreement. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ - -#include "logo.h" - -#ifdef HAVE_LCD_BITMAP - -#include <bitmaps/usblogo.h> -#if NB_SCREENS==2 -#include <bitmaps/remote_usblogo.h> -#endif - -struct logo usb_logos[]= -{ - [SCREEN_MAIN]={usblogo, BMPWIDTH_usblogo, BMPHEIGHT_usblogo}, -#if NB_SCREENS==2 - [SCREEN_REMOTE]={remote_usblogo, BMPWIDTH_remote_usblogo, BMPHEIGHT_remote_usblogo} -#endif - -}; -#else -struct logo usb_logos[]= -{ - [SCREEN_MAIN]={"[USB Mode]"} -}; -#endif - -void gui_logo_draw(struct logo * logo, struct screen * display) -{ - display->clear_display(); - -#ifdef HAVE_LCD_BITMAP - /* Center bitmap on screen */ - display->bitmap(logo->bitmap, - display->width/2-logo->width/2, - display->height/2-logo->height/2, - logo->width, - logo->height); - display->update(); -#else - display->double_height(false); - display->puts_scroll(0, 0, logo->text); -#ifdef SIMULATOR - display->update(); -#endif /* SIMULATOR */ -#endif /* HAVE_LCD_BITMAP */ -} |