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 | |
| parent | 28f06901f74d8574ea0de00a143cbda08326d9f7 (diff) | |
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')
| -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 @@ #include "ascodec-target.h" #include "as3514.h" -static unsigned short backlight_brightness = DEFAULT_BRIGHTNESS_SETTING; - void _backlight_set_brightness(int brightness) { - backlight_brightness = brightness; - if (brightness > 0) _backlight_on(); 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 @@ void _backlight_on(void); void _backlight_off(void); void _backlight_set_brightness(int brightness); -int __backlight_is_on(void); #ifdef HAVE_BUTTON_LIGHT void _buttonlight_on(void); 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 BUTTONLIGHT_CONTROL_FADE, } buttonlight_control; - -static unsigned char backlight_brightness; static unsigned char buttonlight_brightness; static unsigned char backlight_target; static unsigned char buttonlight_target; @@ -74,11 +72,6 @@ static unsigned short buttonlight_trigger_now; /* Assumes that the backlight has been initialized */ void _backlight_set_brightness(int brightness) { - /* clamp the brightness value */ - brightness = MAX(1, MIN(12, brightness)); - /* stop the interrupt from messing us up */ - backlight_control = BACKLIGHT_CONTROL_IDLE; - backlight_brightness = log_brightness[brightness - 1]; backlight_control = BACKLIGHT_CONTROL_SET; } @@ -160,7 +153,7 @@ static void led_control_service(void) if(!(sc606regCONFval&0x03)) break; sc606_changed=true; - sc606regAval=backlight_brightness; + sc606regAval=log_brightness[backlight_brightness - 1]; backlight_control = BACKLIGHT_CONTROL_IDLE; break; case BACKLIGHT_CONTROL_FADE: |