summaryrefslogtreecommitdiffstats
path: root/tools
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 /tools
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 'tools')
-rwxr-xr-xtools/buildzip.pl2
-rw-r--r--tools/checkwps/SOURCES2
-rw-r--r--tools/checkwps/checkwps.c8
-rw-r--r--tools/convbdf.c6
4 files changed, 2 insertions, 16 deletions
diff --git a/tools/buildzip.pl b/tools/buildzip.pl
index 0e980139bf..ce225139ef 100755
--- a/tools/buildzip.pl
+++ b/tools/buildzip.pl
@@ -258,14 +258,12 @@ sub gettargetinfo {
# Get the LCD screen depth and graphical status
print GCC <<STOP
\#include "config.h"
-#ifdef HAVE_LCD_BITMAP
Bitmap: yes
Depth: LCD_DEPTH
LCD Width: LCD_WIDTH
LCD Height: LCD_HEIGHT
Icon Width: CONFIG_DEFAULT_ICON_WIDTH
Icon Height: CONFIG_DEFAULT_ICON_HEIGHT
-#endif
#ifdef HAVE_REMOTE_LCD
Remote Depth: LCD_REMOTE_DEPTH
Remote Icon Width: CONFIG_REMOTE_DEFAULT_ICON_WIDTH
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)
diff --git a/tools/convbdf.c b/tools/convbdf.c
index c508bbf2e8..58ab2645b4 100644
--- a/tools/convbdf.c
+++ b/tools/convbdf.c
@@ -1214,7 +1214,6 @@ int gen_c_source(struct font* pf, char *path)
"#include <stdbool.h>\n"
"#include \"config.h\"\n"
"#include \"font.h\"\n"
- "#ifdef HAVE_LCD_BITMAP\n"
"\n"
"/* Font information:\n"
" name: %s\n"
@@ -1426,7 +1425,6 @@ int gen_c_source(struct font* pf, char *path)
" 0, /* */\n"
" 0, /* */\n"
"};\n"
- "#endif /* HAVE_LCD_BITMAP */\n"
);
return 0;
@@ -1440,7 +1438,6 @@ int gen_h_header(struct font* pf, char *path)
char buf[256];
char *hdr1 =
"/* Generated by convbdf on %s. */\n"
- "#ifdef HAVE_LCD_BITMAP\n"
"\n"
"/* Font information */\n"
"#define SYSFONT_NAME %s\n"
@@ -1458,8 +1455,7 @@ int gen_h_header(struct font* pf, char *path)
"#define SYSFONT_PROPORTIONAL %d\n"
"#define SYSFONT_COPYRIGHT %s\n"
"#define SYSFONT_BITS_SIZE %d\n"
- "\n"
- "#endif\n";
+ "\n";
ofp = fopen(path, "w");
if (!ofp) {