From 658026e6267277b27d297c481728f74d160a8481 Mon Sep 17 00:00:00 2001
From: Solomon Peachy <pizza@shaftnet.org>
Date: Fri, 17 Jul 2020 10:31:31 -0400
Subject: [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
---
 firmware/usb.c | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'firmware/usb.c')

diff --git a/firmware/usb.c b/firmware/usb.c
index e20388c073..f97cc75ffe 100644
--- a/firmware/usb.c
+++ b/firmware/usb.c
@@ -56,9 +56,7 @@
 #define USB_FULL_INIT
 #endif
 
-#ifdef HAVE_LCD_BITMAP
 bool do_screendump_instead_of_usb = false;
-#endif
 
 #if !defined(SIMULATOR) && !defined(USB_NONE)
 
@@ -116,7 +114,6 @@ static void try_reboot(void)
 #endif /* USB_FIRWIRE_HANDLING */
 
 /* Screen dump */
-#ifdef HAVE_LCD_BITMAP
 static inline bool usb_do_screendump(void)
 {
     if(do_screendump_instead_of_usb)
@@ -129,7 +126,6 @@ static inline bool usb_do_screendump(void)
     }
     return false;
 }
-#endif /* HAVE_LCD_BITMAP */
 
 /* Power (charging-only) button */
 static inline void usb_detect_charging_only(bool detect)
@@ -458,13 +454,11 @@ static void NORETURN_ATTR usb_thread(void)
             if(usb_state != USB_EXTRACTED)
                 break;
 
-#ifdef HAVE_LCD_BITMAP
             if(usb_do_screendump())
             {
                 usb_state = USB_SCREENDUMP;
                 break;
             }
-#endif
 
             usb_state = USB_POWERED;
             usb_stack_enable(true);
-- 
cgit v1.2.3