Difuse/u-boot
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

usb: Remove CONFIG_USBD_HS

Browse source 
This define is not enabled by the only platform which currently enables
the legacy option of CONFIG_USB_DEVICE. We can drop this code.

Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Tom Rini 2022-12-02 16:42:49 -05:00
parent 8747decc9b
commit 0c3a6d443f
22 changed files with 0 additions and 147 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
README
View file

@ -618,14 +618,6 @@ The following options need to be configured:
variable usbtty to be cdc_acm should suffice. The following variable usbtty to be cdc_acm should suffice. The following
might be defined in YourBoardName.h might be defined in YourBoardName.h
CONFIG_USBD_HS
Define this to enable the high speed support for usb
device and usbtty. If this feature is enabled, a routine
int is_usbd_high_speed(void)
also needs to be defined by the driver to dynamically poll
whether the enumeration has succeded at high speed or full
speed.
If you have a USB-IF assigned VendorID then you may wish to If you have a USB-IF assigned VendorID then you may wish to
define your own vendor specific values either in BoardName.h define your own vendor specific values either in BoardName.h
or directly in usbd_vendor_info.h. If you don't define or directly in usbd_vendor_info.h. If you don't define

50
drivers/serial/usbtty.c
View file

@ -120,20 +120,6 @@ static struct usb_device_descriptor device_descriptor = {
.bNumConfigurations = NUM_CONFIGS .bNumConfigurations = NUM_CONFIGS
}; };
#if defined(CONFIG_USBD_HS)
static struct usb_qualifier_descriptor qualifier_descriptor = {
.bLength = sizeof(struct usb_qualifier_descriptor),
.bDescriptorType = USB_DT_QUAL,
.bcdUSB = cpu_to_le16(USB_BCD_VERSION),
.bDeviceClass = COMMUNICATIONS_DEVICE_CLASS,
.bDeviceSubClass = 0x00,
.bDeviceProtocol = 0x00,
.bMaxPacketSize0 = EP0_MAX_PACKET_SIZE,
.bNumConfigurations = NUM_CONFIGS
};
#endif
/* /*
* Static CDC ACM specific descriptors * Static CDC ACM specific descriptors
*/ */
@ -639,9 +625,6 @@ static void usbtty_init_instances (void)
memset (device_instance, 0, sizeof (struct usb_device_instance)); memset (device_instance, 0, sizeof (struct usb_device_instance));
device_instance->device_state = STATE_INIT; device_instance->device_state = STATE_INIT;
device_instance->device_descriptor = &device_descriptor; device_instance->device_descriptor = &device_descriptor;
#if defined(CONFIG_USBD_HS)
device_instance->qualifier_descriptor = &qualifier_descriptor;
#endif
device_instance->event = usbtty_event_handler; device_instance->event = usbtty_event_handler;
device_instance->cdc_recv_setup = usbtty_cdc_setup; device_instance->cdc_recv_setup = usbtty_cdc_setup;
device_instance->bus = bus_instance; device_instance->bus = bus_instance;
@ -755,10 +738,6 @@ static void usbtty_init_terminal_type(short type)
device_descriptor.idProduct = device_descriptor.idProduct =
cpu_to_le16(CONFIG_USBD_PRODUCTID_CDCACM); cpu_to_le16(CONFIG_USBD_PRODUCTID_CDCACM);
#if defined(CONFIG_USBD_HS)
qualifier_descriptor.bDeviceClass =
COMMUNICATIONS_DEVICE_CLASS;
#endif
/* Assign endpoint indices */ /* Assign endpoint indices */
tx_endpoint = ACM_TX_ENDPOINT; tx_endpoint = ACM_TX_ENDPOINT;
rx_endpoint = ACM_RX_ENDPOINT; rx_endpoint = ACM_RX_ENDPOINT;
@ -787,9 +766,6 @@ static void usbtty_init_terminal_type(short type)
device_descriptor.bDeviceClass = 0xFF; device_descriptor.bDeviceClass = 0xFF;
device_descriptor.idProduct = device_descriptor.idProduct =
cpu_to_le16(CONFIG_USBD_PRODUCTID_GSERIAL); cpu_to_le16(CONFIG_USBD_PRODUCTID_GSERIAL);
#if defined(CONFIG_USBD_HS)
qualifier_descriptor.bDeviceClass = 0xFF;
#endif
/* Assign endpoint indices */ /* Assign endpoint indices */
tx_endpoint = GSERIAL_TX_ENDPOINT; tx_endpoint = GSERIAL_TX_ENDPOINT;
rx_endpoint = GSERIAL_RX_ENDPOINT; rx_endpoint = GSERIAL_RX_ENDPOINT;
@ -937,9 +913,6 @@ static int usbtty_configured (void)
static void usbtty_event_handler (struct usb_device_instance *device, static void usbtty_event_handler (struct usb_device_instance *device,
usb_device_event_t event, int data) usb_device_event_t event, int data)
{ {
#if defined(CONFIG_USBD_HS)
int i;
#endif
switch (event) { switch (event) {
case DEVICE_RESET: case DEVICE_RESET:
case DEVICE_BUS_INACTIVE: case DEVICE_BUS_INACTIVE:
@ -950,29 +923,6 @@ static void usbtty_event_handler (struct usb_device_instance *device,
break; break;
case DEVICE_ADDRESS_ASSIGNED: case DEVICE_ADDRESS_ASSIGNED:
#if defined(CONFIG_USBD_HS)
/*
* is_usbd_high_speed routine needs to be defined by
* specific gadget driver
* It returns true if device enumerates at High speed
* Retuns false otherwise
*/
for (i = 0; i < NUM_ENDPOINTS; i++) {
if (((ep_descriptor_ptrs[i]->bmAttributes &
USB_ENDPOINT_XFERTYPE_MASK) ==
USB_ENDPOINT_XFER_BULK)
&& is_usbd_high_speed()) {
ep_descriptor_ptrs[i]->wMaxPacketSize =
CONFIG_USBD_SERIAL_BULK_HS_PKTSIZE;
}
endpoint_instance[i + 1].tx_packetSize =
ep_descriptor_ptrs[i]->wMaxPacketSize;
endpoint_instance[i + 1].rcv_packetSize =
ep_descriptor_ptrs[i]->wMaxPacketSize;
}
#endif
usbtty_init_endpoints (); usbtty_init_endpoints ();
default: default:

4
drivers/serial/usbtty.h
View file

@ -51,10 +51,6 @@
#define CONFIG_USBD_SERIAL_INT_PKTSIZE UDC_INT_PACKET_SIZE #define CONFIG_USBD_SERIAL_INT_PKTSIZE UDC_INT_PACKET_SIZE
#define CONFIG_USBD_SERIAL_BULK_PKTSIZE UDC_BULK_PACKET_SIZE #define CONFIG_USBD_SERIAL_BULK_PKTSIZE UDC_BULK_PACKET_SIZE
#if defined(CONFIG_USBD_HS)
#define CONFIG_USBD_SERIAL_BULK_HS_PKTSIZE UDC_BULK_HS_PACKET_SIZE
#endif
#define USBTTY_DEVICE_CLASS COMMUNICATIONS_DEVICE_CLASS #define USBTTY_DEVICE_CLASS COMMUNICATIONS_DEVICE_CLASS
#define USBTTY_BCD_DEVICE 0x00 #define USBTTY_BCD_DEVICE 0x00

19
drivers/usb/gadget/ep0.c
View file

@ -371,26 +371,7 @@ static int ep0_get_descriptor (struct usb_device_instance *device,
} }
break; break;
case USB_DESCRIPTOR_TYPE_DEVICE_QUALIFIER: case USB_DESCRIPTOR_TYPE_DEVICE_QUALIFIER:
#if defined(CONFIG_USBD_HS)
{
struct usb_qualifier_descriptor *qualifier_descriptor =
device->qualifier_descriptor;
if (!qualifier_descriptor)
return -1;
/* copy descriptor for this device */
copy_config(urb, qualifier_descriptor,
sizeof(struct usb_qualifier_descriptor),
max);
}
dbg_ep0(3, "copied qualifier descriptor, actual_length: 0x%x",
urb->actual_length);
#else
return -1; return -1;
#endif
break;
default: default:
return -1; return -1;

2
include/configs/apalis_imx6.h
View file

@ -28,8 +28,6 @@
/* Host */ /* Host */
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
#define CONFIG_MXC_USB_FLAGS 0 #define CONFIG_MXC_USB_FLAGS 0
/* Client */
#define CONFIG_USBD_HS
/* Framebuffer and LCD */ /* Framebuffer and LCD */

2
include/configs/colibri-imx6ull.h
View file

@ -126,8 +126,6 @@
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
#define CONFIG_MXC_USB_FLAGS 0 #define CONFIG_MXC_USB_FLAGS 0
#define CONFIG_USBD_HS
/* USB Device Firmware Update support */ /* USB Device Firmware Update support */
#define DFU_DEFAULT_POLL_TIMEOUT 300 #define DFU_DEFAULT_POLL_TIMEOUT 300

2
include/configs/colibri_imx6.h
View file

@ -25,8 +25,6 @@
/* Host */ /* Host */
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
#define CONFIG_MXC_USB_FLAGS 0 #define CONFIG_MXC_USB_FLAGS 0
/* Client */
#define CONFIG_USBD_HS
/* Command definition */ /* Command definition */

2
include/configs/colibri_imx7.h
View file

@ -170,6 +170,4 @@
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
#define CONFIG_MXC_USB_FLAGS 0 #define CONFIG_MXC_USB_FLAGS 0
#define CONFIG_USBD_HS
#endif #endif

1
include/configs/ge_b1x5v2.h
View file

@ -26,7 +26,6 @@
/* USB */ /* USB */
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
#define CONFIG_MXC_USB_FLAGS 0 #define CONFIG_MXC_USB_FLAGS 0
#define CONFIG_USBD_HS
/* Memory */ /* Memory */
#define PHYS_SDRAM MMDC0_ARB_BASE_ADDR #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR

1
include/configs/gw_ventana.h
View file

@ -38,7 +38,6 @@
/* USB Configs */ /* USB Configs */
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
#define CONFIG_MXC_USB_FLAGS 0 #define CONFIG_MXC_USB_FLAGS 0
#define CONFIG_USBD_HS
/* Miscellaneous configurable options */ /* Miscellaneous configurable options */

2
include/configs/imx7-cm.h
View file

@ -81,6 +81,4 @@
/* USB Configs */ /* USB Configs */
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
#define CONFIG_USBD_HS
#endif /* __CONFIG_H */ #endif /* __CONFIG_H */

2
include/configs/librem5.h
View file

@ -27,8 +27,6 @@
#define CFG_SYS_FSL_USDHC_NUM 2 #define CFG_SYS_FSL_USDHC_NUM 2
#define CONFIG_USBD_HS
#define CONSOLE_ON_UART1 #define CONSOLE_ON_UART1
#ifdef CONSOLE_ON_UART1 #ifdef CONSOLE_ON_UART1

2
include/configs/mx6sabre_common.h
View file

@ -145,6 +145,4 @@
/* Environment organization */ /* Environment organization */
#define CONFIG_USBD_HS
#endif /* __MX6QSABRE_COMMON_CONFIG_H */ #endif /* __MX6QSABRE_COMMON_CONFIG_H */

2
include/configs/mx7dsabresd.h
View file

@ -101,6 +101,4 @@
/* USB Configs */ /* USB Configs */
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
#define CONFIG_USBD_HS
#endif /* __CONFIG_H */ #endif /* __CONFIG_H */

2
include/configs/nitrogen6x.h
View file

@ -11,8 +11,6 @@
#include "mx6_common.h" #include "mx6_common.h"
#define CONFIG_USBD_HS
#define CONFIG_MXC_UART_BASE UART2_BASE #define CONFIG_MXC_UART_BASE UART2_BASE
/* MMC Configs */ /* MMC Configs */

2
include/configs/novena.h
View file

@ -55,8 +55,6 @@
#ifdef CONFIG_CMD_USB #ifdef CONFIG_CMD_USB
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
#define CONFIG_MXC_USB_FLAGS 0 #define CONFIG_MXC_USB_FLAGS 0
/* Gadget part */
#define CONFIG_USBD_HS
#endif #endif
/* Extra U-Boot environment. */ /* Extra U-Boot environment. */

2
include/configs/pico-imx6ul.h
View file

@ -26,8 +26,6 @@
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
#define CONFIG_MXC_USB_FLAGS 0 #define CONFIG_MXC_USB_FLAGS 0
#define CONFIG_USBD_HS
#define DFU_DEFAULT_POLL_TIMEOUT 300 #define DFU_DEFAULT_POLL_TIMEOUT 300
#define CONFIG_DFU_ENV_SETTINGS \ #define CONFIG_DFU_ENV_SETTINGS \

3
include/configs/siemens-am33x-common.h
View file

@ -70,9 +70,6 @@
* we don't need to do it twice. * we don't need to do it twice.
*/ */
/* USB DRACO ID as default */
#define CONFIG_USBD_HS
/* USB Device Firmware Update support */ /* USB Device Firmware Update support */
#define DFU_MANIFEST_POLL_TIMEOUT 25000 #define DFU_MANIFEST_POLL_TIMEOUT 25000

3
include/configs/tbs2910.h
View file

@ -28,9 +28,6 @@
/* USB */ /* USB */
#ifdef CONFIG_CMD_USB #ifdef CONFIG_CMD_USB
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
#ifdef CONFIG_CMD_USB_MASS_STORAGE
#define CONFIG_USBD_HS
#endif /* CONFIG_CMD_USB_MASS_STORAGE */
#endif /* CONFIG_CMD_USB */ #endif /* CONFIG_CMD_USB */
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \

2
include/configs/warp7.h
View file

@ -95,8 +95,6 @@
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
#define CONFIG_USBD_HS
/* USB Device Firmware Update support */ /* USB Device Firmware Update support */
#define DFU_DEFAULT_POLL_TIMEOUT 300 #define DFU_DEFAULT_POLL_TIMEOUT 300

15
include/usbdescriptors.h
View file

@ -227,21 +227,6 @@ struct usb_device_descriptor {
u8 bNumConfigurations; u8 bNumConfigurations;
} __attribute__ ((packed)); } __attribute__ ((packed));
#if defined(CONFIG_USBD_HS)
struct usb_qualifier_descriptor {
u8 bLength;
u8 bDescriptorType;
u16 bcdUSB;
u8 bDeviceClass;
u8 bDeviceSubClass;
u8 bDeviceProtocol;
u8 bMaxPacketSize0;
u8 bNumConfigurations;
u8 breserved;
} __attribute__ ((packed));
#endif
struct usb_string_descriptor { struct usb_string_descriptor {
u8 bLength; u8 bLength;
u8 bDescriptorType; /* 0x03 */ u8 bDescriptorType; /* 0x03 */

19
include/usbdevice.h
View file

@ -196,10 +196,6 @@ struct usb_bus_instance;
#define USB_DT_INTERFACE 0x04 #define USB_DT_INTERFACE 0x04
#define USB_DT_ENDPOINT 0x05 #define USB_DT_ENDPOINT 0x05
#if defined(CONFIG_USBD_HS)
#define USB_DT_QUAL 0x06
#endif
#define USB_DT_HID (USB_TYPE_CLASS | 0x01) #define USB_DT_HID (USB_TYPE_CLASS | 0x01)
#define USB_DT_REPORT (USB_TYPE_CLASS | 0x02) #define USB_DT_REPORT (USB_TYPE_CLASS | 0x02)
#define USB_DT_PHYSICAL (USB_TYPE_CLASS | 0x03) #define USB_DT_PHYSICAL (USB_TYPE_CLASS | 0x03)
@ -279,11 +275,7 @@ struct usb_bus_instance;
* USB Spec Release number * USB Spec Release number
*/ */
#if defined(CONFIG_USBD_HS)
#define USB_BCD_VERSION 0x0200
#else
#define USB_BCD_VERSION 0x0110 #define USB_BCD_VERSION 0x0110
#endif
/* /*
@ -552,9 +544,6 @@ struct usb_device_instance {
/* generic */ /* generic */
char *name; char *name;
struct usb_device_descriptor *device_descriptor; /* per device descriptor */ struct usb_device_descriptor *device_descriptor; /* per device descriptor */
#if defined(CONFIG_USBD_HS)
struct usb_qualifier_descriptor *qualifier_descriptor;
#endif
void (*event) (struct usb_device_instance *device, usb_device_event_t event, int data); void (*event) (struct usb_device_instance *device, usb_device_event_t event, int data);
@ -644,14 +633,6 @@ struct usb_string_descriptor *usbd_get_string (u8);
struct usb_device_descriptor *usbd_device_device_descriptor(struct struct usb_device_descriptor *usbd_device_device_descriptor(struct
usb_device_instance *, int); usb_device_instance *, int);
#if defined(CONFIG_USBD_HS)
/*
* is_usbd_high_speed routine needs to be defined by specific gadget driver
* It returns true if device enumerates at High speed
* Retuns false otherwise
*/
int is_usbd_high_speed(void);
#endif
int usbd_endpoint_halted (struct usb_device_instance *device, int endpoint); int usbd_endpoint_halted (struct usb_device_instance *device, int endpoint);
void usbd_rcv_complete(struct usb_endpoint_instance *endpoint, int len, int urb_bad); void usbd_rcv_complete(struct usb_endpoint_instance *endpoint, int len, int urb_bad);
void usbd_tx_complete (struct usb_endpoint_instance *endpoint); void usbd_tx_complete (struct usb_endpoint_instance *endpoint);