diff options
Diffstat (limited to 'firmware/target/arm/s3c2440/gigabeat-fx/backlight-meg-fx.c')
-rw-r--r-- | firmware/target/arm/s3c2440/gigabeat-fx/backlight-meg-fx.c | 16 |
1 files changed, 10 insertions, 6 deletions
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 076c06b0d8..4fb66549cc 100644 --- a/firmware/target/arm/s3c2440/gigabeat-fx/backlight-meg-fx.c +++ b/firmware/target/arm/s3c2440/gigabeat-fx/backlight-meg-fx.c | |||
@@ -314,11 +314,6 @@ static void led_control_service(void) | |||
314 | sc606_control=SC606_CONTROL_IDLE; | 314 | sc606_control=SC606_CONTROL_IDLE; |
315 | break; | 315 | break; |
316 | } | 316 | } |
317 | |||
318 | if(sc606regCONFval&0x03) | ||
319 | lcd_enable(true); | ||
320 | else | ||
321 | lcd_enable(false); | ||
322 | } | 317 | } |
323 | #endif /* BOOTLOADER */ | 318 | #endif /* BOOTLOADER */ |
324 | 319 | ||
@@ -340,13 +335,22 @@ static void __backlight_dim(bool dim_now) | |||
340 | 335 | ||
341 | void _backlight_on(void) | 336 | void _backlight_on(void) |
342 | { | 337 | { |
343 | lcd_enable(true); | 338 | #ifdef HAVE_LCD_SLEEP |
339 | backlight_lcd_sleep_countdown(false); /* stop counter */ | ||
340 | #endif | ||
341 | #ifdef HAVE_LCD_ENABLE | ||
342 | lcd_enable(true); /* power on lcd + visible display */ | ||
343 | #endif | ||
344 | __backlight_dim(false); | 344 | __backlight_dim(false); |
345 | } | 345 | } |
346 | 346 | ||
347 | void _backlight_off(void) | 347 | void _backlight_off(void) |
348 | { | 348 | { |
349 | __backlight_dim(true); | 349 | __backlight_dim(true); |
350 | #ifdef HAVE_LCD_SLEEP | ||
351 | /* Disable lcd after fade completes (when lcd_sleep timeout expires) */ | ||
352 | backlight_lcd_sleep_countdown(true); /* start countdown */ | ||
353 | #endif | ||
350 | } | 354 | } |
351 | 355 | ||
352 | static inline void __buttonlight_on(void) | 356 | static inline void __buttonlight_on(void) |