diff options
author | Solomon Peachy <pizza@shaftnet.org> | 2020-07-19 19:38:45 -0400 |
---|---|---|
committer | Solomon Peachy <pizza@shaftnet.org> | 2020-07-24 21:20:13 +0000 |
commit | 0c4f89370d05056faa789aa9cabcccc4e509fb9f (patch) | |
tree | 6ddf7fff0a47564db41d39927ea1acbdb03e74ee /apps/gui/usb_screen.c | |
parent | 092c340a2062fa98b7387fc5fd63578ddae7d0b6 (diff) | |
download | rockbox-0c4f89370d05056faa789aa9cabcccc4e509fb9f.tar.gz rockbox-0c4f89370d05056faa789aa9cabcccc4e509fb9f.zip |
[2/4] get rid of HAVE_LCD_CHARCELLS
HAVE_LCD_BITMAP is now redundant.
lcd_bitmap is always-on in features.txt so manual and lang strings
don't have to change
Change-Id: I08eeb20de48099ffc2dc23782711af368c2ec794
Diffstat (limited to 'apps/gui/usb_screen.c')
-rw-r--r-- | apps/gui/usb_screen.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/apps/gui/usb_screen.c b/apps/gui/usb_screen.c index 1b6f9c3b2a..dd1d97df3c 100644 --- a/apps/gui/usb_screen.c +++ b/apps/gui/usb_screen.c | |||
@@ -269,12 +269,7 @@ void gui_usb_screen_run(bool early_usb) | |||
269 | * generic cleanup here */ | 269 | * generic cleanup here */ |
270 | screen->set_viewport(NULL); | 270 | screen->set_viewport(NULL); |
271 | screen->scroll_stop(); | 271 | screen->scroll_stop(); |
272 | #ifdef HAVE_LCD_CHARCELLS | ||
273 | /* Quick fix. Viewports should really be enabled proper for charcell */ | ||
274 | viewport_set_defaults(&usb_screen_vps_ar[i].parent, i); | ||
275 | #else | ||
276 | usb_screen_fix_viewports(screen, &usb_screen_vps_ar[i]); | 272 | usb_screen_fix_viewports(screen, &usb_screen_vps_ar[i]); |
277 | #endif | ||
278 | } | 273 | } |
279 | 274 | ||
280 | /* update the UI before disabling fonts, this maximizes the propability | 275 | /* update the UI before disabling fonts, this maximizes the propability |
@@ -327,10 +322,6 @@ void gui_usb_screen_run(bool early_usb) | |||
327 | touchscreen_set_mode(old_mode); | 322 | touchscreen_set_mode(old_mode); |
328 | #endif | 323 | #endif |
329 | 324 | ||
330 | #ifdef HAVE_LCD_CHARCELLS | ||
331 | status_set_usb(false); | ||
332 | #endif /* HAVE_LCD_CHARCELLS */ | ||
333 | |||
334 | #ifdef HAVE_LCD_BITMAP | 325 | #ifdef HAVE_LCD_BITMAP |
335 | if(!early_usb) | 326 | if(!early_usb) |
336 | { | 327 | { |