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 /tools/checkwps | |
| parent | 8cb555460ff79e636a7907fb2589e16db98c8600 (diff) | |
[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 'tools/checkwps')
| -rw-r--r-- | tools/checkwps/SOURCES | 2 | ||||
| -rw-r--r-- | tools/checkwps/checkwps.c | 8 |
2 files changed, 1 insertions, 9 deletions
diff --git a/tools/checkwps/SOURCES b/tools/checkwps/SOURCES index 3a406d1b29..de3a74706a 100644 --- a/tools/checkwps/SOURCES +++ b/tools/checkwps/SOURCES @@ -17,6 +17,4 @@ #endif checkwps.c -#ifdef HAVE_LCD_BITMAP ../../apps/recorder/bmp.c -#endif diff --git a/tools/checkwps/checkwps.c b/tools/checkwps/checkwps.c index 1948c208fd..80b975e479 100644 --- a/tools/checkwps/checkwps.c +++ b/tools/checkwps/checkwps.c @@ -181,9 +181,7 @@ struct screen screens[NB_SCREENS] = #endif .getwidth = getwidth, .getheight = getheight, -#ifdef HAVE_LCD_BITMAP .getuifont = getuifont, -#endif #if LCD_DEPTH > 1 .get_foreground=dummy_func2, .get_background=dummy_func2, @@ -209,7 +207,6 @@ struct screen screens[NB_SCREENS] = #endif }; -#ifdef HAVE_LCD_BITMAP void screen_clear_area(struct screen * display, int xstart, int ystart, int width, int height) { @@ -217,7 +214,6 @@ void screen_clear_area(struct screen * display, int xstart, int ystart, display->fillrect(xstart, ystart, width, height); display->set_drawmode(DRMODE_SOLID); } -#endif #if CONFIG_TUNER bool radio_hardware_present(void) @@ -226,7 +222,6 @@ bool radio_hardware_present(void) } #endif -#ifdef HAVE_LCD_BITMAP static int loaded_fonts = 0; static struct font _font; int font_load(const char *path) @@ -235,7 +230,7 @@ int font_load(const char *path) loaded_fonts++; return id; } - + void font_unload(int font_id) { (void)font_id; @@ -245,7 +240,6 @@ struct font* font_get(int font) { return &_font; } -#endif /* This is no longer defined in ROCKBOX builds so just use a huge value */ #define SKIN_BUFFER_SIZE (200*1024) |