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 /firmware/usb.c | |
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 'firmware/usb.c')
-rw-r--r-- | firmware/usb.c | 6 |
1 files changed, 0 insertions, 6 deletions
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 @@ | |||
56 | #define USB_FULL_INIT | 56 | #define USB_FULL_INIT |
57 | #endif | 57 | #endif |
58 | 58 | ||
59 | #ifdef HAVE_LCD_BITMAP | ||
60 | bool do_screendump_instead_of_usb = false; | 59 | bool do_screendump_instead_of_usb = false; |
61 | #endif | ||
62 | 60 | ||
63 | #if !defined(SIMULATOR) && !defined(USB_NONE) | 61 | #if !defined(SIMULATOR) && !defined(USB_NONE) |
64 | 62 | ||
@@ -116,7 +114,6 @@ static void try_reboot(void) | |||
116 | #endif /* USB_FIRWIRE_HANDLING */ | 114 | #endif /* USB_FIRWIRE_HANDLING */ |
117 | 115 | ||
118 | /* Screen dump */ | 116 | /* Screen dump */ |
119 | #ifdef HAVE_LCD_BITMAP | ||
120 | static inline bool usb_do_screendump(void) | 117 | static inline bool usb_do_screendump(void) |
121 | { | 118 | { |
122 | if(do_screendump_instead_of_usb) | 119 | if(do_screendump_instead_of_usb) |
@@ -129,7 +126,6 @@ static inline bool usb_do_screendump(void) | |||
129 | } | 126 | } |
130 | return false; | 127 | return false; |
131 | } | 128 | } |
132 | #endif /* HAVE_LCD_BITMAP */ | ||
133 | 129 | ||
134 | /* Power (charging-only) button */ | 130 | /* Power (charging-only) button */ |
135 | static inline void usb_detect_charging_only(bool detect) | 131 | static inline void usb_detect_charging_only(bool detect) |
@@ -458,13 +454,11 @@ static void NORETURN_ATTR usb_thread(void) | |||
458 | if(usb_state != USB_EXTRACTED) | 454 | if(usb_state != USB_EXTRACTED) |
459 | break; | 455 | break; |
460 | 456 | ||
461 | #ifdef HAVE_LCD_BITMAP | ||
462 | if(usb_do_screendump()) | 457 | if(usb_do_screendump()) |
463 | { | 458 | { |
464 | usb_state = USB_SCREENDUMP; | 459 | usb_state = USB_SCREENDUMP; |
465 | break; | 460 | break; |
466 | } | 461 | } |
467 | #endif | ||
468 | 462 | ||
469 | usb_state = USB_POWERED; | 463 | usb_state = USB_POWERED; |
470 | usb_stack_enable(true); | 464 | usb_stack_enable(true); |