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

bootloaders: Don't build usb_core without HAVE_BOOTLOADER_USB_MODE

Browse source 
This way we don't need to stub out a bunch of functionality when we
don't have any actual USB class drivers enabled.

Change-Id: Ia0ecf5be4bb41bebfcd347090959f3204a2aba59
This commit is contained in:
Solomon Peachy 2026-01-27 14:50:44 -05:00
parent 58b186d6de
commit 80aaaaa2af
3 changed files with 5 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

5
firmware/SOURCES
View file

@ -947,8 +947,7 @@ target/arm/s5l8702/lcd-asm-s5l8702.S
#endif
/* USB Stack */
// TODO: This needs to be HAVE_USBSTACK && (!BOOTLOADER || HAVE_USB_BOOTLOADER_MODE)
#ifdef HAVE_USBSTACK
#if defined(HAVE_USBSTACK) && (!defined(BOOTLOADER) || defined(HAVE_BOOTLOADER_USB_MODE))
usbstack/usb_core.c
#ifdef USB_ENABLE_STORAGE
usbstack/usb_storage.c
@ -985,6 +984,8 @@ target/arm/rk27xx/usb-drv-rk27xx.c
drivers/isp1362.c
#elif CONFIG_USBOTG == USBOTG_M5636
drivers/m5636.c
#elif CONFIG_USBOTG == USBOTG_ARC
target/arm/usb-drv-arc.c
#endif
#endif /* !defined(HAVE_USBSTACK) */

2
firmware/storage.c
View file

@ -229,7 +229,7 @@ static void NORETURN_ATTR storage_thread(void)
break;
#endif /* HAVE_HOTSWAP */
#ifndef USB_NONE
#if !defined(USB_NONE) && (!defined(BOOTLOADER) || defined(HAVE_BOOTLOADER_USB_MODE))
case SYS_USB_CONNECTED:
case SYS_USB_DISCONNECTED:
bdcast = 0;

28
firmware/usb.c
View file

@ -705,33 +705,7 @@ 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 */
#ifdef HAVE_USBSTACK
void usb_signal_transfer_completion(
struct usb_transfer_completion_event_data* event_data)
{
(void)event_data;
}
#endif
void usb_clear_pending_transfer_completion_events(void)
{
}
void usb_release_exclusive_storage(void)
{
}
void usb_signal_notify(long id, intptr_t data)
{
(void)id;
(void)data;
}
void usb_acknowledge(long id, intptr_t seqnum)
{
(void)id;
(void)seqnum;
}
#endif /* !USB_FULL_INIT */
#endif /* USB_FULL_INIT */
void usb_init(void)
{