diff options
Diffstat (limited to 'firmware/backlight.c')
-rw-r--r-- | firmware/backlight.c | 19 |
1 files changed, 12 insertions, 7 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; |