diff options
author | Thomas Martitz <kugel@rockbox.org> | 2009-04-25 18:15:50 +0000 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2009-04-25 18:15:50 +0000 |
commit | 0017dfbe8291142aefa832cf6c34e039376b826d (patch) | |
tree | 7b5feb594436247667669577ba4605a07de80fd1 /firmware | |
parent | 67fb5415f78a3198030a6285d1ccc641044f149b (diff) | |
download | rockbox-0017dfbe8291142aefa832cf6c34e039376b826d.tar.gz rockbox-0017dfbe8291142aefa832cf6c34e039376b826d.zip |
Rename _buttonlight_timeout and use a function call instead of extern'ing buttonlight_timeout to be more inline with backlight, and use a #define instead of a const variable for !HAVE_LCD_SLEEP_SETTING (no functional changes)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20784 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/backlight.c | 19 | ||||
-rw-r--r-- | firmware/export/backlight.h | 2 | ||||
-rw-r--r-- | firmware/target/arm/s3c2440/gigabeat-fx/backlight-meg-fx.c | 2 |
3 files changed, 14 insertions, 9 deletions
diff --git a/firmware/backlight.c b/firmware/backlight.c index 283958f8ca..2d9c963cab 100644 --- a/firmware/backlight.c +++ b/firmware/backlight.c | |||
@@ -49,9 +49,6 @@ | |||
49 | #define BACKLIGHT_FULL_INIT | 49 | #define BACKLIGHT_FULL_INIT |
50 | #endif | 50 | #endif |
51 | 51 | ||
52 | #ifdef HAVE_BACKLIGHT_BRIGHTNESS | ||
53 | int backlight_brightness = DEFAULT_BRIGHTNESS_SETTING; | ||
54 | #endif | ||
55 | 52 | ||
56 | #if (CONFIG_BACKLIGHT_FADING == BACKLIGHT_FADING_SW_SETTING) \ | 53 | #if (CONFIG_BACKLIGHT_FADING == BACKLIGHT_FADING_SW_SETTING) \ |
57 | || (CONFIG_BACKLIGHT_FADING == BACKLIGHT_FADING_SW_HW_REG) | 54 | || (CONFIG_BACKLIGHT_FADING == BACKLIGHT_FADING_SW_HW_REG) |
@@ -135,6 +132,9 @@ static struct event_queue backlight_queue; | |||
135 | static unsigned int backlight_thread_id = 0; | 132 | static unsigned int backlight_thread_id = 0; |
136 | #endif | 133 | #endif |
137 | 134 | ||
135 | #ifdef HAVE_BACKLIGHT_BRIGHTNESS | ||
136 | int backlight_brightness = DEFAULT_BRIGHTNESS_SETTING; | ||
137 | #endif | ||
138 | static int backlight_timer SHAREDBSS_ATTR; | 138 | static int backlight_timer SHAREDBSS_ATTR; |
139 | static int backlight_timeout SHAREDBSS_ATTR; | 139 | static int backlight_timeout SHAREDBSS_ATTR; |
140 | static int backlight_timeout_normal = 5*HZ; | 140 | static int backlight_timeout_normal = 5*HZ; |
@@ -147,12 +147,12 @@ static int backlight_on_button_hold = 0; | |||
147 | 147 | ||
148 | #ifdef HAVE_BUTTON_LIGHT | 148 | #ifdef HAVE_BUTTON_LIGHT |
149 | static int buttonlight_timer; | 149 | static int buttonlight_timer; |
150 | int _buttonlight_timeout = 5*HZ; | 150 | static int buttonlight_timeout = 5*HZ; |
151 | 151 | ||
152 | /* Update state of buttonlight according to timeout setting */ | 152 | /* Update state of buttonlight according to timeout setting */ |
153 | static void buttonlight_update_state(void) | 153 | static void buttonlight_update_state(void) |
154 | { | 154 | { |
155 | buttonlight_timer = _buttonlight_timeout; | 155 | buttonlight_timer = buttonlight_timeout; |
156 | 156 | ||
157 | /* Buttonlight == OFF in the setting? */ | 157 | /* Buttonlight == OFF in the setting? */ |
158 | if (buttonlight_timer < 0) | 158 | if (buttonlight_timer < 0) |
@@ -178,10 +178,15 @@ void buttonlight_off(void) | |||
178 | 178 | ||
179 | void buttonlight_set_timeout(int value) | 179 | void buttonlight_set_timeout(int value) |
180 | { | 180 | { |
181 | _buttonlight_timeout = HZ * value; | 181 | buttonlight_timeout = HZ * value; |
182 | queue_post(&backlight_queue, BUTTON_LIGHT_TMO_CHANGED, 0); | 182 | queue_post(&backlight_queue, BUTTON_LIGHT_TMO_CHANGED, 0); |
183 | } | 183 | } |
184 | 184 | ||
185 | int buttonlight_get_current_timeout(void) | ||
186 | { | ||
187 | return buttonlight_timeout; | ||
188 | } | ||
189 | |||
185 | #endif /* HAVE_BUTTON_LIGHT */ | 190 | #endif /* HAVE_BUTTON_LIGHT */ |
186 | 191 | ||
187 | #ifdef HAVE_REMOTE_LCD | 192 | #ifdef HAVE_REMOTE_LCD |
@@ -205,7 +210,7 @@ const signed char lcd_sleep_timeout_value[10] = | |||
205 | static int lcd_sleep_timeout = 10*HZ; | 210 | static int lcd_sleep_timeout = 10*HZ; |
206 | #else | 211 | #else |
207 | /* Target defines needed value */ | 212 | /* Target defines needed value */ |
208 | static const int lcd_sleep_timeout = LCD_SLEEP_TIMEOUT; | 213 | #define lcd_sleep_timeout LCD_SLEEP_TIMEOUT |
209 | #endif | 214 | #endif |
210 | 215 | ||
211 | static int lcd_sleep_timer SHAREDDATA_ATTR = 0; | 216 | static int lcd_sleep_timer SHAREDDATA_ATTR = 0; |
diff --git a/firmware/export/backlight.h b/firmware/export/backlight.h index f215e0faea..ad06a670e1 100644 --- a/firmware/export/backlight.h +++ b/firmware/export/backlight.h | |||
@@ -95,7 +95,7 @@ void buttonlight_set_timeout(int value); | |||
95 | 95 | ||
96 | /* Private API for use in target tree backlight code only */ | 96 | /* Private API for use in target tree backlight code only */ |
97 | #ifdef HAVE_BUTTON_LIGHT | 97 | #ifdef HAVE_BUTTON_LIGHT |
98 | extern int _buttonlight_timeout; | 98 | int buttonlight_get_current_timeout(void); |
99 | #endif | 99 | #endif |
100 | 100 | ||
101 | #endif /* BACKLIGHT_H */ | 101 | #endif /* BACKLIGHT_H */ |
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 2d8fad5555..b38f18d4f9 100644 --- a/firmware/target/arm/s3c2440/gigabeat-fx/backlight-meg-fx.c +++ b/firmware/target/arm/s3c2440/gigabeat-fx/backlight-meg-fx.c | |||
@@ -388,7 +388,7 @@ void _buttonlight_on(void) | |||
388 | void _buttonlight_off(void) | 388 | void _buttonlight_off(void) |
389 | { | 389 | { |
390 | #ifndef BOOTLOADER | 390 | #ifndef BOOTLOADER |
391 | if(_buttonlight_timeout>0) | 391 | if(buttonlight_get_current_timeout() > 0) |
392 | __buttonlight_dim(true); | 392 | __buttonlight_dim(true); |
393 | else | 393 | else |
394 | #endif | 394 | #endif |