diff options
Diffstat (limited to 'firmware/target/coldfire/mpio')
-rw-r--r-- | firmware/target/coldfire/mpio/backlight-mpio.c | 14 | ||||
-rw-r--r-- | firmware/target/coldfire/mpio/backlight-target.h | 5 |
2 files changed, 7 insertions, 12 deletions
diff --git a/firmware/target/coldfire/mpio/backlight-mpio.c b/firmware/target/coldfire/mpio/backlight-mpio.c index e04fa6d7dc..9d8186beed 100644 --- a/firmware/target/coldfire/mpio/backlight-mpio.c +++ b/firmware/target/coldfire/mpio/backlight-mpio.c | |||
@@ -27,7 +27,7 @@ | |||
27 | #include "backlight-target.h" | 27 | #include "backlight-target.h" |
28 | #include "lcd.h" | 28 | #include "lcd.h" |
29 | 29 | ||
30 | static bool backlight_hw_on = true; | 30 | static bool _backlight_on = true; |
31 | static int _brightness = DEFAULT_BRIGHTNESS_SETTING; | 31 | static int _brightness = DEFAULT_BRIGHTNESS_SETTING; |
32 | 32 | ||
33 | /* Returns the current state of the backlight (true=ON, false=OFF). */ | 33 | /* Returns the current state of the backlight (true=ON, false=OFF). */ |
@@ -41,23 +41,23 @@ bool backlight_hw_init(void) | |||
41 | return true; | 41 | return true; |
42 | } | 42 | } |
43 | 43 | ||
44 | void _backlight_hw_on(void) | 44 | void backlight_hw_on(void) |
45 | { | 45 | { |
46 | #ifndef BOOTLOADER | 46 | #ifndef BOOTLOADER |
47 | if (backlight_hw_on) | 47 | if (_backlight_on) |
48 | return; | 48 | return; |
49 | #endif | 49 | #endif |
50 | 50 | ||
51 | backlight_hw_brightness(_brightness); | 51 | backlight_hw_brightness(_brightness); |
52 | backlight_hw_on = true; | 52 | _backlight_on = true; |
53 | 53 | ||
54 | } | 54 | } |
55 | 55 | ||
56 | void _backlight_hw_off(void) | 56 | void backlight_hw_off(void) |
57 | { | 57 | { |
58 | /* GPIO28 low */ | 58 | /* GPIO28 low */ |
59 | and_l(~(1<<28),&GPIO_OUT); | 59 | and_l(~(1<<28),&GPIO_OUT); |
60 | backlight_hw_on = false; | 60 | _backlight_on = false; |
61 | } | 61 | } |
62 | 62 | ||
63 | void backlight_hw_brightness(int val) | 63 | void backlight_hw_brightness(int val) |
@@ -65,7 +65,7 @@ void backlight_hw_brightness(int val) | |||
65 | unsigned char i; | 65 | unsigned char i; |
66 | 66 | ||
67 | #ifndef BOOTLOADER | 67 | #ifndef BOOTLOADER |
68 | if( _brightness == val && backlight_hw_on == true ) | 68 | if( _brightness == val && _backlight_on == true ) |
69 | return; | 69 | return; |
70 | #endif | 70 | #endif |
71 | 71 | ||
diff --git a/firmware/target/coldfire/mpio/backlight-target.h b/firmware/target/coldfire/mpio/backlight-target.h index b73bf27c89..12a3e7a225 100644 --- a/firmware/target/coldfire/mpio/backlight-target.h +++ b/firmware/target/coldfire/mpio/backlight-target.h | |||
@@ -25,9 +25,4 @@ bool backlight_hw_init(void); /* Returns backlight current state (true=ON). */ | |||
25 | void backlight_hw_on(void); | 25 | void backlight_hw_on(void); |
26 | void backlight_hw_off(void); | 26 | void backlight_hw_off(void); |
27 | void backlight_hw_brightness(int val); | 27 | void backlight_hw_brightness(int val); |
28 | |||
29 | #define backlight_hw_on_isr() backlight_hw_on() | ||
30 | #define backlight_hw_off_isr() backlight_hw_off() | ||
31 | #define backlight_hw_on_normal() backlight_hw_on() | ||
32 | #define backlight_hw_off_normal() backlight_hw_off() | ||
33 | #endif | 28 | #endif |