Hardware controlled backlight brightness for iPod Video and Nano, retaining the software PWM fade in/ fade out. * Backlight handling cleanup, getting rid of one layer of 'lowlevelness'. * Use atomic GPIO bit manipulation for PP502x backlight handling.

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

2 files changed, 31 insertions, 21 deletions

diff --git a/firmware/target/arm/sandisk/backlight-c200_e200.c b/firmware/target/arm/sandisk/backlight-c200_e200.c
index a9fc862966..fad1018d38 100644
--- a/firmware/target/arm/sandisk/backlight-c200_e200.c
+++ b/firmware/target/arm/sandisk/backlight-c200_e200.c
@@ -16,6 +16,7 @@
  * KIND, either express or implied.
  *
  ****************************************************************************/
+#include "config.h"
 #include "backlight-target.h"
 #include "system.h"
 #include "lcd.h"
@@ -25,46 +26,57 @@
 
 static unsigned short backlight_brightness = DEFAULT_BRIGHTNESS_SETTING;
 
-void __backlight_set_brightness(int brightness)
+void _backlight_set_brightness(int brightness)
 {
     backlight_brightness = brightness;
 
     if (brightness > 0)
-        __backlight_on();
+        _backlight_on();
     else
-        __backlight_off();
+        _backlight_off();
 }
 
-void __backlight_on(void)
+void _backlight_on(void)
 {
 #ifdef HAVE_LCD_ENABLE
     lcd_enable(true); /* power on lcd */
 #endif
+#ifdef HAVE_LCD_SLEEP
+    _lcd_sleep_timer = 0; /* LCD should be awake already */
+#endif
     pp_i2c_send(AS3514_I2C_ADDR, DCDC15, backlight_brightness);
 }
 
-void __backlight_off(void)
+void _backlight_off(void)
 {
     pp_i2c_send(AS3514_I2C_ADDR, DCDC15, 0x0);
 #ifdef HAVE_LCD_ENABLE
     lcd_enable(false); /* power off lcd */
 #endif
+#ifdef HAVE_LCD_SLEEP
+    /* Start LCD sleep countdown */
+    if (_lcd_sleep_timeout < 0)
+    {
+        _lcd_sleep_timer = 0; /* Setting == Always */
+        lcd_sleep();
+    }
+    else
+        _lcd_sleep_timer = _lcd_sleep_timeout;
+#endif
 }
 
-#ifdef HAVE_BUTTON_LIGHT
-void __buttonlight_on(void)
+void _buttonlight_on(void)
 {
-    GPIOG_OUTPUT_VAL |= 0x80;
+    GPIO_SET_BITWISE(GPIOG_OUTPUT_VAL, 0x80);
 #ifdef SANSA_C200
-    GPIOB_OUTPUT_VAL |= 0x10; /* The "menu" backlight */
+    GPIO_SET_BITWISE(GPIOB_OUTPUT_VAL, 0x10); /* The "menu" backlight */
 #endif
 }
 
-void __buttonlight_off(void)
+void _buttonlight_off(void)
 {
-    GPIOG_OUTPUT_VAL &=~ 0x80;
+    GPIO_CLEAR_BITWISE(GPIOG_OUTPUT_VAL, 0x80);
 #ifdef SANSA_C200
-    GPIOB_OUTPUT_VAL &=~ 0x10; /* The "menu" backlight */
+    GPIO_CLEAR_BITWISE(GPIOB_OUTPUT_VAL, 0x10); /* The "menu" backlight */
 #endif
 }
-#endif
diff --git a/firmware/target/arm/sandisk/backlight-target.h b/firmware/target/arm/sandisk/backlight-target.h
index 53a87fbbb3..01573b8403 100644
--- a/firmware/target/arm/sandisk/backlight-target.h
+++ b/firmware/target/arm/sandisk/backlight-target.h
@@ -19,14 +19,12 @@
 #ifndef BACKLIGHT_TARGET_H
 #define BACKLIGHT_TARGET_H
 
-#define __backlight_init() true
-void __backlight_on(void);
-void __backlight_off(void);
-void __backlight_set_brightness(int brightness);
+#define _backlight_init() true
+void _backlight_on(void);
+void _backlight_off(void);
+void _backlight_set_brightness(int brightness);
 int  __backlight_is_on(void);
 
-#ifdef HAVE_BUTTON_LIGHT
-void __buttonlight_on(void);
-void __buttonlight_off(void);
-#endif
+void _buttonlight_on(void);
+void _buttonlight_off(void);
 #endif