 @@ -1,14 +1,14 @@
-/* $NetBSD: usbroothub.c,v 1.3 2017/10/28 00:37:13 pgoyette Exp $ */
+/* $NetBSD: usbroothub.c,v 1.4 2017/11/28 07:36:08 skrll Exp $ */
 /*-
  * Copyright (c) 1998, 2004, 2011, 2012 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Lennart Augustsson (lennart@augustsson.net) at
  * Carlstedt Research & Technology, Jared D. McNeill (jmcneill@invisible.ca),
  * Matthew R. Green (mrg@eterna.com.au) and Nick Hudson.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -159,26 +159,44 @@ static const struct usb_roothub_descript
 		.bInterfaceProtocol = UIPROTO_FSHUB,
 		.iInterface = 0
 	},
 	.urh_endpd = {
 		.bLength = USB_ENDPOINT_DESCRIPTOR_SIZE,
 		.bDescriptorType = UDESC_ENDPOINT,
 		.bEndpointAddress = UE_DIR_IN | USBROOTHUB_INTR_ENDPT,
 		.bmAttributes = UE_INTERRUPT,
 		.wMaxPacketSize = USETWD(8),			/* max packet */
 		.bInterval = 255,
 	},
 };
 /* USB 3.0 10.15.1 */
 static const usb_device_descriptor_t usbroothub_devd3 = {
 	.bLength = sizeof(usb_device_descriptor_t),
 	.bDescriptorType = UDESC_DEVICE,
 	.bcdUSB = {0x00, 0x03},
 	.bDeviceClass = UDCLASS_HUB,
 	.bDeviceSubClass = UDSUBCLASS_HUB,
 	.bDeviceProtocol = UDPROTO_SSHUB,
 	.bMaxPacketSize = 9,
 	.idVendor = {0},
 	.idProduct = {0},
 	.bcdDevice = {0x00, 0x01},
 	.iManufacturer = 1,
 	.iProduct = 2,
 	.iSerialNumber = 0,
 	.bNumConfigurations = 1
 };
 static const usb_device_descriptor_t usbroothub_devd2 = {
 	.bLength = sizeof(usb_device_descriptor_t),
 	.bDescriptorType = UDESC_DEVICE,
 	.bcdUSB = {0x00, 0x02},
 	.bDeviceClass = UDCLASS_HUB,
 	.bDeviceSubClass = UDSUBCLASS_HUB,
 	.bDeviceProtocol = UDPROTO_HSHUBSTT,
 	.bMaxPacketSize = 64,
 	.idVendor = {0},
 	.idProduct = {0},
 	.bcdDevice = {0x00, 0x01},
 	.iManufacturer = 1,
 	.iProduct = 2,
 @@ -219,26 +237,102 @@ static const struct usb_roothub_descript
 		.bInterfaceProtocol = UIPROTO_HSHUBSTT,
 		.iInterface = 0
 	},
 	.urh_endpd = {
 		.bLength = USB_ENDPOINT_DESCRIPTOR_SIZE,
 		.bDescriptorType = UDESC_ENDPOINT,
 		.bEndpointAddress = UE_DIR_IN | USBROOTHUB_INTR_ENDPT,
 		.bmAttributes = UE_INTERRUPT,
 		.wMaxPacketSize = USETWD(8),			/* max packet */
 		.bInterval = 12,
 	},
 };
 static const struct usb3_roothub_descriptors usbroothub_confd3 = {
 	.urh_confd = {
 		.bLength = USB_CONFIG_DESCRIPTOR_SIZE,
 		.bDescriptorType = UDESC_CONFIG,
 		.wTotalLength = USETWD(sizeof(usbroothub_confd3)),
 		.bNumInterface = 1,
 		.bConfigurationValue = 1,
 		.iConfiguration = 0,
 		.bmAttributes = UC_SELF_POWERED,		/* 10.13.1 */
 		.bMaxPower = 0,
 	},
 	.urh_ifcd = {
 		.bLength = USB_INTERFACE_DESCRIPTOR_SIZE,
 		.bDescriptorType = UDESC_INTERFACE,
 		.bInterfaceNumber = 0,
 		.bAlternateSetting = 0,
 		.bNumEndpoints = 1,
 		.bInterfaceClass = UICLASS_HUB,
 		.bInterfaceSubClass = UISUBCLASS_HUB,
 		.bInterfaceProtocol = 0,			/* UIPROTO_SSHUB ??? */
 		.iInterface = 0
 	},
 	.urh_endpd = {
 		.bLength = USB_ENDPOINT_DESCRIPTOR_SIZE,
 		.bDescriptorType = UDESC_ENDPOINT,
 		.bEndpointAddress = UE_DIR_IN | USBROOTHUB_INTR_ENDPT,
 		.bmAttributes = UE_INTERRUPT,
 		.wMaxPacketSize = USETWD(2),			/* max packet */
 		.bInterval = 8,
 	},
 	.urh_endpssd = {
 		.bLength = USB_ENDPOINT_SS_COMP_DESCRIPTOR_SIZE,
 		.bDescriptorType = UDESC_ENDPOINT_SS_COMP,
 		.bMaxBurst = 0,
 		.bmAttributes = 0,
 		.wBytesPerInterval = USETWD(2)
 	},
 };
 static const struct usb3_roothub_bos_descriptors usbroothub_bosd3 = {
 	.urh_bosd = {
 		.bLength = USB_BOS_DESCRIPTOR_SIZE,
 		.bDescriptorType = UDESC_BOS,
 		.wTotalLength = USETWD(sizeof(usbroothub_bosd3)),
 		.bNumDeviceCaps = 3,
 	},
 	/* 9.6.2.1 USB 2.0 Extension */
 	.urh_usb2extd = {
 		.bLength = USB_DEVCAP_USB2EXT_DESCRIPTOR_SIZE,
 		.bDescriptorType = 1,
 		.bDevCapabilityType = 2,
 		.bmAttributes[0] = 2,
 	},
 	/* 9.6.2.2 Superspeed device capability */
 	.urh_ssd = {
 		.bLength = USB_DEVCAP_SS_DESCRIPTOR_SIZE,
 		.bDescriptorType = UDESC_DEVICE_CAPABILITY,
 		.bDevCapabilityType = USB_DEVCAP_SUPER_SPEED,
 		.bmAttributes = 0,	/* USB_DEVCAP_SS_LTM */
 		.wSpeedsSupported = USETWD(
 		    USB_DEVCAP_SS_SPEED_LS | USB_DEVCAP_SS_SPEED_FS |
 		    USB_DEVCAP_SS_SPEED_HS | USB_DEVCAP_SS_SPEED_SS),
 		.bFunctionalitySupport = 8,		/* SS is 3, i.e. 1 << 3? */
 		.bU1DevExitLat = 255,		/* Dummy... 0? */
 		.wU2DevExitLat = USETWD(8),	/* Also dummy... 0? */
 	},
 	/* 9.6.2.3 Container ID  - see RFC 4122 */
 	.urh_containerd = {
 		.bLength = USB_DEVCAP_CONTAINER_ID_DESCRIPTOR_SIZE,
 		.bDescriptorType = 1,
 		.bDevCapabilityType = 4,
 		.bReserved = 0,
 		// ContainerID will be zero
 	},
 };
 static const usb_hub_descriptor_t usbroothub_hubd = {
 	.bDescLength = USB_HUB_DESCRIPTOR_SIZE,
 	.bDescriptorType = UDESC_HUB,
 	.bNbrPorts = 1,
 	.wHubCharacteristics = USETWD(UHD_PWR_NO_SWITCH | UHD_OC_INDIVIDUAL),
 	.bPwrOn2PwrGood = 50,
 	.bHubContrCurrent = 0,
 	.DeviceRemovable = {0},		/* port is removable */
 };
 /*
  * Simulate a hardware hub by handling all the necessary requests.
  */
 @@ -300,36 +394,42 @@ roothub_ctrl_start(struct usbd_xfer *xfe
 			uint8_t *out = buf;
 			*out = bus->ub_rhconf;
 			buflen = sizeof(*out);
+		}
 		break;
 	case C(UR_GET_DESCRIPTOR, UT_READ_DEVICE):
 		USBHIST_LOG(usbdebug, "wValue=%#4jx", value, 0, 0, 0);
 		if (len == 0)
 			break;
 		switch (value) {
 		case C(0, UDESC_DEVICE):
-			if (bus->ub_revision == USBREV_2_0) {
+			if (bus->ub_revision >= USBREV_3_0) {
 				buflen = min(len, sizeof(usbroothub_devd3));
 				memcpy(buf, &usbroothub_devd3, buflen);
 			} else if (bus->ub_revision == USBREV_2_0) {
 				buflen = min(len, sizeof(usbroothub_devd2));
 				memcpy(buf, &usbroothub_devd2, buflen);
 			} else {
 				buflen = min(len, sizeof(usbroothub_devd1));
 				memcpy(buf, &usbroothub_devd1, buflen);
+			}
 			break;
 		case C(0, UDESC_CONFIG):
-			if (bus->ub_revision == USBREV_2_0) {
+			if (bus->ub_revision >= USBREV_3_0) {
 				buflen = min(len, sizeof(usbroothub_confd3));
 				memcpy(buf, &usbroothub_confd3, buflen);
 			} else if (bus->ub_revision == USBREV_2_0) {
 				buflen = min(len, sizeof(usbroothub_confd2));
 				memcpy(buf, &usbroothub_confd2, buflen);
 			} else {
 				buflen = min(len, sizeof(usbroothub_confd1));
 				memcpy(buf, &usbroothub_confd1, buflen);
+			}
 			break;
 		case C(0, UDESC_DEVICE_QUALIFIER):
 			if (bus->ub_revision == USBREV_2_0) {
 				/*
 				 * We can't really operate at another speed,
 				 * but the spec says we need this descriptor.
 				 */
 @@ -344,26 +444,33 @@ roothub_ctrl_start(struct usbd_xfer *xfe
 				/*
 				 * We can't really operate at another speed,
 				 * but the spec says we need this descriptor.
 				 */
 				buflen = min(len, sizeof(usbroothub_confd2));
 				memcpy(&confd, &usbroothub_confd2, buflen);
 				confd.urh_confd.bDescriptorType =
 				    UDESC_OTHER_SPEED_CONFIGURATION;
 				memcpy(buf, &confd, buflen);
 			} else
 				goto fail;
 			break;
 		case C(0, UDESC_BOS):
 			if (bus->ub_revision >= USBREV_3_0) {
 				buflen = min(len, sizeof(usbroothub_bosd3));
 				memcpy(buf, &usbroothub_bosd3, buflen);
 			} else
 				goto fail;
 			break;
 #define sd ((usb_string_descriptor_t *)buf)
 		case C(0, UDESC_STRING):
 			/* Language table */
 			buflen = usb_makelangtbl(sd, len);
 			break;
 		case C(1, UDESC_STRING):
 			/* Vendor */
 			buflen = usb_makestrdesc(sd, len, "NetBSD");
 			break;
 		case C(2, UDESC_STRING):
 			/* Product */
 			buflen = usb_makestrdesc(sd, len, "Root hub");
 			break;

 @@ -1,14 +1,14 @@
-/* $NetBSD: usbroothub.h,v 1.2 2016/04/23 10:15:32 skrll Exp $ */
+/* $NetBSD: usbroothub.h,v 1.3 2017/11/28 07:36:08 skrll Exp $ */
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Nick Hudson
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -28,16 +28,30 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 int usb_makestrdesc(usb_string_descriptor_t *, int, const char *);
 int usb_makelangtbl(usb_string_descriptor_t *, int);
 struct usb_roothub_descriptors {
 	usb_config_descriptor_t urh_confd;
 	usb_interface_descriptor_t urh_ifcd;
 	usb_endpoint_descriptor_t urh_endpd;
 };
 struct usb3_roothub_descriptors {
 	usb_config_descriptor_t urh_confd;
 	usb_interface_descriptor_t urh_ifcd;
 	usb_endpoint_descriptor_t urh_endpd;
 	usb_endpoint_ss_comp_descriptor_t urh_endpssd;
 };
 struct usb3_roothub_bos_descriptors {
 	usb_bos_descriptor_t urh_bosd;
 	usb_devcap_usb2ext_descriptor_t urh_usb2extd;
 	usb_devcap_ss_descriptor_t urh_ssd;
 	usb_devcap_container_id_descriptor_t urh_containerd;
 };
 #define	USBROOTHUB_INTR_ENDPT	1
 extern const struct usbd_pipe_methods roothub_ctrl_methods;