summaryrefslogtreecommitdiffstats
path: root/firmware/target
diff options
context:
space:
mode:
authorSolomon Peachy <pizza@shaftnet.org>2020-07-17 10:31:31 -0400
committerSolomon Peachy <pizza@shaftnet.org>2020-07-24 21:20:13 +0000
commit658026e6267277b27d297c481728f74d160a8481 (patch)
tree915a9d2bb48469bdd5b9127dc19a61f230721a6c /firmware/target
parent8cb555460ff79e636a7907fb2589e16db98c8600 (diff)
downloadrockbox-658026e6267277b27d297c481728f74d160a8481.tar.gz
rockbox-658026e6267277b27d297c481728f74d160a8481.tar.bz2
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.c2
-rw-r--r--firmware/target/mips/ingenic_jz47xx/system-jz4740.c3
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 @@
#include "system-sdl.h"
#include "sim-ui-defines.h"
#include "lcd-sdl.h"
-#ifdef HAVE_LCD_BITMAP
#include "lcd-bitmap.h"
-#endif
#ifdef HAVE_REMOTE_LCD
#include "lcd-remote-bitmap.h"
#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)
"$1", "LO", "HI", "STATUS", "EPC" };
int i;
-#ifdef HAVE_LCD_BITMAP
#if LCD_DEPTH > 1
lcd_set_backdrop(NULL);
lcd_set_drawmode(DRMODE_SOLID);
@@ -270,7 +269,7 @@ void exception_handler(void* stack_ptr, unsigned int cause, unsigned int epc)
#endif
lcd_setfont(FONT_SYSFIXED);
lcd_set_viewport(NULL);
-#endif
+
lcd_clear_display();
backlight_hw_on();