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, 18 insertions, 9 deletions

diff --git a/firmware/target/arm/iriver/backlight-target.h b/firmware/target/arm/iriver/backlight-target.h
index f4e34cb53a..0a9fa26ce4 100644
--- a/firmware/target/arm/iriver/backlight-target.h
+++ b/firmware/target/arm/iriver/backlight-target.h
@@ -19,8 +19,8 @@
 #ifndef BACKLIGHT_TARGET_H
 #define BACKLIGHT_TARGET_H
 
-#define __backlight_init() true
-void __backlight_on(void);
-void __backlight_off(void);
+#define _backlight_init() true
+void _backlight_on(void);
+void _backlight_off(void);
 
 #endif
diff --git a/firmware/target/arm/iriver/h10/backlight-h10.c b/firmware/target/arm/iriver/h10/backlight-h10.c
index db3e0b8877..8033aebf71 100644
--- a/firmware/target/arm/iriver/h10/backlight-h10.c
+++ b/firmware/target/arm/iriver/h10/backlight-h10.c
@@ -22,18 +22,27 @@
 #include "backlight.h"
 #include "lcd.h"
 
-void __backlight_on(void)
+void _backlight_on(void)
 {
-#if (CONFIG_LCD == LCD_H10_20GB)
+#ifdef HAVE_LCD_SLEEP
     lcd_enable(true);
+    _lcd_sleep_timer = 0;
 #endif
-    GPIOL_OUTPUT_VAL |= 0x20;
+    GPIO_SET_BITWISE(GPIOL_OUTPUT_VAL, 0x20);
 }
 
-void __backlight_off(void)
+void _backlight_off(void)
 {
-    GPIOL_OUTPUT_VAL &=~ 0x20;
-#if (CONFIG_LCD == LCD_H10_20GB)
+    GPIO_CLEAR_BITWISE(GPIOL_OUTPUT_VAL, 0x20);
+#ifdef HAVE_LCD_SLEEP
     lcd_enable(false);
+    /* 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
 }