Remove the calls to backlight_lcd_sleep_countdown from target specific code and move it into backlight.c

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

11 files changed, 20 insertions, 65 deletions

diff --git a/firmware/backlight.c b/firmware/backlight.c
index 7e7f745298..07c55c6bca 100644
--- a/firmware/backlight.c
+++ b/firmware/backlight.c
@@ -210,7 +210,7 @@ static int lcd_sleep_timeout = 10*HZ;
 
 static int lcd_sleep_timer SHAREDDATA_ATTR = 0;
 
-void backlight_lcd_sleep_countdown(bool start)
+static void backlight_lcd_sleep_countdown(bool start)
 {
     if (!start)
     {
@@ -223,8 +223,8 @@ void backlight_lcd_sleep_countdown(bool start)
     if (lcd_sleep_timeout < 0)
     {
         lcd_sleep_timer = 0; /* Setting == Always */
-#if (CONFIG_BACKLIGHT_FADING == BACKLIGHT_FADING_PWM)
         /* Ensure lcd_sleep() is called from backlight_thread() */
+#if (CONFIG_BACKLIGHT_FADING == BACKLIGHT_FADING_PWM)
         queue_post(&backlight_queue, LCD_SLEEP, 0);
 #else
         lcd_sleep();
@@ -504,11 +504,19 @@ static void backlight_update_state(void)
         queue_post(&backlight_queue, SYS_TIMEOUT, 0);
 #else
         _backlight_off();
+#ifdef HAVE_LCD_SLEEP
+        backlight_lcd_sleep_countdown(true); /* start sleep countdown */
+#endif
 #endif
     }
     else
     {
         backlight_timer = timeout;
+
+#ifdef HAVE_LCD_SLEEP
+        backlight_lcd_sleep_countdown(false); /* wake up lcd */
+#endif
+
 #if (CONFIG_BACKLIGHT_FADING == BACKLIGHT_FADING_SW_SETTING) \
     || (CONFIG_BACKLIGHT_FADING == BACKLIGHT_FADING_SW_HW_REG)
         backlight_setup_fade_up();
@@ -670,7 +678,15 @@ void backlight_thread(void)
                 if (backlight_fading_state != NOT_FADING)
                 {
                     if ((_backlight_fade_step(backlight_fading_state)))
-                        backlight_fading_state = NOT_FADING; /* finished fading */
+                    {   /* finished fading */
+#ifdef HAVE_LCD_SLEEP
+                        if (backlight_fading_state == FADING_DOWN)
+                        {   /* start sleep countdown */
+                             backlight_lcd_sleep_countdown(true);
+                        }
+#endif
+                        backlight_fading_state = NOT_FADING;
+                    }
                 }
                 else
 #endif /* CONFIG_BACKLIGHT_FADING */
diff --git a/firmware/export/backlight.h b/firmware/export/backlight.h
index a281b9ede0..c440db4668 100644
--- a/firmware/export/backlight.h
+++ b/firmware/export/backlight.h
@@ -56,12 +56,9 @@ void backlight_hold_changed(bool hold_button);
 void backlight_set_on_button_hold(int index);
 #endif
 
-#ifdef HAVE_LCD_SLEEP
-void backlight_lcd_sleep_countdown(bool start);
-#ifdef HAVE_LCD_SLEEP_SETTING
+#if defined(HAVE_LCD_SLEEP) && defined(HAVE_LCD_SLEEP_SETTING)
 void lcd_set_sleep_after_backlight_off(int index);
 #endif
-#endif
 
 #else /* !HAVE_BACKLIGHT */
 #define backlight_init()
diff --git a/firmware/target/arm/as3525/backlight-e200v2-fuze.c b/firmware/target/arm/as3525/backlight-e200v2-fuze.c
index 465713a1fc..30c6d4b22f 100644
--- a/firmware/target/arm/as3525/backlight-e200v2-fuze.c
+++ b/firmware/target/arm/as3525/backlight-e200v2-fuze.c
@@ -33,9 +33,6 @@ void _backlight_set_brightness(int brightness)
 
 void _backlight_on(void)
 {
-#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
@@ -52,9 +49,6 @@ void _backlight_off(void)
 #ifdef HAVE_LCD_ENABLE
     lcd_enable(false); /* power off visible display */
 #endif
-#ifdef HAVE_LCD_SLEEP
-    backlight_lcd_sleep_countdown(true); /* start countdown */
-#endif
 }
 
 void _buttonlight_on(void)
diff --git a/firmware/target/arm/as3525/sansa-c200v2/backlight-c200v2.c b/firmware/target/arm/as3525/sansa-c200v2/backlight-c200v2.c
index ba9db6a1f5..f036792fc0 100644
--- a/firmware/target/arm/as3525/sansa-c200v2/backlight-c200v2.c
+++ b/firmware/target/arm/as3525/sansa-c200v2/backlight-c200v2.c
@@ -38,9 +38,6 @@ void _backlight_set_brightness(int brightness)
 
 void _backlight_on(void)
 {
-#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
@@ -53,9 +50,6 @@ void _backlight_off(void)
 #ifdef HAVE_LCD_ENABLE
     lcd_enable(false); /* power off visible display */
 #endif
-#ifdef HAVE_LCD_SLEEP
-    backlight_lcd_sleep_countdown(true); /* start countdown */
-#endif
 }
 
 void _buttonlight_on(void)
diff --git a/firmware/target/arm/imx31/gigabeat-s/backlight-imx31.c b/firmware/target/arm/imx31/gigabeat-s/backlight-imx31.c
index 8457d06a77..ec7bf7e8a9 100644
--- a/firmware/target/arm/imx31/gigabeat-s/backlight-imx31.c
+++ b/firmware/target/arm/imx31/gigabeat-s/backlight-imx31.c
@@ -127,9 +127,6 @@ void _backlight_on(void)
 
     mutex_lock(&backlight_mutex);
 
-#ifdef HAVE_LCD_SLEEP
-    backlight_lcd_sleep_countdown(false); /* stop counter */
-#endif
 #ifdef HAVE_LCD_ENABLE
     lcd_enable(true);
 #endif
@@ -180,11 +177,6 @@ void _backlight_off(void)
                          0 << MC13783_LEDMDDC_POS,
                          MC13783_LEDMDDC);
 
-#ifdef HAVE_LCD_SLEEP
-    /* Disable lcd after fade completes (when lcd_sleep timeout expires) */
-    backlight_lcd_sleep_countdown(true); /* start countdown */
-#endif
-
     mutex_unlock(&backlight_mutex);
 }
 
diff --git a/firmware/target/arm/iriver/h10/backlight-h10.c b/firmware/target/arm/iriver/h10/backlight-h10.c
index 9d9ebe8295..e74f2b8d43 100644
--- a/firmware/target/arm/iriver/h10/backlight-h10.c
+++ b/firmware/target/arm/iriver/h10/backlight-h10.c
@@ -26,9 +26,6 @@
 
 void _backlight_on(void)
 {
-#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
@@ -41,7 +38,4 @@ void _backlight_off(void)
 #ifdef HAVE_LCD_ENABLE
     lcd_enable(false); /* power off visible display */
 #endif
-#ifdef HAVE_LCD_SLEEP
-    backlight_lcd_sleep_countdown(true); /* start countdown */
-#endif
 }
diff --git a/firmware/target/arm/philips/sa9200/backlight-sa9200.c b/firmware/target/arm/philips/sa9200/backlight-sa9200.c
index 5c967a84ea..a0acaa0abd 100644
--- a/firmware/target/arm/philips/sa9200/backlight-sa9200.c
+++ b/firmware/target/arm/philips/sa9200/backlight-sa9200.c
@@ -33,9 +33,6 @@ void _backlight_set_brightness(int brightness)
 
 void _backlight_on(void)
 {
-#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
@@ -52,9 +49,6 @@ void _backlight_off(void)
 #ifdef HAVE_LCD_ENABLE
     lcd_enable(false); /* power off visible display */
 #endif
-#ifdef HAVE_LCD_SLEEP
-    backlight_lcd_sleep_countdown(true); /* start countdown */
-#endif
 }
 
 void _buttonlight_on(void)
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 b38f18d4f9..97372acdd5 100644
--- a/firmware/target/arm/s3c2440/gigabeat-fx/backlight-meg-fx.c
+++ b/firmware/target/arm/s3c2440/gigabeat-fx/backlight-meg-fx.c
@@ -337,9 +337,6 @@ static void __backlight_dim(bool dim_now)
 
 void _backlight_on(void)
 {
-#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
@@ -349,10 +346,6 @@ void _backlight_on(void)
 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/sandisk/backlight-c200_e200.c b/firmware/target/arm/sandisk/backlight-c200_e200.c
index 5a2e98a278..0280604526 100644
--- a/firmware/target/arm/sandisk/backlight-c200_e200.c
+++ b/firmware/target/arm/sandisk/backlight-c200_e200.c
@@ -33,9 +33,6 @@ void _backlight_set_brightness(int brightness)
 
 void _backlight_on(void)
 {
-#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
@@ -52,9 +49,6 @@ void _backlight_off(void)
 #ifdef HAVE_LCD_ENABLE
     lcd_enable(false); /* power off visible display */
 #endif
-#ifdef HAVE_LCD_SLEEP
-    backlight_lcd_sleep_countdown(true); /* start countdown */
-#endif
 }
 
 void _buttonlight_on(void)
diff --git a/firmware/target/arm/tms320dm320/mrobe-500/backlight-mr500.c b/firmware/target/arm/tms320dm320/mrobe-500/backlight-mr500.c
index 2c188a584e..bdd91e2e20 100644
--- a/firmware/target/arm/tms320dm320/mrobe-500/backlight-mr500.c
+++ b/firmware/target/arm/tms320dm320/mrobe-500/backlight-mr500.c
@@ -38,9 +38,6 @@ static void _backlight_write_brightness(int brightness)
 
 void _backlight_on(void)
 {
-#if defined(HAVE_LCD_SLEEP) && !defined(BOOTLOADER)
-    backlight_lcd_sleep_countdown(false); /* stop counter */
-#endif
 #ifdef HAVE_LCD_ENABLE
     lcd_enable(true); /* power on lcd + visible display */
 #endif
@@ -50,10 +47,6 @@ void _backlight_on(void)
 void _backlight_off(void)
 {
     _backlight_write_brightness(0);
-#if defined(HAVE_LCD_SLEEP) && !defined(BOOTLOADER)
-    /* Disable lcd after fade completes (when lcd_sleep timeout expires) */
-    backlight_lcd_sleep_countdown(true); /* start countdown */
-#endif
 }
 
 /* Assumes that the backlight has been initialized */
diff --git a/firmware/target/coldfire/iaudio/x5/backlight-x5.c b/firmware/target/coldfire/iaudio/x5/backlight-x5.c
index fcf2adeade..8a06c7d653 100644
--- a/firmware/target/coldfire/iaudio/x5/backlight-x5.c
+++ b/firmware/target/coldfire/iaudio/x5/backlight-x5.c
@@ -37,9 +37,6 @@ bool _backlight_init(void)
 void _backlight_on(void)
 {
     int level;
-#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
@@ -56,9 +53,6 @@ void _backlight_off(void)
 #ifdef HAVE_LCD_ENABLE
     lcd_enable(false); /* power off visible display */
 #endif
-#ifdef HAVE_LCD_SLEEP
-    backlight_lcd_sleep_countdown(true); /* start countdown */
-#endif
 }
 
 /* set brightness by changing the PWM */