summaryrefslogtreecommitdiff
path: root/firmware/backlight.c
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/backlight.c
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/backlight.c')
-rw-r--r--firmware/backlight.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/firmware/backlight.c b/firmware/backlight.c
index fe9c215af5..1208973944 100644
--- a/firmware/backlight.c
+++ b/firmware/backlight.c
@@ -48,6 +48,10 @@
48#define BACKLIGHT_FULL_INIT 48#define BACKLIGHT_FULL_INIT
49#endif 49#endif
50 50
51#ifdef HAVE_BACKLIGHT_BRIGHTNESS
52int backlight_brightness = DEFAULT_BRIGHTNESS_SETTING;
53#endif
54
51#ifdef USE_BACKLIGHT_SW_FADING 55#ifdef USE_BACKLIGHT_SW_FADING
52#include "backlight-thread-fading.h" 56#include "backlight-thread-fading.h"
53#endif 57#endif
@@ -139,10 +143,6 @@ static int backlight_timeout_plugged = 5*HZ;
139static int backlight_on_button_hold = 0; 143static int backlight_on_button_hold = 0;
140#endif 144#endif
141 145
142#ifdef HAVE_BACKLIGHT_BRIGHTNESS
143int backlight_brightness = DEFAULT_BRIGHTNESS_SETTING;
144#endif
145
146#ifdef HAVE_BUTTON_LIGHT 146#ifdef HAVE_BUTTON_LIGHT
147static int buttonlight_timer; 147static int buttonlight_timer;
148int _buttonlight_timeout = 5*HZ; 148int _buttonlight_timeout = 5*HZ;
@@ -928,8 +928,8 @@ void backlight_set_brightness(int val)
928 else if (val > MAX_BRIGHTNESS_SETTING) 928 else if (val > MAX_BRIGHTNESS_SETTING)
929 val = MAX_BRIGHTNESS_SETTING; 929 val = MAX_BRIGHTNESS_SETTING;
930 930
931 _backlight_set_brightness(val);
932 backlight_brightness = val; 931 backlight_brightness = val;
932 _backlight_set_brightness(val);
933#ifdef USE_BACKLIGHT_SW_FADING 933#ifdef USE_BACKLIGHT_SW_FADING
934 /* receive backlight brightness */ 934 /* receive backlight brightness */
935 _backlight_fade_update_state(val); 935 _backlight_fade_update_state(val);