4 files changed, 28 insertions, 6 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;
 }