2 files changed, 40 insertions, 14 deletions

diff --git a/firmware/target/arm/s3c2440/gigabeat-fx/backlight-meg-fx.c b/firmware/target/arm/s3c2440/gigabeat-fx/backlight-meg-fx.c
index 076c06b0d8..4fb66549cc 100644
--- a/firmware/target/arm/s3c2440/gigabeat-fx/backlight-meg-fx.c
+++ b/firmware/target/arm/s3c2440/gigabeat-fx/backlight-meg-fx.c
@@ -314,11 +314,6 @@ static void led_control_service(void)
             sc606_control=SC606_CONTROL_IDLE;
             break;
     }
-
-    if(sc606regCONFval&0x03)
-        lcd_enable(true);
-    else
-        lcd_enable(false);
 }
 #endif /* BOOTLOADER */
 
@@ -340,13 +335,22 @@ static void __backlight_dim(bool dim_now)
 
 void _backlight_on(void)
 {
-    lcd_enable(true);
+#ifdef HAVE_LCD_SLEEP
+    backlight_lcd_sleep_countdown(false); /* stop counter */
+#endif
+#ifdef HAVE_LCD_ENABLE
+    lcd_enable(true); /* power on lcd + visible display */
+#endif
     __backlight_dim(false);
 }    
 
 void _backlight_off(void)
 {
     __backlight_dim(true);
+#ifdef HAVE_LCD_SLEEP
+    /* Disable lcd after fade completes (when lcd_sleep timeout expires) */
+    backlight_lcd_sleep_countdown(true); /* start countdown */
+#endif
 }
 
 static inline void __buttonlight_on(void)
diff --git a/firmware/target/arm/s3c2440/gigabeat-fx/lcd-meg-fx.c b/firmware/target/arm/s3c2440/gigabeat-fx/lcd-meg-fx.c
index 37ac903418..5c268f42b8 100644
--- a/firmware/target/arm/s3c2440/gigabeat-fx/lcd-meg-fx.c
+++ b/firmware/target/arm/s3c2440/gigabeat-fx/lcd-meg-fx.c
@@ -26,7 +26,8 @@
 
 #define LCDADDR(x, y) (&lcd_framebuffer[(y)][(x)])
 
-static volatile bool lcd_on = true;
+static bool lcd_on = true;
+static bool lcd_powered = true;
 static unsigned lcd_yuv_options = 0;
 /*
 ** This is imported from lcd-16bit.c
@@ -174,6 +175,8 @@ void LCD_SPI_powerdown(void)
         0,0x04,1,0x00
     };
 
+    lcd_powered = false;
+
     LCD_SPI_start();
 
     LCD_SPI_send(powerdncmd, sizeof(powerdncmd));
@@ -198,6 +201,8 @@ void LCD_SPI_powerup(void)
     LCD_SPI_send(powerupcmd, sizeof(powerupcmd));
 
     LCD_SPI_stop();
+
+    lcd_powered = true;
 }
 
 void LCD_SPI_init(void)
@@ -266,23 +271,40 @@ void lcd_init_device(void)
     LCD_SPI_init();
 }
 
+void lcd_sleep(void)
+{
+    if (lcd_powered)
+    {
+        /* "not powered" implies "disabled" */
+        if (lcd_on)
+            lcd_enable(false);
+
+        LCD_SPI_powerdown();
+    }
+}
+
 void lcd_enable(bool state)
 {
+    if (state == lcd_on)
+        return;
+
     if(state)
     {
-        if(!lcd_on)
+        /* "enabled" implies "powered" */
+        if (!lcd_powered)
         {
-            lcd_on = true;
-            lcd_update();
             LCD_SPI_powerup();
+            /* Wait long enough for a frame to be written - yes, it
+             * takes awhile. */
+            sleep(HZ/5);
         }
+
+        lcd_on = true;
+        lcd_update();
     }
     else 
     {
-        if(lcd_on) {
-            lcd_on = false;
-            LCD_SPI_powerdown();
-        }
+        lcd_on = false;
     }
 }