summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilliam Wilgus <wilgus.william@gmail.com>2020-11-13 13:57:39 -0500
committerWilliam Wilgus <wilgus.william@gmail.com>2020-11-13 13:57:39 -0500
commit47e1f964273e29c4f6f2923b3bb814b087c7af47 (patch)
tree54fce455e3715721e02461a9ef7d59e6fc7ef3a9
parentf65fb2a64abaf66b4d695be7fb3e114febea6bd1 (diff)
downloadrockbox-47e1f96427.tar.gz
rockbox-47e1f96427.tar.bz2
rockbox-47e1f96427.zip
Bugfix Backlight_init should be called after lcd_init
the rest.. Change-Id: I50585ba2191aa8134de3045b1445859b27503a68
-rw-r--r--bootloader/ipod.c7
-rw-r--r--bootloader/ipodnano2g.c4
-rw-r--r--bootloader/iriver_h1x0.c7
-rw-r--r--utils/atj2137/adfuload/test_binary/lcm/test_lcm.c7
4 files changed, 11 insertions, 14 deletions
diff --git a/bootloader/ipod.c b/bootloader/ipod.c
index 8e5bd08a42..9583afe0fb 100644
--- a/bootloader/ipod.c
+++ b/bootloader/ipod.c
@@ -306,12 +306,11 @@ void* main(void)
system_init();
kernel_init();
-#ifndef HAVE_BACKLIGHT_INVERSION
- backlight_init(); /* Turns on the backlight */
-#endif
-
lcd_init();
font_init();
+#ifndef HAVE_BACKLIGHT_INVERSION
+ backlight_init(); /* Turns on the backlight BUGFIX backlight_init MUST BE AFTER lcd_init */
+#endif
#ifdef HAVE_LCD_COLOR
lcd_set_foreground(LCD_WHITE);
diff --git a/bootloader/ipodnano2g.c b/bootloader/ipodnano2g.c
index 85bb2df86d..23a3557ae2 100644
--- a/bootloader/ipodnano2g.c
+++ b/bootloader/ipodnano2g.c
@@ -184,11 +184,11 @@ void main(void)
enable_irq();
- backlight_init(); /* Turns on the backlight */
-
lcd_init();
font_init();
+ backlight_init(); /* Turns on backlight -- BUGFIX backlight_init MUST BE AFTER lcd_init */
+
lcd_set_foreground(LCD_WHITE);
lcd_set_background(LCD_BLACK);
lcd_clear_display();
diff --git a/bootloader/iriver_h1x0.c b/bootloader/iriver_h1x0.c
index 8fd95d048c..f79c7c9aaf 100644
--- a/bootloader/iriver_h1x0.c
+++ b/bootloader/iriver_h1x0.c
@@ -485,14 +485,13 @@ void main(void)
try_flashboot();
# endif
- backlight_init();
-
-
lcd_init();
if (!rc_on_button)
lcd_remote_init();
-
+
+ backlight_init(); /* BUGFIX backlight_init MUST BE AFTER lcd_init */
+
/* Bootloader uses simplified backlight thread, so we need to enable
remote display here. */
if (remote_detect())
diff --git a/utils/atj2137/adfuload/test_binary/lcm/test_lcm.c b/utils/atj2137/adfuload/test_binary/lcm/test_lcm.c
index f795ccd1d0..581cefd3b0 100644
--- a/utils/atj2137/adfuload/test_binary/lcm/test_lcm.c
+++ b/utils/atj2137/adfuload/test_binary/lcm/test_lcm.c
@@ -280,14 +280,13 @@ int main(void)
/* unmask T0 source in INTC */
INTC_MSK |= (1<<10);
+ lcm_init();
+ lcd_init();
backlight_init();
- /* copy rb logo image */
+ /* copy rb logo image */
for (i=0; i<240*74; i++)
framebuffer[i] = rockboxlogo[i];
-
- lcm_init();
- lcd_init();
lcd_update_rect(0,0,240,74);
/* ADEC_N63.BIN seems to setup P_CLK as 7.5MHz which is timer clk */