diff options
author | Miika Pekkarinen <miipekk@ihme.org> | 2007-01-12 20:26:23 +0000 |
---|---|---|
committer | Miika Pekkarinen <miipekk@ihme.org> | 2007-01-12 20:26:23 +0000 |
commit | 73cd9f3b63718d1fe927e7ef4294ed902e8a1b73 (patch) | |
tree | 82fc91d5a47c267a8a5a1cdd20aa89b2cd65a079 /firmware/target/coldfire | |
parent | 0ea4d3197ed7e56f39c630741cb69152ac9e41de (diff) | |
download | rockbox-73cd9f3b63718d1fe927e7ef4294ed902e8a1b73.tar.gz rockbox-73cd9f3b63718d1fe927e7ef4294ed902e8a1b73.zip |
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
Diffstat (limited to 'firmware/target/coldfire')
5 files changed, 12 insertions, 6 deletions
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 @@ | |||
20 | #define BACKLIGHT_TARGET_H | 20 | #define BACKLIGHT_TARGET_H |
21 | 21 | ||
22 | #define __BACKLIGHT_INIT | 22 | #define __BACKLIGHT_INIT |
23 | void __backlight_init(void); | 23 | bool __backlight_init(void); |
24 | void __backlight_on(void); | 24 | void __backlight_on(void); |
25 | void __backlight_off(void); | 25 | void __backlight_off(void); |
26 | void __backlight_set_brightness(int val); | 26 | 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 @@ | |||
24 | #include "pcf50606.h" | 24 | #include "pcf50606.h" |
25 | #include "lcd.h" | 25 | #include "lcd.h" |
26 | 26 | ||
27 | void __backlight_init(void) | 27 | bool __backlight_init(void) |
28 | { | 28 | { |
29 | __backlight_set_brightness(DEFAULT_BRIGHTNESS_SETTING); | 29 | __backlight_set_brightness(DEFAULT_BRIGHTNESS_SETTING); |
30 | __backlight_on(); | 30 | __backlight_on(); |
31 | |||
32 | return true; /* Backlight always ON after boot. */ | ||
31 | } | 33 | } |
32 | 34 | ||
33 | void __backlight_on(void) | 35 | 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 @@ | |||
20 | #define BACKLIGHT_TARGET_H | 20 | #define BACKLIGHT_TARGET_H |
21 | 21 | ||
22 | #define __BACKLIGHT_INIT | 22 | #define __BACKLIGHT_INIT |
23 | void __backlight_init(void); | 23 | bool __backlight_init(void); /* Returns backlight current state (true=ON). */ |
24 | void __backlight_on(void); | 24 | void __backlight_on(void); |
25 | void __backlight_off(void); | 25 | void __backlight_off(void); |
26 | #ifdef HAVE_BACKLIGHT_BRIGHTNESS | 26 | #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 @@ | |||
24 | #include "backlight.h" | 24 | #include "backlight.h" |
25 | #include "lcd.h" | 25 | #include "lcd.h" |
26 | 26 | ||
27 | void __backlight_init(void) | 27 | /* Returns the current state of the backlight (true=ON, false=OFF). */ |
28 | bool __backlight_init(void) | ||
28 | { | 29 | { |
29 | or_l(0x00020000, &GPIO1_ENABLE); | 30 | or_l(0x00020000, &GPIO1_ENABLE); |
30 | or_l(0x00020000, &GPIO1_FUNCTION); | 31 | or_l(0x00020000, &GPIO1_FUNCTION); |
31 | and_l(~0x00020000, &GPIO1_OUT); /* Start with the backlight ON */ | 32 | |
33 | return (GPIO1_OUT & 0x00020000) ? false : true; | ||
32 | } | 34 | } |
33 | 35 | ||
34 | void __backlight_on(void) | 36 | 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 @@ | |||
25 | #include "pcf50606.h" | 25 | #include "pcf50606.h" |
26 | #include "lcd.h" | 26 | #include "lcd.h" |
27 | 27 | ||
28 | void __backlight_init(void) | 28 | bool __backlight_init(void) |
29 | { | 29 | { |
30 | or_l(0x00020000, &GPIO1_ENABLE); | 30 | or_l(0x00020000, &GPIO1_ENABLE); |
31 | or_l(0x00020000, &GPIO1_FUNCTION); | 31 | or_l(0x00020000, &GPIO1_FUNCTION); |
32 | or_l(0x00020000, &GPIO1_OUT); /* Start with the backlight ON */ | 32 | or_l(0x00020000, &GPIO1_OUT); /* Start with the backlight ON */ |
33 | |||
34 | return true; /* Backlight always ON after boot. */ | ||
33 | } | 35 | } |
34 | 36 | ||
35 | void __backlight_on(void) | 37 | void __backlight_on(void) |