diff options
Diffstat (limited to 'firmware/target/arm')
-rw-r--r-- | firmware/target/arm/as3525/backlight-e200v2-fuze.c | 4 | ||||
-rw-r--r-- | firmware/target/arm/as3525/sansa-fuze/backlight-target.h | 1 | ||||
-rw-r--r-- | firmware/target/arm/s3c2440/gigabeat-fx/backlight-meg-fx.c | 9 |
3 files changed, 1 insertions, 13 deletions
diff --git a/firmware/target/arm/as3525/backlight-e200v2-fuze.c b/firmware/target/arm/as3525/backlight-e200v2-fuze.c index 2b724b34a3..2c0aad27ab 100644 --- a/firmware/target/arm/as3525/backlight-e200v2-fuze.c +++ b/firmware/target/arm/as3525/backlight-e200v2-fuze.c | |||
@@ -26,12 +26,8 @@ | |||
26 | #include "ascodec-target.h" | 26 | #include "ascodec-target.h" |
27 | #include "as3514.h" | 27 | #include "as3514.h" |
28 | 28 | ||
29 | static unsigned short backlight_brightness = DEFAULT_BRIGHTNESS_SETTING; | ||
30 | |||
31 | void _backlight_set_brightness(int brightness) | 29 | void _backlight_set_brightness(int brightness) |
32 | { | 30 | { |
33 | backlight_brightness = brightness; | ||
34 | |||
35 | if (brightness > 0) | 31 | if (brightness > 0) |
36 | _backlight_on(); | 32 | _backlight_on(); |
37 | else | 33 | else |
diff --git a/firmware/target/arm/as3525/sansa-fuze/backlight-target.h b/firmware/target/arm/as3525/sansa-fuze/backlight-target.h index ddaa7f2094..2d60ac35c2 100644 --- a/firmware/target/arm/as3525/sansa-fuze/backlight-target.h +++ b/firmware/target/arm/as3525/sansa-fuze/backlight-target.h | |||
@@ -25,7 +25,6 @@ | |||
25 | void _backlight_on(void); | 25 | void _backlight_on(void); |
26 | void _backlight_off(void); | 26 | void _backlight_off(void); |
27 | void _backlight_set_brightness(int brightness); | 27 | void _backlight_set_brightness(int brightness); |
28 | int __backlight_is_on(void); | ||
29 | #ifdef HAVE_BUTTON_LIGHT | 28 | #ifdef HAVE_BUTTON_LIGHT |
30 | void _buttonlight_on(void); | 29 | void _buttonlight_on(void); |
31 | void _buttonlight_off(void); | 30 | void _buttonlight_off(void); |
diff --git a/firmware/target/arm/s3c2440/gigabeat-fx/backlight-meg-fx.c b/firmware/target/arm/s3c2440/gigabeat-fx/backlight-meg-fx.c index 77f5286da6..9864cf1f99 100644 --- a/firmware/target/arm/s3c2440/gigabeat-fx/backlight-meg-fx.c +++ b/firmware/target/arm/s3c2440/gigabeat-fx/backlight-meg-fx.c | |||
@@ -63,8 +63,6 @@ enum buttonlight_states | |||
63 | BUTTONLIGHT_CONTROL_FADE, | 63 | BUTTONLIGHT_CONTROL_FADE, |
64 | } buttonlight_control; | 64 | } buttonlight_control; |
65 | 65 | ||
66 | |||
67 | static unsigned char backlight_brightness; | ||
68 | static unsigned char buttonlight_brightness; | 66 | static unsigned char buttonlight_brightness; |
69 | static unsigned char backlight_target; | 67 | static unsigned char backlight_target; |
70 | static unsigned char buttonlight_target; | 68 | static unsigned char buttonlight_target; |
@@ -74,11 +72,6 @@ static unsigned short buttonlight_trigger_now; | |||
74 | /* Assumes that the backlight has been initialized */ | 72 | /* Assumes that the backlight has been initialized */ |
75 | void _backlight_set_brightness(int brightness) | 73 | void _backlight_set_brightness(int brightness) |
76 | { | 74 | { |
77 | /* clamp the brightness value */ | ||
78 | brightness = MAX(1, MIN(12, brightness)); | ||
79 | /* stop the interrupt from messing us up */ | ||
80 | backlight_control = BACKLIGHT_CONTROL_IDLE; | ||
81 | backlight_brightness = log_brightness[brightness - 1]; | ||
82 | backlight_control = BACKLIGHT_CONTROL_SET; | 75 | backlight_control = BACKLIGHT_CONTROL_SET; |
83 | } | 76 | } |
84 | 77 | ||
@@ -160,7 +153,7 @@ static void led_control_service(void) | |||
160 | if(!(sc606regCONFval&0x03)) | 153 | if(!(sc606regCONFval&0x03)) |
161 | break; | 154 | break; |
162 | sc606_changed=true; | 155 | sc606_changed=true; |
163 | sc606regAval=backlight_brightness; | 156 | sc606regAval=log_brightness[backlight_brightness - 1]; |
164 | backlight_control = BACKLIGHT_CONTROL_IDLE; | 157 | backlight_control = BACKLIGHT_CONTROL_IDLE; |
165 | break; | 158 | break; |
166 | case BACKLIGHT_CONTROL_FADE: | 159 | case BACKLIGHT_CONTROL_FADE: |