diff options
Diffstat (limited to 'firmware/target')
6 files changed, 25 insertions, 9 deletions
diff --git a/firmware/target/coldfire/iaudio/x5/backlight-target.h b/firmware/target/coldfire/iaudio/x5/backlight-target.h index e982e656d6..e6feb8bc0c 100755 --- a/firmware/target/coldfire/iaudio/x5/backlight-target.h +++ b/firmware/target/coldfire/iaudio/x5/backlight-target.h | |||
@@ -19,6 +19,8 @@ | |||
19 | #ifndef BACKLIGHT_TARGET_H | 19 | #ifndef BACKLIGHT_TARGET_H |
20 | #define BACKLIGHT_TARGET_H | 20 | #define BACKLIGHT_TARGET_H |
21 | 21 | ||
22 | #define __BACKLIGHT_INIT | ||
23 | void __backlight_init(void); | ||
22 | void __backlight_on(void); | 24 | void __backlight_on(void); |
23 | void __backlight_off(void); | 25 | void __backlight_off(void); |
24 | 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 9d02c35988..9b50993d90 100755 --- a/firmware/target/coldfire/iaudio/x5/backlight-x5.c +++ b/firmware/target/coldfire/iaudio/x5/backlight-x5.c | |||
@@ -20,9 +20,16 @@ | |||
20 | #include "cpu.h" | 20 | #include "cpu.h" |
21 | #include "system.h" | 21 | #include "system.h" |
22 | #include "backlight.h" | 22 | #include "backlight.h" |
23 | #include "backlight-target.h" | ||
23 | #include "pcf50606.h" | 24 | #include "pcf50606.h" |
24 | #include "lcd.h" | 25 | #include "lcd.h" |
25 | 26 | ||
27 | void __backlight_init(void) | ||
28 | { | ||
29 | __backlight_set_brightness(DEFAULT_BRIGHTNESS_SETTING); | ||
30 | __backlight_on(); | ||
31 | } | ||
32 | |||
26 | void __backlight_on(void) | 33 | void __backlight_on(void) |
27 | { | 34 | { |
28 | int level; | 35 | int level; |
diff --git a/firmware/target/coldfire/iaudio/x5/pcf50606-x5.c b/firmware/target/coldfire/iaudio/x5/pcf50606-x5.c index 59140667ef..b8128617c2 100644 --- a/firmware/target/coldfire/iaudio/x5/pcf50606-x5.c +++ b/firmware/target/coldfire/iaudio/x5/pcf50606-x5.c | |||
@@ -81,15 +81,6 @@ void pcf50606_init(void) | |||
81 | pcf50606_write(0x39, 0x00); /* GPOOD0 = green led OFF */ | 81 | pcf50606_write(0x39, 0x00); /* GPOOD0 = green led OFF */ |
82 | pcf50606_write(0x3a, 0x00); /* GPOOD1 = red led OFF */ | 82 | pcf50606_write(0x3a, 0x00); /* GPOOD1 = red led OFF */ |
83 | 83 | ||
84 | pcf50606_write(0x35, 0x11); /* Backlight PWM = 512Hz, 8/16, Active */ | ||
85 | #ifdef BOOTLOADER | ||
86 | /* Backlight starts OFF in bootloader */ | ||
87 | pcf50606_write(0x38, 0x80); /* Backlight OFF, GPO1INV=1, GPO1ACT=011 */ | ||
88 | #else | ||
89 | /* Keep backlight on when changing to firmware */ | ||
90 | pcf50606_write(0x38, 0xb0); /* Backlight ON, GPO1INV=1, GPO1ACT=011 */ | ||
91 | #endif | ||
92 | |||
93 | /* Accessory detect */ | 84 | /* Accessory detect */ |
94 | pcf50606_write(0x33, 0x8e); /* ACDAPE=1, THRSHLD=2.40V */ | 85 | pcf50606_write(0x33, 0x8e); /* ACDAPE=1, THRSHLD=2.40V */ |
95 | 86 | ||
diff --git a/firmware/target/coldfire/iriver/backlight-target.h b/firmware/target/coldfire/iriver/backlight-target.h index 086ab02761..ac146eac83 100644 --- a/firmware/target/coldfire/iriver/backlight-target.h +++ b/firmware/target/coldfire/iriver/backlight-target.h | |||
@@ -19,6 +19,8 @@ | |||
19 | #ifndef BACKLIGHT_TARGET_H | 19 | #ifndef BACKLIGHT_TARGET_H |
20 | #define BACKLIGHT_TARGET_H | 20 | #define BACKLIGHT_TARGET_H |
21 | 21 | ||
22 | #define __BACKLIGHT_INIT | ||
23 | void __backlight_init(void); | ||
22 | void __backlight_on(void); | 24 | void __backlight_on(void); |
23 | void __backlight_off(void); | 25 | void __backlight_off(void); |
24 | #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 8ceac8a6ff..62c24dc861 100644 --- a/firmware/target/coldfire/iriver/h100/backlight-h100.c +++ b/firmware/target/coldfire/iriver/h100/backlight-h100.c | |||
@@ -24,6 +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) | ||
28 | { | ||
29 | or_l(0x00020000, &GPIO1_ENABLE); | ||
30 | or_l(0x00020000, &GPIO1_FUNCTION); | ||
31 | and_l(~0x00020000, &GPIO1_OUT); /* Start with the backlight ON */ | ||
32 | } | ||
33 | |||
27 | void __backlight_on(void) | 34 | void __backlight_on(void) |
28 | { | 35 | { |
29 | and_l(~0x00020000, &GPIO1_OUT); | 36 | and_l(~0x00020000, &GPIO1_OUT); |
diff --git a/firmware/target/coldfire/iriver/h300/backlight-h300.c b/firmware/target/coldfire/iriver/h300/backlight-h300.c index 50bd757612..ef1d6d344d 100644 --- a/firmware/target/coldfire/iriver/h300/backlight-h300.c +++ b/firmware/target/coldfire/iriver/h300/backlight-h300.c | |||
@@ -25,6 +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) | ||
29 | { | ||
30 | or_l(0x00020000, &GPIO1_ENABLE); | ||
31 | or_l(0x00020000, &GPIO1_FUNCTION); | ||
32 | or_l(0x00020000, &GPIO1_OUT); /* Start with the backlight ON */ | ||
33 | } | ||
34 | |||
28 | void __backlight_on(void) | 35 | void __backlight_on(void) |
29 | { | 36 | { |
30 | lcd_enable(true); | 37 | lcd_enable(true); |