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

9 files changed, 0 insertions, 58 deletions

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 */