From 41b235dacffda5a9970c913de18ad8eea74ab4d0 Mon Sep 17 00:00:00 2001 From: Michael Sevakis Date: Wed, 14 May 2008 20:26:20 +0000 Subject: Fix red. No bother with lcd power management calls in bootloader. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17508 a1c6a512-1295-4272-9138-f99709370657 --- .../target/arm/s3c2440/gigabeat-fx/lcd-meg-fx.c | 2 +- firmware/target/coldfire/iaudio/x5/backlight-x5.c | 23 ++++++++++------------ 2 files changed, 11 insertions(+), 14 deletions(-) (limited to 'firmware/target') diff --git a/firmware/target/arm/s3c2440/gigabeat-fx/lcd-meg-fx.c b/firmware/target/arm/s3c2440/gigabeat-fx/lcd-meg-fx.c index 5c268f42b8..673f76d616 100644 --- a/firmware/target/arm/s3c2440/gigabeat-fx/lcd-meg-fx.c +++ b/firmware/target/arm/s3c2440/gigabeat-fx/lcd-meg-fx.c @@ -40,7 +40,7 @@ extern struct viewport* current_vp; extern void lcd_copy_buffer_rect(fb_data *dst, const fb_data *src, int width, int height); -bool lcd_enabled() +bool lcd_enabled(void) { return lcd_on; } diff --git a/firmware/target/coldfire/iaudio/x5/backlight-x5.c b/firmware/target/coldfire/iaudio/x5/backlight-x5.c index 13ccad5adf..2a5da7615c 100644 --- a/firmware/target/coldfire/iaudio/x5/backlight-x5.c +++ b/firmware/target/coldfire/iaudio/x5/backlight-x5.c @@ -35,9 +35,11 @@ bool _backlight_init(void) void _backlight_on(void) { int level; - lcd_enable(true); -#ifndef BOOTLOADER - _lcd_sleep_timer = 0; /* LCD should be awake already */ +#ifdef HAVE_LCD_SLEEP + backlight_lcd_sleep_countdown(false); /* stop counter */ +#endif +#ifdef HAVE_LCD_ENABLE + lcd_enable(true); /* power on lcd + visible display */ #endif level = disable_irq_save(); pcf50606_write(0x38, 0xb0); /* Backlight ON, GPO1INV=1, GPO1ACT=011 */ @@ -49,16 +51,11 @@ void _backlight_off(void) int level = disable_irq_save(); pcf50606_write(0x38, 0x80); /* Backlight OFF, GPO1INV=1, GPO1ACT=000 */ restore_irq(level); - lcd_enable(false); -#ifndef BOOTLOADER - /* Start LCD sleep countdown */ - if (_lcd_sleep_timeout < 0) - { - _lcd_sleep_timer = 0; /* Setting == Always */ - lcd_sleep(); - } - else - _lcd_sleep_timer = _lcd_sleep_timeout; +#ifdef HAVE_LCD_ENABLE + lcd_enable(false); /* power off visible display */ +#endif +#ifdef HAVE_LCD_SLEEP + backlight_lcd_sleep_countdown(true); /* start countdown */ #endif } -- cgit v1.2.3