1
0
Fork 0
forked from len0rd/rockbox

Make lcd_set_enable_hook() conditional on HAVE_LCD_ENABLE and HAVE_LCD_COLOR

This prepares for the Clip which will define HAVE_LCD_ENABLE but won't
need the hook since the internal LCD framebuffer is updated regardless
if the display is on or off.

firmware/drivers/lcd-16bit.c has not been modified since HAVE_LCD_COLOR
is obviously defined here

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18951 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Rafaël Carré 2008-10-31 21:48:44 +00:00
parent 19d1cacb1a
commit ee593c95e2
6 changed files with 13 additions and 9 deletions

View file

@ -612,11 +612,11 @@ static void wvs_backlight_on_video_mode(bool video_on)
/* Turn off backlight timeout */
/* backlight control in lib/helper.c */
backlight_force_on(rb);
#ifdef HAVE_LCD_ENABLE
#if defined(HAVE_LCD_ENABLE) && defined(HAVE_LCD_COLOR)
rb->lcd_set_enable_hook(NULL);
#endif
} else {
#ifdef HAVE_LCD_ENABLE
#if defined(HAVE_LCD_ENABLE) && defined(HAVE_LCD_COLOR)
rb->lcd_set_enable_hook(wvs_lcd_enable_hook);
#endif
/* Revert to user's backlight settings */
@ -1605,7 +1605,7 @@ static void button_loop(void)
wvs_stop();
#ifdef HAVE_LCD_ENABLE
#if defined(HAVE_LCD_ENABLE) && defined(HAVE_LCD_COLOR)
/* Be sure hook is removed before exiting since the stop will put it
* back because of the backlight restore. */
rb->lcd_set_enable_hook(NULL);