Rockbox open source high quality audio player as a Music Player Daemon
mpris rockbox mpd libadwaita audio rust zig deno
2
fork

Configure Feed

Select the types of activity you want to include in your feed.

bootloaders: Don't build usb_core without HAVE_BOOTLOADER_USB_MODE

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

+5 -30
+3 -2
firmware/SOURCES
··· 947 947 #endif 948 948 949 949 /* USB Stack */ 950 - // TODO: This needs to be HAVE_USBSTACK && (!BOOTLOADER || HAVE_USB_BOOTLOADER_MODE) 951 - #ifdef HAVE_USBSTACK 950 + #if defined(HAVE_USBSTACK) && (!defined(BOOTLOADER) || defined(HAVE_BOOTLOADER_USB_MODE)) 952 951 usbstack/usb_core.c 953 952 #ifdef USB_ENABLE_STORAGE 954 953 usbstack/usb_storage.c ··· 985 984 drivers/isp1362.c 986 985 #elif CONFIG_USBOTG == USBOTG_M5636 987 986 drivers/m5636.c 987 + #elif CONFIG_USBOTG == USBOTG_ARC 988 + target/arm/usb-drv-arc.c 988 989 #endif 989 990 #endif /* !defined(HAVE_USBSTACK) */ 990 991
+1 -1
firmware/storage.c
··· 229 229 break; 230 230 #endif /* HAVE_HOTSWAP */ 231 231 232 - #ifndef USB_NONE 232 + #if !defined(USB_NONE) && (!defined(BOOTLOADER) || defined(HAVE_BOOTLOADER_USB_MODE)) 233 233 case SYS_USB_CONNECTED: 234 234 case SYS_USB_DISCONNECTED: 235 235 bdcast = 0;
+1 -27
firmware/usb.c
··· 705 705 { 706 706 queue_post(&usb_queue, id, seqnum); 707 707 } 708 - #else /* !USB_FULL_INIT */ 709 - /* TODO: All of this can go away once usb_core.c is no longer built 710 - with BOOTLOADER && !HAVE_USB_BOOTLOADER_MODE */ 711 - #ifdef HAVE_USBSTACK 712 - void usb_signal_transfer_completion( 713 - struct usb_transfer_completion_event_data* event_data) 714 - { 715 - (void)event_data; 716 - } 717 - #endif 718 - void usb_clear_pending_transfer_completion_events(void) 719 - { 720 - } 721 - void usb_release_exclusive_storage(void) 722 - { 723 - } 724 - void usb_signal_notify(long id, intptr_t data) 725 - { 726 - (void)id; 727 - (void)data; 728 - } 729 - void usb_acknowledge(long id, intptr_t seqnum) 730 - { 731 - (void)id; 732 - (void)seqnum; 733 - } 734 - #endif /* !USB_FULL_INIT */ 708 + #endif /* USB_FULL_INIT */ 735 709 736 710 void usb_init(void) 737 711 {