len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2026-04-12 00:47:49 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

usb: Hopefully resolve the red in 41f9285def

Browse source 
First, leave USB_FULL_INIT on for all non-bootloader builds; this is
needed for devices that don't have a USBSTACK (such as most hosted
targets and ones that provide USB<>ATA in hardware)

Then unwind another hack that is no longer needed now that USB_FULL_INIT
is not set in most bootloaders.

Change-Id: I00881ac76b2469e5cd7700bad2203c58ef1e09e7
This commit is contained in:
Solomon Peachy 2026-01-27 13:05:33 -05:00
parent a5b589cf5b
commit fce8248267
1 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
firmware/usb.c
View file

@ -59,7 +59,7 @@
#include "iap.h"
#endif
#if defined(HAVE_USBSTACK) && (!defined(BOOTLOADER) || defined(HAVE_BOOTLOADER_USB_MODE))
#if (!defined(BOOTLOADER) || defined(HAVE_BOOTLOADER_USB_MODE))
#define USB_FULL_INIT
#endif
@ -704,7 +704,6 @@ void usb_acknowledge(long id, intptr_t seqnum)
{
queue_post(&usb_queue, id, seqnum);
}
#else /* !USB_FULL_INIT */
/* TODO: All of this can go away once usb_core.c is no longer built
with BOOTLOADER && !HAVE_USB_BOOTLOADER_MODE */
@ -816,7 +815,7 @@ bool usb_inserted(void)
return usb_state == USB_INSERTED || usb_state == USB_POWERED;
}
#if defined(HAVE_USBSTACK) && defined(USB_FULL_INIT)
#if defined(USB_FULL_INIT)
bool usb_exclusive_storage(void)
{
/* Storage isn't actually exclusive until slave mode has been entered */