Don't init the lcd twice - once on lcd_init_device and the other one on first call of lcd_enable() (an old, known bug).

Linus, please check whether lcd_enable(true) is still required for the h300 bootloader (lcd_init() calls lcd_init_device())


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8317 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 4 insertions, 1 deletions

diff --git a/firmware/drivers/lcd-h300.c b/firmware/drivers/lcd-h300.c
index 384490a29f..d84edd6b2e 100644
--- a/firmware/drivers/lcd-h300.c
+++ b/firmware/drivers/lcd-h300.c
@@ -313,6 +313,8 @@ void lcd_init_device(void)
      * Gate output: VGH/VGL
      * 6th bit not set*/ 
     lcd_write_reg(R_DISP_CONTROL1, 0x0637);
+    /* ok, the display is finally on */
+    display_on=true;
 }
 
 void lcd_enable(bool on)
@@ -347,8 +349,9 @@ void lcd_enable(bool on)
 
             /* halt negative volt ampl. */
             lcd_write_reg(R_POWER_CONTROL4,0x0000); 
+            display_on=false;
         }
-        display_on=on;
+        /* display_on = on */
     }
 }