summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Leonhardt <sebastian.leonhardt@web.de>2019-02-07 23:31:38 +0100
committerSebastian Leonhardt <sebastian.leonhardt@web.de>2019-02-08 00:04:20 +0100
commit26e0c64e34f05d3869a7e5e26d7dd388888fa72e (patch)
tree3c3a1f45740aec48d356887b7a28462fae4dcbe7
parente662ae4e9e6feb754a909691847e76544282f319 (diff)
downloadrockbox-26e0c64e34f05d3869a7e5e26d7dd388888fa72e.tar.gz
rockbox-26e0c64e34f05d3869a7e5e26d7dd388888fa72e.tar.bz2
rockbox-26e0c64e34f05d3869a7e5e26d7dd388888fa72e.zip
Fix red and remove duplicated function declaration
Change-Id: I5fed7fdad077eedfc1e36fbd9e1669f11b90288d
-rw-r--r--firmware/export/backlight.h4
-rw-r--r--firmware/target/hosted/sdl/lcd-bitmap.c2
-rw-r--r--uisimulator/common/lcd-common.c6
3 files changed, 6 insertions, 6 deletions
diff --git a/firmware/export/backlight.h b/firmware/export/backlight.h
index 326de4ce28..6d029790b3 100644
--- a/firmware/export/backlight.h
+++ b/firmware/export/backlight.h
@@ -64,10 +64,6 @@ void lcd_set_sleep_after_backlight_off(int timeout_seconds);
void lcd_awake(void);
#endif
-#ifdef HAVE_LCD_SLEEP
-void lcd_awake(void);
-#endif
-
#else /* !HAVE_BACKLIGHT */
#define backlight_init()
#endif /* !HAVE_BACKLIGHT */
diff --git a/firmware/target/hosted/sdl/lcd-bitmap.c b/firmware/target/hosted/sdl/lcd-bitmap.c
index aefbb17b42..0453435c09 100644
--- a/firmware/target/hosted/sdl/lcd-bitmap.c
+++ b/firmware/target/hosted/sdl/lcd-bitmap.c
@@ -162,7 +162,7 @@ void sim_backlight(int value)
#endif
}
#else /* LCD_DEPTH > 8 */
-#ifdef HAVE_TRANSFLECTIVE_LCD
+#if defined(HAVE_TRANSFLECTIVE_LCD ) && defined(HAVE_LCD_SLEEP)
if (!lcd_active())
SDL_SetAlpha(lcd_surface, SDL_SRCALPHA, 0);
else
diff --git a/uisimulator/common/lcd-common.c b/uisimulator/common/lcd-common.c
index 9e01f3eda6..c33e058858 100644
--- a/uisimulator/common/lcd-common.c
+++ b/uisimulator/common/lcd-common.c
@@ -26,6 +26,10 @@
#include "config.h"
#include "system.h"
#include "lcd.h"
+#if defined(HAVE_TRANSFLECTIVE_LCD) && defined(HAVE_LCD_ENABLE)
+/* in uisimulator/sdl/lcd-bitmap.c and lcd-charcell.c */
+extern void sim_backlight(int value);
+#endif
#ifdef HAVE_LCD_ENABLE
static bool lcd_enabled = false;
@@ -78,7 +82,7 @@ void lcd_remote_set_invert_display(bool invert)
void lcd_sleep(void)
{
lcd_sleeping = true;
-#ifdef HAVE_TRANSFLECTIVE_LCD
+#if defined(HAVE_TRANSFLECTIVE_LCD) && defined(HAVE_LCD_ENABLE)
sim_backlight(0); /* completely blacken the screen */
#endif
}