diff options
Diffstat (limited to 'apps')
-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 76c20305cf..df9350ad5a 100644 --- a/apps/main_menu.c +++ b/apps/main_menu.c | |||
@@ -34,9 +34,9 @@ | |||
34 | extern void tetris(void); | 34 | extern void tetris(void); |
35 | #endif | 35 | #endif |
36 | 36 | ||
37 | #ifdef HAVE_LCD_BITMAP | ||
38 | static int show_logo(void) | 37 | static int show_logo(void) |
39 | { | 38 | { |
39 | #ifdef HAVE_LCD_BITMAP | ||
40 | unsigned char buffer[112 * 8]; | 40 | unsigned char buffer[112 * 8]; |
41 | 41 | ||
42 | int failure; | 42 | int failure; |
@@ -57,48 +57,28 @@ static int show_logo(void) | |||
57 | int eline; | 57 | int eline; |
58 | 58 | ||
59 | for(i=0, eline=0; i< height; i+=8, eline++) { | 59 | for(i=0, eline=0; i< height; i+=8, eline++) { |
60 | int x,y; | ||
61 | |||
62 | /* the bitmap function doesn't work with full-height bitmaps | 60 | /* the bitmap function doesn't work with full-height bitmaps |
63 | so we "stripe" the logo output */ | 61 | so we "stripe" the logo output */ |
64 | |||
65 | lcd_bitmap(&buffer[eline*width], 0, 10+i, width, | 62 | lcd_bitmap(&buffer[eline*width], 0, 10+i, width, |
66 | (height-i)>8?8:height-i, false); | 63 | (height-i)>8?8:height-i, false); |
67 | |||
68 | #if 0 | ||
69 | /* for screen output debugging */ | ||
70 | for(y=0; y<8 && (i+y < height); y++) { | ||
71 | for(x=0; x < width; x++) { | ||
72 | |||
73 | if(buffer[eline*width + x] & (1<<y)) { | ||
74 | printf("*"); | ||
75 | } | ||
76 | else | ||
77 | printf(" "); | ||
78 | } | ||
79 | printf("\n"); | ||
80 | } | ||
81 | #endif | ||
82 | } | 64 | } |
83 | } | 65 | } |
66 | lcd_update(); | ||
67 | |||
68 | #else | ||
69 | char *rockbox = "ROCKbox!"; | ||
70 | lcd_puts(0, 0, rockbox); | ||
71 | #endif | ||
84 | 72 | ||
85 | return 0; | 73 | return 0; |
86 | } | 74 | } |
87 | #endif | ||
88 | 75 | ||
89 | void show_splash(void) | 76 | void show_splash(void) |
90 | { | 77 | { |
91 | char *rockbox = "ROCKbox!"; | ||
92 | lcd_clear_display(); | 78 | lcd_clear_display(); |
93 | 79 | ||
94 | #ifdef HAVE_LCD_BITMAP | ||
95 | if (show_logo() != 0) | 80 | if (show_logo() != 0) |
96 | return; | 81 | return; |
97 | #else | ||
98 | lcd_puts(0, 0, rockbox); | ||
99 | #endif | ||
100 | |||
101 | lcd_update(); | ||
102 | } | 82 | } |
103 | 83 | ||
104 | void version(void) | 84 | void version(void) |