diff options
author | Solomon Peachy <pizza@shaftnet.org> | 2020-07-17 10:31:31 -0400 |
---|---|---|
committer | Solomon Peachy <pizza@shaftnet.org> | 2020-07-24 21:20:13 +0000 |
commit | 658026e6267277b27d297c481728f74d160a8481 (patch) | |
tree | 915a9d2bb48469bdd5b9127dc19a61f230721a6c /firmware/target | |
parent | 8cb555460ff79e636a7907fb2589e16db98c8600 (diff) | |
download | rockbox-658026e6267277b27d297c481728f74d160a8481.tar.gz rockbox-658026e6267277b27d297c481728f74d160a8481.zip |
[4/4] Remove HAVE_LCD_BITMAP, as it's now the only choice.
Note: I left behind lcd_bitmap in features.txt, because removing it
would require considerable work in the manual and the translations.
Change-Id: Ia8ca7761f610d9332a0d22a7d189775fb15ec88a
Diffstat (limited to 'firmware/target')
-rw-r--r-- | firmware/target/hosted/sdl/system-sdl.c | 2 | ||||
-rw-r--r-- | firmware/target/mips/ingenic_jz47xx/system-jz4740.c | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/firmware/target/hosted/sdl/system-sdl.c b/firmware/target/hosted/sdl/system-sdl.c index 6aaab6e8a5..e53643f449 100644 --- a/firmware/target/hosted/sdl/system-sdl.c +++ b/firmware/target/hosted/sdl/system-sdl.c | |||
@@ -33,9 +33,7 @@ | |||
33 | #include "system-sdl.h" | 33 | #include "system-sdl.h" |
34 | #include "sim-ui-defines.h" | 34 | #include "sim-ui-defines.h" |
35 | #include "lcd-sdl.h" | 35 | #include "lcd-sdl.h" |
36 | #ifdef HAVE_LCD_BITMAP | ||
37 | #include "lcd-bitmap.h" | 36 | #include "lcd-bitmap.h" |
38 | #endif | ||
39 | #ifdef HAVE_REMOTE_LCD | 37 | #ifdef HAVE_REMOTE_LCD |
40 | #include "lcd-remote-bitmap.h" | 38 | #include "lcd-remote-bitmap.h" |
41 | #endif | 39 | #endif |
diff --git a/firmware/target/mips/ingenic_jz47xx/system-jz4740.c b/firmware/target/mips/ingenic_jz47xx/system-jz4740.c index 5ef500a69b..87094dd7ae 100644 --- a/firmware/target/mips/ingenic_jz47xx/system-jz4740.c +++ b/firmware/target/mips/ingenic_jz47xx/system-jz4740.c | |||
@@ -261,7 +261,6 @@ void exception_handler(void* stack_ptr, unsigned int cause, unsigned int epc) | |||
261 | "$1", "LO", "HI", "STATUS", "EPC" }; | 261 | "$1", "LO", "HI", "STATUS", "EPC" }; |
262 | int i; | 262 | int i; |
263 | 263 | ||
264 | #ifdef HAVE_LCD_BITMAP | ||
265 | #if LCD_DEPTH > 1 | 264 | #if LCD_DEPTH > 1 |
266 | lcd_set_backdrop(NULL); | 265 | lcd_set_backdrop(NULL); |
267 | lcd_set_drawmode(DRMODE_SOLID); | 266 | lcd_set_drawmode(DRMODE_SOLID); |
@@ -270,7 +269,7 @@ void exception_handler(void* stack_ptr, unsigned int cause, unsigned int epc) | |||
270 | #endif | 269 | #endif |
271 | lcd_setfont(FONT_SYSFIXED); | 270 | lcd_setfont(FONT_SYSFIXED); |
272 | lcd_set_viewport(NULL); | 271 | lcd_set_viewport(NULL); |
273 | #endif | 272 | |
274 | lcd_clear_display(); | 273 | lcd_clear_display(); |
275 | backlight_hw_on(); | 274 | backlight_hw_on(); |
276 | 275 | ||