diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2002-05-30 06:59:47 +0000 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2002-05-30 06:59:47 +0000 |
| commit | b169804437d4632497c11bc01c6b373ee52ffea2 (patch) | |
| tree | 1d0479228d0d5d8c01104aafac4fcf1e070c1446 | |
| parent | fbbdf0484d57a980397ba9f07b46b5d9ab67e996 (diff) | |
| download | rockbox-b169804437d4632497c11bc01c6b373ee52ffea2.zip rockbox-b169804437d4632497c11bc01c6b373ee52ffea2.tar.gz rockbox-b169804437d4632497c11bc01c6b373ee52ffea2.tar.bz2 rockbox-b169804437d4632497c11bc01c6b373ee52ffea2.tar.xz | |
rearranged to prevent compiler warnings
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@812 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | apps/main_menu.c | 36 |
1 files changed, 8 insertions, 28 deletions
diff --git a/apps/main_menu.c b/apps/main_menu.c index 76c2030..df9350a 100644 --- a/apps/main_menu.c +++ b/apps/main_menu.c @@ -34,9 +34,9 @@ extern void tetris(void); #endif -#ifdef HAVE_LCD_BITMAP static int show_logo(void) { +#ifdef HAVE_LCD_BITMAP unsigned char buffer[112 * 8]; int failure; @@ -57,48 +57,28 @@ static int show_logo(void) int eline; for(i=0, eline=0; i< height; i+=8, eline++) { - int x,y; - /* the bitmap function doesn't work with full-height bitmaps so we "stripe" the logo output */ - lcd_bitmap(&buffer[eline*width], 0, 10+i, width, (height-i)>8?8:height-i, false); - -#if 0 - /* for screen output debugging */ - for(y=0; y<8 && (i+y < height); y++) { - for(x=0; x < width; x++) { - - if(buffer[eline*width + x] & (1<<y)) { - printf("*"); - } - else - printf(" "); - } - printf("\n"); - } -#endif } } + lcd_update(); + +#else + char *rockbox = "ROCKbox!"; + lcd_puts(0, 0, rockbox); +#endif return 0; } -#endif void show_splash(void) { - char *rockbox = "ROCKbox!"; lcd_clear_display(); -#ifdef HAVE_LCD_BITMAP if (show_logo() != 0) - return; -#else - lcd_puts(0, 0, rockbox); -#endif - - lcd_update(); + return; } void version(void) |