diff options
author | Steve Bavin <pondlife@pondlife.me> | 2008-11-26 10:21:03 +0000 |
---|---|---|
committer | Steve Bavin <pondlife@pondlife.me> | 2008-11-26 10:21:03 +0000 |
commit | b70f57502370b5d91e557e61ec23de95d8e027a9 (patch) | |
tree | 52dace1509fc7e547c0d6da27def523ac4e3a06e /firmware/target/arm/s3c2440/gigabeat-fx/backlight-meg-fx.c | |
parent | 28f06901f74d8574ea0de00a143cbda08326d9f7 (diff) | |
download | rockbox-b70f57502370b5d91e557e61ec23de95d8e027a9.tar.gz rockbox-b70f57502370b5d91e557e61ec23de95d8e027a9.zip |
Fix reds. Also note my r19221 commit message had a typo - shoudld have been e200/c200, not e100.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19224 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/target/arm/s3c2440/gigabeat-fx/backlight-meg-fx.c')
-rw-r--r-- | firmware/target/arm/s3c2440/gigabeat-fx/backlight-meg-fx.c | 9 |
1 files changed, 1 insertions, 8 deletions
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: |