diff options
author | Sebastian Leonhardt <sebastian.leonhardt@web.de> | 2019-02-07 23:31:38 +0100 |
---|---|---|
committer | Sebastian Leonhardt <sebastian.leonhardt@web.de> | 2019-02-08 00:04:20 +0100 |
commit | 26e0c64e34f05d3869a7e5e26d7dd388888fa72e (patch) | |
tree | 3c3a1f45740aec48d356887b7a28462fae4dcbe7 | |
parent | e662ae4e9e6feb754a909691847e76544282f319 (diff) | |
download | rockbox-26e0c64e34f05d3869a7e5e26d7dd388888fa72e.tar.gz rockbox-26e0c64e34f05d3869a7e5e26d7dd388888fa72e.zip |
Fix red and remove duplicated function declaration
Change-Id: I5fed7fdad077eedfc1e36fbd9e1669f11b90288d
-rw-r--r-- | firmware/export/backlight.h | 4 | ||||
-rw-r--r-- | firmware/target/hosted/sdl/lcd-bitmap.c | 2 | ||||
-rw-r--r-- | uisimulator/common/lcd-common.c | 6 |
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); | |||
64 | void lcd_awake(void); | 64 | void lcd_awake(void); |
65 | #endif | 65 | #endif |
66 | 66 | ||
67 | #ifdef HAVE_LCD_SLEEP | ||
68 | void lcd_awake(void); | ||
69 | #endif | ||
70 | |||
71 | #else /* !HAVE_BACKLIGHT */ | 67 | #else /* !HAVE_BACKLIGHT */ |
72 | #define backlight_init() | 68 | #define backlight_init() |
73 | #endif /* !HAVE_BACKLIGHT */ | 69 | #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) | |||
162 | #endif | 162 | #endif |
163 | } | 163 | } |
164 | #else /* LCD_DEPTH > 8 */ | 164 | #else /* LCD_DEPTH > 8 */ |
165 | #ifdef HAVE_TRANSFLECTIVE_LCD | 165 | #if defined(HAVE_TRANSFLECTIVE_LCD ) && defined(HAVE_LCD_SLEEP) |
166 | if (!lcd_active()) | 166 | if (!lcd_active()) |
167 | SDL_SetAlpha(lcd_surface, SDL_SRCALPHA, 0); | 167 | SDL_SetAlpha(lcd_surface, SDL_SRCALPHA, 0); |
168 | else | 168 | 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 @@ | |||
26 | #include "config.h" | 26 | #include "config.h" |
27 | #include "system.h" | 27 | #include "system.h" |
28 | #include "lcd.h" | 28 | #include "lcd.h" |
29 | #if defined(HAVE_TRANSFLECTIVE_LCD) && defined(HAVE_LCD_ENABLE) | ||
30 | /* in uisimulator/sdl/lcd-bitmap.c and lcd-charcell.c */ | ||
31 | extern void sim_backlight(int value); | ||
32 | #endif | ||
29 | 33 | ||
30 | #ifdef HAVE_LCD_ENABLE | 34 | #ifdef HAVE_LCD_ENABLE |
31 | static bool lcd_enabled = false; | 35 | static bool lcd_enabled = false; |
@@ -78,7 +82,7 @@ void lcd_remote_set_invert_display(bool invert) | |||
78 | void lcd_sleep(void) | 82 | void lcd_sleep(void) |
79 | { | 83 | { |
80 | lcd_sleeping = true; | 84 | lcd_sleeping = true; |
81 | #ifdef HAVE_TRANSFLECTIVE_LCD | 85 | #if defined(HAVE_TRANSFLECTIVE_LCD) && defined(HAVE_LCD_ENABLE) |
82 | sim_backlight(0); /* completely blacken the screen */ | 86 | sim_backlight(0); /* completely blacken the screen */ |
83 | #endif | 87 | #endif |
84 | } | 88 | } |