summaryrefslogtreecommitdiff
path: root/firmware/drivers/lcd-player.c
diff options
context:
space:
mode:
Diffstat (limited to 'firmware/drivers/lcd-player.c')
-rw-r--r--firmware/drivers/lcd-player.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/firmware/drivers/lcd-player.c b/firmware/drivers/lcd-player.c
index ca5c93a04b..ced421b88f 100644
--- a/firmware/drivers/lcd-player.c
+++ b/firmware/drivers/lcd-player.c
@@ -493,6 +493,8 @@ void lcd_set_contrast(int val)
493void lcd_init (void) 493void lcd_init (void)
494{ 494{
495 unsigned char data_vector[64]; 495 unsigned char data_vector[64];
496
497 (void)data_vector;
496 498
497 new_lcd = has_new_lcd(); 499 new_lcd = has_new_lcd();
498 memset(extended_chars_mapped, NO_CHAR, sizeof(extended_chars_mapped)); 500 memset(extended_chars_mapped, NO_CHAR, sizeof(extended_chars_mapped));
@@ -507,6 +509,7 @@ void lcd_init (void)
507 lcd_iram = NEW_LCD_IRAM; 509 lcd_iram = NEW_LCD_IRAM;
508 pattern_size=7; /* Last pattern, 7 for new LCD */ 510 pattern_size=7; /* Last pattern, 7 for new LCD */
509 511
512#ifndef SIMULATOR
510 /* LCD init for cold start */ 513 /* LCD init for cold start */
511 PBCR2 &= 0xff00; /* Set PB0..PB3 to GPIO */ 514 PBCR2 &= 0xff00; /* Set PB0..PB3 to GPIO */
512 or_b(0x0f, &PBIORL); /* ... output */ 515 or_b(0x0f, &PBIORL); /* ... output */
@@ -532,6 +535,7 @@ void lcd_init (void)
532 lcd_write_data(data_vector, 16); /* zero out */ 535 lcd_write_data(data_vector, 16); /* zero out */
533 536
534 lcd_write_command(NEW_LCD_DISPLAY_CONTROL_SET + 1); /* display on */ 537 lcd_write_command(NEW_LCD_DISPLAY_CONTROL_SET + 1); /* display on */
538#endif /* !SIMULATOR */
535 } 539 }
536 else { 540 else {
537 lcd_ascii = old_lcd_rocklatin1_to_xlcd; 541 lcd_ascii = old_lcd_rocklatin1_to_xlcd;
@@ -540,7 +544,8 @@ void lcd_init (void)
540 lcd_pram = OLD_LCD_PRAM; 544 lcd_pram = OLD_LCD_PRAM;
541 lcd_iram = OLD_LCD_IRAM; 545 lcd_iram = OLD_LCD_IRAM;
542 pattern_size=3; /* Last pattern, 3 for old LCD */ 546 pattern_size=3; /* Last pattern, 3 for old LCD */
543 547
548#ifndef SIMULATOR
544#if 1 549#if 1
545 /* LCD init for cold start */ 550 /* LCD init for cold start */
546 PBCR2 &= 0xff00; /* Set PB0..PB3 to GPIO */ 551 PBCR2 &= 0xff00; /* Set PB0..PB3 to GPIO */
@@ -615,6 +620,7 @@ void lcd_init (void)
615 lcd_write_data(&lcd_data_byte, 1); /* 0 */ 620 lcd_write_data(&lcd_data_byte, 1); /* 0 */
616 } 621 }
617#endif 622#endif
623#endif /* !SIMULATOR */
618 } 624 }
619 625
620 lcd_set_contrast(lcd_default_contrast()); 626 lcd_set_contrast(lcd_default_contrast());