summaryrefslogtreecommitdiff
path: root/firmware/target
diff options
context:
space:
mode:
authorSteve Bavin <pondlife@pondlife.me>2008-11-26 10:21:03 +0000
committerSteve Bavin <pondlife@pondlife.me>2008-11-26 10:21:03 +0000
commitb70f57502370b5d91e557e61ec23de95d8e027a9 (patch)
tree52dace1509fc7e547c0d6da27def523ac4e3a06e /firmware/target
parent28f06901f74d8574ea0de00a143cbda08326d9f7 (diff)
downloadrockbox-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')
-rw-r--r--firmware/target/arm/as3525/backlight-e200v2-fuze.c4
-rw-r--r--firmware/target/arm/as3525/sansa-fuze/backlight-target.h1
-rw-r--r--firmware/target/arm/s3c2440/gigabeat-fx/backlight-meg-fx.c9
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
29static unsigned short backlight_brightness = DEFAULT_BRIGHTNESS_SETTING;
30
31void _backlight_set_brightness(int brightness) 29void _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 @@
25void _backlight_on(void); 25void _backlight_on(void);
26void _backlight_off(void); 26void _backlight_off(void);
27void _backlight_set_brightness(int brightness); 27void _backlight_set_brightness(int brightness);
28int __backlight_is_on(void);
29#ifdef HAVE_BUTTON_LIGHT 28#ifdef HAVE_BUTTON_LIGHT
30void _buttonlight_on(void); 29void _buttonlight_on(void);
31void _buttonlight_off(void); 30void _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
67static unsigned char backlight_brightness;
68static unsigned char buttonlight_brightness; 66static unsigned char buttonlight_brightness;
69static unsigned char backlight_target; 67static unsigned char backlight_target;
70static unsigned char buttonlight_target; 68static 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 */
75void _backlight_set_brightness(int brightness) 73void _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: