diff options
author | Barry Wardell <rockbox@barrywardell.net> | 2008-05-05 12:05:00 +0000 |
---|---|---|
committer | Barry Wardell <rockbox@barrywardell.net> | 2008-05-05 12:05:00 +0000 |
commit | 940091ae384e19a1219b10d5aea30c42b3a5da29 (patch) | |
tree | fbb601ee7e9fda75a81591427ca5685779535708 /bootloader/main-pp.c | |
parent | 9560ba66969c5bd7030da99acdf8f6fb34f3bfa0 (diff) | |
download | rockbox-940091ae384e19a1219b10d5aea30c42b3a5da29.tar.gz rockbox-940091ae384e19a1219b10d5aea30c42b3a5da29.zip |
FS#7977: Bootloader logo for PP-based targets (H10, Sansa, M-Robe 100).
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17374 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'bootloader/main-pp.c')
-rw-r--r-- | bootloader/main-pp.c | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/bootloader/main-pp.c b/bootloader/main-pp.c index c6063cffb5..f4184829e0 100644 --- a/bootloader/main-pp.c +++ b/bootloader/main-pp.c @@ -43,6 +43,8 @@ #include "usb_drv.h" #endif +/* Show the Rockbox logo - in show_logo.c */ +extern int show_logo(void); /* Button definitions */ #if CONFIG_KEYPAD == IRIVER_H10_PAD @@ -442,23 +444,27 @@ void* main(void) system_init(); kernel_init(); + lcd_init(); +#if LCD_DEPTH > 1 + lcd_set_foreground(LCD_WHITE); + lcd_set_background(LCD_BLACK); +#endif + font_init(); + show_logo(); + button_init(); #if defined(SANSA_E200) i2c_init(); _backlight_on(); #endif -#if LCD_DEPTH > 1 - lcd_set_foreground(LCD_WHITE); - lcd_set_background(LCD_BLACK); -#endif - lcd_clear_display(); if (button_hold()) { verbose = true; + lcd_clear_display(); printf("Hold switch on"); printf("Shutting down..."); sleep(HZ); @@ -468,8 +474,10 @@ void* main(void) btn = button_read_device(); /* Enable bootloader messages if any button is pressed */ - if (btn) + if (btn) { + lcd_clear_display(); verbose = true; + } #if defined(SANSA_E200) || defined(SANSA_C200) #if !defined(USE_ROCKBOX_USB) |