diff options
-rw-r--r-- | apps/main.c | 2 | ||||
-rw-r--r-- | firmware/drivers/lcd.c | 19 |
2 files changed, 11 insertions, 10 deletions
diff --git a/apps/main.c b/apps/main.c index 5f05bb54f5..203d8ca64b 100644 --- a/apps/main.c +++ b/apps/main.c | |||
@@ -72,9 +72,7 @@ int init(void) | |||
72 | 72 | ||
73 | dmalloc_initialize(); | 73 | dmalloc_initialize(); |
74 | bmalloc_add_pool(poolstart, poolend-poolstart); | 74 | bmalloc_add_pool(poolstart, poolend-poolstart); |
75 | #ifdef HAVE_LCD_BITMAP | ||
76 | lcd_init(); | 75 | lcd_init(); |
77 | #endif | ||
78 | show_logo(); | 76 | show_logo(); |
79 | 77 | ||
80 | #ifdef DEBUG | 78 | #ifdef DEBUG |
diff --git a/firmware/drivers/lcd.c b/firmware/drivers/lcd.c index 55a3160ed5..67d6f5e75a 100644 --- a/firmware/drivers/lcd.c +++ b/firmware/drivers/lcd.c | |||
@@ -374,9 +374,18 @@ void lcd_double_height(bool on) | |||
374 | lcd_write(true,on?9:8); | 374 | lcd_write(true,on?9:8); |
375 | } | 375 | } |
376 | 376 | ||
377 | #endif | 377 | #endif /* !SIMULATOR */ |
378 | |||
379 | #endif /* HAVE_LCD_CHARCELLS */ | ||
378 | 380 | ||
381 | #if defined(HAVE_LCD_CHARCELLS) || defined(SIMULATOR) /* not BITMAP */ | ||
382 | void lcd_init (void) | ||
383 | { | ||
384 | create_thread(scroll_thread, scroll_stack, sizeof(scroll_stack)); | ||
385 | } | ||
379 | #endif | 386 | #endif |
387 | |||
388 | |||
380 | #if defined(HAVE_LCD_BITMAP) || defined(SIMULATOR) /* not CHARCELLS */ | 389 | #if defined(HAVE_LCD_BITMAP) || defined(SIMULATOR) /* not CHARCELLS */ |
381 | 390 | ||
382 | /* | 391 | /* |
@@ -417,13 +426,7 @@ static unsigned char ones[] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, | |||
417 | static char fonts[] = { 6,8,12 }; | 426 | static char fonts[] = { 6,8,12 }; |
418 | static char fontheight[] = { 8,12,16 }; | 427 | static char fontheight[] = { 8,12,16 }; |
419 | 428 | ||
420 | #ifdef SIMULATOR | 429 | #ifndef SIMULATOR |
421 | |||
422 | void lcd_init (void) | ||
423 | { | ||
424 | create_thread(scroll_thread, scroll_stack, sizeof(scroll_stack)); | ||
425 | } | ||
426 | #else | ||
427 | 430 | ||
428 | /* | 431 | /* |
429 | * Initialize LCD | 432 | * Initialize LCD |