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 | |
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 'tools')
-rwxr-xr-x | tools/buildzip.pl | 2 | ||||
-rw-r--r-- | tools/checkwps/SOURCES | 2 | ||||
-rw-r--r-- | tools/checkwps/checkwps.c | 8 | ||||
-rw-r--r-- | tools/convbdf.c | 6 |
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 { | |||
258 | # Get the LCD screen depth and graphical status | 258 | # Get the LCD screen depth and graphical status |
259 | print GCC <<STOP | 259 | print GCC <<STOP |
260 | \#include "config.h" | 260 | \#include "config.h" |
261 | #ifdef HAVE_LCD_BITMAP | ||
262 | Bitmap: yes | 261 | Bitmap: yes |
263 | Depth: LCD_DEPTH | 262 | Depth: LCD_DEPTH |
264 | LCD Width: LCD_WIDTH | 263 | LCD Width: LCD_WIDTH |
265 | LCD Height: LCD_HEIGHT | 264 | LCD Height: LCD_HEIGHT |
266 | Icon Width: CONFIG_DEFAULT_ICON_WIDTH | 265 | Icon Width: CONFIG_DEFAULT_ICON_WIDTH |
267 | Icon Height: CONFIG_DEFAULT_ICON_HEIGHT | 266 | Icon Height: CONFIG_DEFAULT_ICON_HEIGHT |
268 | #endif | ||
269 | #ifdef HAVE_REMOTE_LCD | 267 | #ifdef HAVE_REMOTE_LCD |
270 | Remote Depth: LCD_REMOTE_DEPTH | 268 | Remote Depth: LCD_REMOTE_DEPTH |
271 | Remote Icon Width: CONFIG_REMOTE_DEFAULT_ICON_WIDTH | 269 | 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 @@ | |||
17 | #endif | 17 | #endif |
18 | checkwps.c | 18 | checkwps.c |
19 | 19 | ||
20 | #ifdef HAVE_LCD_BITMAP | ||
21 | ../../apps/recorder/bmp.c | 20 | ../../apps/recorder/bmp.c |
22 | #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] = | |||
181 | #endif | 181 | #endif |
182 | .getwidth = getwidth, | 182 | .getwidth = getwidth, |
183 | .getheight = getheight, | 183 | .getheight = getheight, |
184 | #ifdef HAVE_LCD_BITMAP | ||
185 | .getuifont = getuifont, | 184 | .getuifont = getuifont, |
186 | #endif | ||
187 | #if LCD_DEPTH > 1 | 185 | #if LCD_DEPTH > 1 |
188 | .get_foreground=dummy_func2, | 186 | .get_foreground=dummy_func2, |
189 | .get_background=dummy_func2, | 187 | .get_background=dummy_func2, |
@@ -209,7 +207,6 @@ struct screen screens[NB_SCREENS] = | |||
209 | #endif | 207 | #endif |
210 | }; | 208 | }; |
211 | 209 | ||
212 | #ifdef HAVE_LCD_BITMAP | ||
213 | void screen_clear_area(struct screen * display, int xstart, int ystart, | 210 | void screen_clear_area(struct screen * display, int xstart, int ystart, |
214 | int width, int height) | 211 | int width, int height) |
215 | { | 212 | { |
@@ -217,7 +214,6 @@ void screen_clear_area(struct screen * display, int xstart, int ystart, | |||
217 | display->fillrect(xstart, ystart, width, height); | 214 | display->fillrect(xstart, ystart, width, height); |
218 | display->set_drawmode(DRMODE_SOLID); | 215 | display->set_drawmode(DRMODE_SOLID); |
219 | } | 216 | } |
220 | #endif | ||
221 | 217 | ||
222 | #if CONFIG_TUNER | 218 | #if CONFIG_TUNER |
223 | bool radio_hardware_present(void) | 219 | bool radio_hardware_present(void) |
@@ -226,7 +222,6 @@ bool radio_hardware_present(void) | |||
226 | } | 222 | } |
227 | #endif | 223 | #endif |
228 | 224 | ||
229 | #ifdef HAVE_LCD_BITMAP | ||
230 | static int loaded_fonts = 0; | 225 | static int loaded_fonts = 0; |
231 | static struct font _font; | 226 | static struct font _font; |
232 | int font_load(const char *path) | 227 | int font_load(const char *path) |
@@ -235,7 +230,7 @@ int font_load(const char *path) | |||
235 | loaded_fonts++; | 230 | loaded_fonts++; |
236 | return id; | 231 | return id; |
237 | } | 232 | } |
238 | 233 | ||
239 | void font_unload(int font_id) | 234 | void font_unload(int font_id) |
240 | { | 235 | { |
241 | (void)font_id; | 236 | (void)font_id; |
@@ -245,7 +240,6 @@ struct font* font_get(int font) | |||
245 | { | 240 | { |
246 | return &_font; | 241 | return &_font; |
247 | } | 242 | } |
248 | #endif | ||
249 | 243 | ||
250 | /* This is no longer defined in ROCKBOX builds so just use a huge value */ | 244 | /* This is no longer defined in ROCKBOX builds so just use a huge value */ |
251 | #define SKIN_BUFFER_SIZE (200*1024) | 245 | #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) | |||
1214 | "#include <stdbool.h>\n" | 1214 | "#include <stdbool.h>\n" |
1215 | "#include \"config.h\"\n" | 1215 | "#include \"config.h\"\n" |
1216 | "#include \"font.h\"\n" | 1216 | "#include \"font.h\"\n" |
1217 | "#ifdef HAVE_LCD_BITMAP\n" | ||
1218 | "\n" | 1217 | "\n" |
1219 | "/* Font information:\n" | 1218 | "/* Font information:\n" |
1220 | " name: %s\n" | 1219 | " name: %s\n" |
@@ -1426,7 +1425,6 @@ int gen_c_source(struct font* pf, char *path) | |||
1426 | " 0, /* */\n" | 1425 | " 0, /* */\n" |
1427 | " 0, /* */\n" | 1426 | " 0, /* */\n" |
1428 | "};\n" | 1427 | "};\n" |
1429 | "#endif /* HAVE_LCD_BITMAP */\n" | ||
1430 | ); | 1428 | ); |
1431 | 1429 | ||
1432 | return 0; | 1430 | return 0; |
@@ -1440,7 +1438,6 @@ int gen_h_header(struct font* pf, char *path) | |||
1440 | char buf[256]; | 1438 | char buf[256]; |
1441 | char *hdr1 = | 1439 | char *hdr1 = |
1442 | "/* Generated by convbdf on %s. */\n" | 1440 | "/* Generated by convbdf on %s. */\n" |
1443 | "#ifdef HAVE_LCD_BITMAP\n" | ||
1444 | "\n" | 1441 | "\n" |
1445 | "/* Font information */\n" | 1442 | "/* Font information */\n" |
1446 | "#define SYSFONT_NAME %s\n" | 1443 | "#define SYSFONT_NAME %s\n" |
@@ -1458,8 +1455,7 @@ int gen_h_header(struct font* pf, char *path) | |||
1458 | "#define SYSFONT_PROPORTIONAL %d\n" | 1455 | "#define SYSFONT_PROPORTIONAL %d\n" |
1459 | "#define SYSFONT_COPYRIGHT %s\n" | 1456 | "#define SYSFONT_COPYRIGHT %s\n" |
1460 | "#define SYSFONT_BITS_SIZE %d\n" | 1457 | "#define SYSFONT_BITS_SIZE %d\n" |
1461 | "\n" | 1458 | "\n"; |
1462 | "#endif\n"; | ||
1463 | 1459 | ||
1464 | ofp = fopen(path, "w"); | 1460 | ofp = fopen(path, "w"); |
1465 | if (!ofp) { | 1461 | if (!ofp) { |