12 files changed, 43 insertions, 24 deletions

diff --git a/firmware/target/arm/as3525/sansa-c200v2/lcd-c200v2.c b/firmware/target/arm/as3525/sansa-c200v2/lcd-c200v2.c
index 2fc3e1f6c5..88adcd9d96 100644
--- a/firmware/target/arm/as3525/sansa-c200v2/lcd-c200v2.c
+++ b/firmware/target/arm/as3525/sansa-c200v2/lcd-c200v2.c
@@ -322,7 +322,7 @@ void lcd_enable(bool on)
         if(on)
         {
             _display_on();
-            lcd_call_enable_hook();
+            lcd_activation_call_hook();
         }
         else
         {
@@ -332,7 +332,7 @@ void lcd_enable(bool on)
     }
 }
 
-bool lcd_enabled(void)
+bool lcd_active(void)
 {
     return display_on;
 }
diff --git a/firmware/target/arm/as3525/sansa-clip/lcd-ssd1303.c b/firmware/target/arm/as3525/sansa-clip/lcd-ssd1303.c
index bfa02e796d..640f6694c9 100644
--- a/firmware/target/arm/as3525/sansa-clip/lcd-ssd1303.c
+++ b/firmware/target/arm/as3525/sansa-clip/lcd-ssd1303.c
@@ -159,22 +159,43 @@ void lcd_set_flip(bool yesno)
     }
 }
 
+#ifdef HAVE_LCD_ENABLE
+static void (*lcd_activation_hook)(void) = NULL;
+
+void lcd_activation_set_hook(void (*func)(void))
+{
+    lcd_activation_hook = func;
+}
+
+void lcd_activation_call_hook(void)
+{
+    void (*func)(void) = lcd_activation_hook;
+
+    if (func != NULL)
+        func();
+}
+
+
 void lcd_enable(bool enable)
 {
     if(display_on == enable)
         return;
 
     if( (display_on = enable) ) /* simple '=' is not a typo ! */
+    {
         lcd_write_command(LCD_SET_DISPLAY_ON);
+        lcd_activation_call_hook();
+    }
     else
         lcd_write_command(LCD_SET_DISPLAY_OFF);
 }
 
-bool lcd_enabled(void)
+bool lcd_active(void)
 {
     return display_on;
 }
 
+#endif
 
 /* LCD init, largely based on what OF does */
 void lcd_init_device(void)
diff --git a/firmware/target/arm/as3525/sansa-e200v2/lcd-e200v2.c b/firmware/target/arm/as3525/sansa-e200v2/lcd-e200v2.c
index 57d5649570..8715622717 100644
--- a/firmware/target/arm/as3525/sansa-e200v2/lcd-e200v2.c
+++ b/firmware/target/arm/as3525/sansa-e200v2/lcd-e200v2.c
@@ -328,7 +328,7 @@ void lcd_enable(bool on)
         if(on)
         {
             _display_on();
-            lcd_call_enable_hook();
+            lcd_activation_call_hook();
         }
         else
         {
@@ -338,7 +338,7 @@ void lcd_enable(bool on)
     }
 }
 
-bool lcd_enabled(void)
+bool lcd_active(void)
 {
     return display_on;
 }
diff --git a/firmware/target/arm/as3525/sansa-fuze/lcd-fuze.c b/firmware/target/arm/as3525/sansa-fuze/lcd-fuze.c
index 44451133ca..5196784a2f 100644
--- a/firmware/target/arm/as3525/sansa-fuze/lcd-fuze.c
+++ b/firmware/target/arm/as3525/sansa-fuze/lcd-fuze.c
@@ -206,6 +206,7 @@ void lcd_enable(bool on)
         /* a bit of delay before returning to
          * avoid irritating flash on backlight on */
         while(delay--);
+        lcd_activation_call_hook();
         
     }
     else
@@ -217,7 +218,7 @@ void lcd_enable(bool on)
     }
 }
 
-bool lcd_enabled(void)
+bool lcd_active(void)
 {
     return display_on;
 }
diff --git a/firmware/target/arm/imx31/gigabeat-s/lcd-imx31.c b/firmware/target/arm/imx31/gigabeat-s/lcd-imx31.c
index 47834b3b19..bddf03c5f6 100644
--- a/firmware/target/arm/imx31/gigabeat-s/lcd-imx31.c
+++ b/firmware/target/arm/imx31/gigabeat-s/lcd-imx31.c
@@ -121,7 +121,7 @@ void lcd_enable(bool state)
         lcd_powered = true;
         lcd_on = true;
         lcd_update();
-        lcd_call_enable_hook();
+        lcd_activation_call_hook();
     }
     else
     {
@@ -129,7 +129,7 @@ void lcd_enable(bool state)
     }
 }
 
-bool lcd_enabled(void)
+bool lcd_active(void)
 {
     return lcd_on;
 }
diff --git a/firmware/target/arm/ipod/video/lcd-video.c b/firmware/target/arm/ipod/video/lcd-video.c
index d1701ea3d7..c0e98cf53c 100644
--- a/firmware/target/arm/ipod/video/lcd-video.c
+++ b/firmware/target/arm/ipod/video/lcd-video.c
@@ -575,10 +575,7 @@ void lcd_awake(void)
         lcd_state.state = LCD_INITIAL;
         tick_add_task(&lcd_tick);
         lcd_state.display_on = true;
-        /* Note that only the RGB data from lcd_framebuffer has been 
-           displayed.  If YUV data was displayed, it needs to be updated
-           now.  (eg. see lcd_call_enable_hook())
-         */
+        lcd_activation_call_hook();
     }
     mutex_unlock(&lcdstate_lock);
 }
diff --git a/firmware/target/arm/iriver/h10/lcd-h10_20gb.c b/firmware/target/arm/iriver/h10/lcd-h10_20gb.c
index ffd8ab69ec..03a398af8d 100644
--- a/firmware/target/arm/iriver/h10/lcd-h10_20gb.c
+++ b/firmware/target/arm/iriver/h10/lcd-h10_20gb.c
@@ -363,7 +363,7 @@ void lcd_enable(bool on)
         /* Probably out of sync and we don't wanna pepper the code with
            lcd_update() calls for this. */
         lcd_update();
-        lcd_call_enable_hook();
+        lcd_activation_call_hook();
     }
     else
     {
@@ -371,7 +371,7 @@ void lcd_enable(bool on)
     }
 }
 
-bool lcd_enabled(void)
+bool lcd_active(void)
 {
     return display_on;
 }
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 d9a28d152f..fd52eda5e9 100644
--- a/firmware/target/arm/s3c2440/gigabeat-fx/lcd-meg-fx.c
+++ b/firmware/target/arm/s3c2440/gigabeat-fx/lcd-meg-fx.c
@@ -42,7 +42,7 @@ extern struct viewport* current_vp;
 extern void lcd_copy_buffer_rect(fb_data *dst, const fb_data *src,
                                  int width, int height);
 
-bool lcd_enabled(void)
+bool lcd_active(void)
 {
     return lcd_on;
 }
@@ -308,7 +308,7 @@ void lcd_enable(bool state)
 
         lcd_on = true;
         lcd_update();
-        lcd_call_enable_hook();
+        lcd_activation_call_hook();
     }
     else 
     {
diff --git a/firmware/target/arm/sandisk/sansa-e200/lcd-e200.c b/firmware/target/arm/sandisk/sansa-e200/lcd-e200.c
index e477f4fd45..e1a4d738d7 100644
--- a/firmware/target/arm/sandisk/sansa-e200/lcd-e200.c
+++ b/firmware/target/arm/sandisk/sansa-e200/lcd-e200.c
@@ -438,7 +438,7 @@ void lcd_enable(bool on)
         DEV_EN |= DEV_LCD; /* Enable LCD controller */
         lcd_display_on();  /* Turn on display */
         lcd_update();      /* Resync display */
-        lcd_call_enable_hook();
+        lcd_activation_call_hook();
         LCD_REG_6 |= 1;    /* Restart DMA */
         sleep(HZ/50);      /* Wait for a frame to be written */
     }
@@ -451,7 +451,7 @@ void lcd_enable(bool on)
     }
 }
 
-bool lcd_enabled(void)
+bool lcd_active(void)
 {
     return display_on;
 }
diff --git a/firmware/target/arm/tcc77x/iaudio7/lcd-iaudio7.c b/firmware/target/arm/tcc77x/iaudio7/lcd-iaudio7.c
index 0ca18bee67..134d936e7b 100644
--- a/firmware/target/arm/tcc77x/iaudio7/lcd-iaudio7.c
+++ b/firmware/target/arm/tcc77x/iaudio7/lcd-iaudio7.c
@@ -143,7 +143,7 @@ void lcd_enable(bool on)
 
     if (on) {
         _display_on();
-      lcd_call_enable_hook();
+      lcd_activation_call_hook();
     } else {
         /** Off sequence according to datasheet, p. 130 **/
         lcd_write_reg(R_FRAME_CYCLE_CONTROL, 0x0002);   /* EQ=0, 18 clks/line */
@@ -166,7 +166,7 @@ void lcd_enable(bool on)
     }
 }
 
-bool lcd_enabled(void)
+bool lcd_active(void)
 {
     return display_on;
 }
diff --git a/firmware/target/arm/tcc780x/cowond2/lcd-cowond2.c b/firmware/target/arm/tcc780x/cowond2/lcd-cowond2.c
index d6ee5f3649..7b64493c0a 100644
--- a/firmware/target/arm/tcc780x/cowond2/lcd-cowond2.c
+++ b/firmware/target/arm/tcc780x/cowond2/lcd-cowond2.c
@@ -230,7 +230,7 @@ void lcd_enable(bool on)
         lcd_display_on();
         LCDC_CTRL |= 1;     /* controller enable */
         lcd_update();       /* Resync display */
-        lcd_call_enable_hook();
+        lcd_activation_call_hook();
     }
     else
     {
@@ -239,7 +239,7 @@ void lcd_enable(bool on)
     }
 }
 
-bool lcd_enabled(void)
+bool lcd_active(void)
 {
     return display_on;
 }
diff --git a/firmware/target/arm/tms320dm320/creative-zvm/lcd-creativezvm.c b/firmware/target/arm/tms320dm320/creative-zvm/lcd-creativezvm.c
index f34e43687a..cd07fa9e6f 100644
--- a/firmware/target/arm/tms320dm320/creative-zvm/lcd-creativezvm.c
+++ b/firmware/target/arm/tms320dm320/creative-zvm/lcd-creativezvm.c
@@ -237,7 +237,7 @@ return;
     {
         lcd_display_on(false);  /* Turn on display */
         lcd_update();      /* Resync display */
-        lcd_call_enable_hook();
+        lcd_activation_call_hook();
     }
     else
     {
@@ -245,7 +245,7 @@ return;
     }
 }
 
-bool lcd_enabled(void)
+bool lcd_active(void)
 {
     return display_on;
 }