diff options
Diffstat (limited to 'apps/main.c')
-rw-r--r-- | apps/main.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/apps/main.c b/apps/main.c index 4f468fa65b..e1eccc0fa9 100644 --- a/apps/main.c +++ b/apps/main.c | |||
@@ -167,9 +167,7 @@ int main(void) | |||
167 | screens[i].clear_display(); | 167 | screens[i].clear_display(); |
168 | screens[i].update(); | 168 | screens[i].update(); |
169 | } | 169 | } |
170 | #ifdef HAVE_LCD_BITMAP | ||
171 | list_init(); | 170 | list_init(); |
172 | #endif | ||
173 | tree_gui_init(); | 171 | tree_gui_init(); |
174 | /* Keep the order of this 3 | 172 | /* Keep the order of this 3 |
175 | * Must be done before any code uses the multi-screen API */ | 173 | * Must be done before any code uses the multi-screen API */ |
@@ -280,7 +278,6 @@ static void init_tagcache(void) | |||
280 | talk_number(tagcache_get_max_commit_step(), true); | 278 | talk_number(tagcache_get_max_commit_step(), true); |
281 | } | 279 | } |
282 | #endif | 280 | #endif |
283 | #ifdef HAVE_LCD_BITMAP | ||
284 | if (lang_is_rtl()) | 281 | if (lang_is_rtl()) |
285 | { | 282 | { |
286 | splashf(0, "[%d/%d] %s", ret, tagcache_get_max_commit_step(), | 283 | splashf(0, "[%d/%d] %s", ret, tagcache_get_max_commit_step(), |
@@ -291,12 +288,6 @@ static void init_tagcache(void) | |||
291 | splashf(0, "%s [%d/%d]", str(LANG_TAGCACHE_INIT), ret, | 288 | splashf(0, "%s [%d/%d]", str(LANG_TAGCACHE_INIT), ret, |
292 | tagcache_get_max_commit_step()); | 289 | tagcache_get_max_commit_step()); |
293 | } | 290 | } |
294 | #else | ||
295 | lcd_double_height(false); | ||
296 | lcd_putsf(0, 1, " DB [%d/%d]", ret, | ||
297 | tagcache_get_max_commit_step()); | ||
298 | lcd_update(); | ||
299 | #endif | ||
300 | clear = true; | 291 | clear = true; |
301 | } | 292 | } |
302 | sleep(HZ/4); | 293 | sleep(HZ/4); |
@@ -326,11 +317,9 @@ static void init(void) | |||
326 | #ifdef HAVE_REMOTE_LCD | 317 | #ifdef HAVE_REMOTE_LCD |
327 | lcd_remote_init(); | 318 | lcd_remote_init(); |
328 | #endif | 319 | #endif |
329 | #ifdef HAVE_LCD_BITMAP | ||
330 | FOR_NB_SCREENS(i) | 320 | FOR_NB_SCREENS(i) |
331 | global_status.font_id[i] = FONT_SYSFIXED; | 321 | global_status.font_id[i] = FONT_SYSFIXED; |
332 | font_init(); | 322 | font_init(); |
333 | #endif | ||
334 | show_logo(); | 323 | show_logo(); |
335 | #ifndef USB_NONE | 324 | #ifndef USB_NONE |
336 | usb_init(); | 325 | usb_init(); |
@@ -428,11 +417,9 @@ static void init(void) | |||
428 | #ifdef HAVE_REMOTE_LCD | 417 | #ifdef HAVE_REMOTE_LCD |
429 | lcd_remote_init(); | 418 | lcd_remote_init(); |
430 | #endif | 419 | #endif |
431 | #ifdef HAVE_LCD_BITMAP | ||
432 | FOR_NB_SCREENS(i) | 420 | FOR_NB_SCREENS(i) |
433 | global_status.font_id[i] = FONT_SYSFIXED; | 421 | global_status.font_id[i] = FONT_SYSFIXED; |
434 | font_init(); | 422 | font_init(); |
435 | #endif | ||
436 | 423 | ||
437 | settings_reset(); | 424 | settings_reset(); |
438 | 425 | ||
@@ -507,14 +494,12 @@ static void init(void) | |||
507 | CHART("<storage_init"); | 494 | CHART("<storage_init"); |
508 | if(rc) | 495 | if(rc) |
509 | { | 496 | { |
510 | #ifdef HAVE_LCD_BITMAP | ||
511 | lcd_clear_display(); | 497 | lcd_clear_display(); |
512 | lcd_putsf(0, 1, "ATA error: %d", rc); | 498 | lcd_putsf(0, 1, "ATA error: %d", rc); |
513 | lcd_puts(0, 3, "Press ON to debug"); | 499 | lcd_puts(0, 3, "Press ON to debug"); |
514 | lcd_update(); | 500 | lcd_update(); |
515 | while(!(button_get(true) & BUTTON_REL)); /* DO NOT CHANGE TO ACTION SYSTEM */ | 501 | while(!(button_get(true) & BUTTON_REL)); /* DO NOT CHANGE TO ACTION SYSTEM */ |
516 | dbg_ports(); | 502 | dbg_ports(); |
517 | #endif | ||
518 | panicf("ata: %d", rc); | 503 | panicf("ata: %d", rc); |
519 | } | 504 | } |
520 | 505 | ||
@@ -565,10 +550,8 @@ static void init(void) | |||
565 | lcd_clear_display(); | 550 | lcd_clear_display(); |
566 | lcd_puts(0, 0, "No partition"); | 551 | lcd_puts(0, 0, "No partition"); |
567 | lcd_puts(0, 1, "found."); | 552 | lcd_puts(0, 1, "found."); |
568 | #ifdef HAVE_LCD_BITMAP | ||
569 | lcd_puts(0, 2, "Insert USB cable"); | 553 | lcd_puts(0, 2, "Insert USB cable"); |
570 | lcd_puts(0, 3, "and fix it."); | 554 | lcd_puts(0, 3, "and fix it."); |
571 | #endif | ||
572 | lcd_update(); | 555 | lcd_update(); |
573 | 556 | ||
574 | while(button_get(true) != SYS_USB_CONNECTED) {}; | 557 | while(button_get(true) != SYS_USB_CONNECTED) {}; |