Turn backlight ON at boot unless bootloader has already done that.

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

7 files changed, 16 insertions, 8 deletions

diff --git a/firmware/target/arm/gigabeat/meg-fx/backlight-meg-fx.c b/firmware/target/arm/gigabeat/meg-fx/backlight-meg-fx.c
index 5b32c98572..f6a8d31c7b 100644
--- a/firmware/target/arm/gigabeat/meg-fx/backlight-meg-fx.c
+++ b/firmware/target/arm/gigabeat/meg-fx/backlight-meg-fx.c
@@ -113,7 +113,7 @@ unsigned char charging_leds[] = { 0x00, 0x20, 0x38, 0x3C };
 
 
 
-void __backlight_init(void)
+bool __backlight_init(void)
 {
     backlight_control = BACKLIGHT_CONTROL_IDLE;
 
@@ -127,6 +127,8 @@ void __backlight_init(void)
         initial_tick_delay = 2000;
     /* put the led control on the tick list */
     tick_add_task(led_control_service);
+    
+    return true;
 }
 
 
diff --git a/firmware/target/arm/gigabeat/meg-fx/backlight-target.h b/firmware/target/arm/gigabeat/meg-fx/backlight-target.h
index 781fb9647b..5f92cee935 100644
--- a/firmware/target/arm/gigabeat/meg-fx/backlight-target.h
+++ b/firmware/target/arm/gigabeat/meg-fx/backlight-target.h
@@ -76,7 +76,7 @@ void __buttonlight_mode(enum buttonlight_mode mode,
                         unsigned short brightness);
 
 
-void __backlight_init(void);
+bool __backlight_init(void);
 void __backlight_on(void);
 void __backlight_off(void);
 void __backlight_set_brightness(int val);
diff --git a/firmware/target/coldfire/iaudio/x5/backlight-target.h b/firmware/target/coldfire/iaudio/x5/backlight-target.h
index e6feb8bc0c..e70bea08e4 100644
--- a/firmware/target/coldfire/iaudio/x5/backlight-target.h
+++ b/firmware/target/coldfire/iaudio/x5/backlight-target.h
@@ -20,7 +20,7 @@
 #define BACKLIGHT_TARGET_H
 
 #define __BACKLIGHT_INIT
-void __backlight_init(void);
+bool __backlight_init(void);
 void __backlight_on(void);
 void __backlight_off(void);
 void __backlight_set_brightness(int val);
diff --git a/firmware/target/coldfire/iaudio/x5/backlight-x5.c b/firmware/target/coldfire/iaudio/x5/backlight-x5.c
index 9b50993d90..a2682ff1ae 100644
--- a/firmware/target/coldfire/iaudio/x5/backlight-x5.c
+++ b/firmware/target/coldfire/iaudio/x5/backlight-x5.c
@@ -24,10 +24,12 @@
 #include "pcf50606.h"
 #include "lcd.h"
 
-void __backlight_init(void)
+bool __backlight_init(void)
 {
     __backlight_set_brightness(DEFAULT_BRIGHTNESS_SETTING);
     __backlight_on();
+    
+    return true; /* Backlight always ON after boot. */
 }
 
 void __backlight_on(void)
diff --git a/firmware/target/coldfire/iriver/backlight-target.h b/firmware/target/coldfire/iriver/backlight-target.h
index ac146eac83..e653fa1ffb 100644
--- a/firmware/target/coldfire/iriver/backlight-target.h
+++ b/firmware/target/coldfire/iriver/backlight-target.h
@@ -20,7 +20,7 @@
 #define BACKLIGHT_TARGET_H
 
 #define __BACKLIGHT_INIT
-void __backlight_init(void);
+bool __backlight_init(void); /* Returns backlight current state (true=ON). */
 void __backlight_on(void);
 void __backlight_off(void);
 #ifdef HAVE_BACKLIGHT_BRIGHTNESS
diff --git a/firmware/target/coldfire/iriver/h100/backlight-h100.c b/firmware/target/coldfire/iriver/h100/backlight-h100.c
index 62c24dc861..7cff965ff9 100644
--- a/firmware/target/coldfire/iriver/h100/backlight-h100.c
+++ b/firmware/target/coldfire/iriver/h100/backlight-h100.c
@@ -24,11 +24,13 @@
 #include "backlight.h"
 #include "lcd.h"
 
-void __backlight_init(void)
+/* Returns the current state of the backlight (true=ON, false=OFF). */
+bool __backlight_init(void)
 {
     or_l(0x00020000, &GPIO1_ENABLE);
     or_l(0x00020000, &GPIO1_FUNCTION);
-    and_l(~0x00020000, &GPIO1_OUT);  /* Start with the backlight ON */
+    
+    return (GPIO1_OUT & 0x00020000) ? false : true;
 }
 
 void __backlight_on(void)
diff --git a/firmware/target/coldfire/iriver/h300/backlight-h300.c b/firmware/target/coldfire/iriver/h300/backlight-h300.c
index ef1d6d344d..4cec54f0d7 100644
--- a/firmware/target/coldfire/iriver/h300/backlight-h300.c
+++ b/firmware/target/coldfire/iriver/h300/backlight-h300.c
@@ -25,11 +25,13 @@
 #include "pcf50606.h"
 #include "lcd.h"
 
-void __backlight_init(void)
+bool __backlight_init(void)
 {
     or_l(0x00020000, &GPIO1_ENABLE);
     or_l(0x00020000, &GPIO1_FUNCTION);
     or_l(0x00020000, &GPIO1_OUT);  /* Start with the backlight ON */
+    
+    return true; /* Backlight always ON after boot. */
 }
 
 void __backlight_on(void)