svn commit: r215946 - stable/8/sys/dev/usb/controller

Andrew Thompson thompsa at FreeBSD.org
Sat Nov 27 19:38:41 UTC 2010


Author: thompsa
Date: Sat Nov 27 19:38:40 2010
New Revision: 215946
URL: http://svn.freebsd.org/changeset/base/215946

Log:
  MFC r213802
  
   Correct some root HUB descriptor fields in multiple controller drivers.
   Remove an unused structure.

Modified:
  stable/8/sys/dev/usb/controller/at91dci.c
  stable/8/sys/dev/usb/controller/atmegadci.c
  stable/8/sys/dev/usb/controller/avr32dci.c
  stable/8/sys/dev/usb/controller/musb_otg.c
  stable/8/sys/dev/usb/controller/ohci.c
  stable/8/sys/dev/usb/controller/uss820dci.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/mips/alchemy/   (props changed)
  stable/8/sys/mips/atheros/   (props changed)
  stable/8/sys/mips/cavium/   (props changed)
  stable/8/sys/mips/cavium/dev/   (props changed)
  stable/8/sys/mips/rmi/   (props changed)
  stable/8/sys/mips/rmi/dev/   (props changed)
  stable/8/sys/mips/sibyte/   (props changed)

Modified: stable/8/sys/dev/usb/controller/at91dci.c
==============================================================================
--- stable/8/sys/dev/usb/controller/at91dci.c	Sat Nov 27 19:37:33 2010	(r215945)
+++ stable/8/sys/dev/usb/controller/at91dci.c	Sat Nov 27 19:38:40 2010	(r215946)
@@ -1689,7 +1689,7 @@ static const struct usb_device_descripto
 	.bcdUSB = {0x00, 0x02},
 	.bDeviceClass = UDCLASS_HUB,
 	.bDeviceSubClass = UDSUBCLASS_HUB,
-	.bDeviceProtocol = UDPROTO_HSHUBSTT,
+	.bDeviceProtocol = UDPROTO_FSHUB,
 	.bMaxPacketSize = 64,
 	.bcdDevice = {0x00, 0x01},
 	.iManufacturer = 1,
@@ -1697,17 +1697,6 @@ static const struct usb_device_descripto
 	.bNumConfigurations = 1,
 };
 
-static const struct usb_device_qualifier at91dci_odevd = {
-	.bLength = sizeof(struct usb_device_qualifier),
-	.bDescriptorType = UDESC_DEVICE_QUALIFIER,
-	.bcdUSB = {0x00, 0x02},
-	.bDeviceClass = UDCLASS_HUB,
-	.bDeviceSubClass = UDSUBCLASS_HUB,
-	.bDeviceProtocol = UDPROTO_FSHUB,
-	.bMaxPacketSize0 = 0,
-	.bNumConfigurations = 0,
-};
-
 static const struct at91dci_config_desc at91dci_confd = {
 	.confd = {
 		.bLength = sizeof(struct usb_config_descriptor),
@@ -1725,7 +1714,7 @@ static const struct at91dci_config_desc 
 		.bNumEndpoints = 1,
 		.bInterfaceClass = UICLASS_HUB,
 		.bInterfaceSubClass = UISUBCLASS_HUB,
-		.bInterfaceProtocol = UIPROTO_HSHUBSTT,
+		.bInterfaceProtocol = 0,
 	},
 	.endpd = {
 		.bLength = sizeof(struct usb_endpoint_descriptor),

Modified: stable/8/sys/dev/usb/controller/atmegadci.c
==============================================================================
--- stable/8/sys/dev/usb/controller/atmegadci.c	Sat Nov 27 19:37:33 2010	(r215945)
+++ stable/8/sys/dev/usb/controller/atmegadci.c	Sat Nov 27 19:38:40 2010	(r215946)
@@ -1511,7 +1511,7 @@ static const struct usb_device_descripto
 	.bcdUSB = {0x00, 0x02},
 	.bDeviceClass = UDCLASS_HUB,
 	.bDeviceSubClass = UDSUBCLASS_HUB,
-	.bDeviceProtocol = UDPROTO_HSHUBSTT,
+	.bDeviceProtocol = UDPROTO_FSHUB,
 	.bMaxPacketSize = 64,
 	.bcdDevice = {0x00, 0x01},
 	.iManufacturer = 1,
@@ -1519,17 +1519,6 @@ static const struct usb_device_descripto
 	.bNumConfigurations = 1,
 };
 
-static const struct usb_device_qualifier atmegadci_odevd = {
-	.bLength = sizeof(struct usb_device_qualifier),
-	.bDescriptorType = UDESC_DEVICE_QUALIFIER,
-	.bcdUSB = {0x00, 0x02},
-	.bDeviceClass = UDCLASS_HUB,
-	.bDeviceSubClass = UDSUBCLASS_HUB,
-	.bDeviceProtocol = UDPROTO_FSHUB,
-	.bMaxPacketSize0 = 0,
-	.bNumConfigurations = 0,
-};
-
 static const struct atmegadci_config_desc atmegadci_confd = {
 	.confd = {
 		.bLength = sizeof(struct usb_config_descriptor),
@@ -1547,7 +1536,7 @@ static const struct atmegadci_config_des
 		.bNumEndpoints = 1,
 		.bInterfaceClass = UICLASS_HUB,
 		.bInterfaceSubClass = UISUBCLASS_HUB,
-		.bInterfaceProtocol = UIPROTO_HSHUBSTT,
+		.bInterfaceProtocol = 0,
 	},
 	.endpd = {
 		.bLength = sizeof(struct usb_endpoint_descriptor),

Modified: stable/8/sys/dev/usb/controller/avr32dci.c
==============================================================================
--- stable/8/sys/dev/usb/controller/avr32dci.c	Sat Nov 27 19:37:33 2010	(r215945)
+++ stable/8/sys/dev/usb/controller/avr32dci.c	Sat Nov 27 19:38:40 2010	(r215946)
@@ -1480,7 +1480,7 @@ static const struct avr32dci_config_desc
 		.bNumEndpoints = 1,
 		.bInterfaceClass = UICLASS_HUB,
 		.bInterfaceSubClass = UISUBCLASS_HUB,
-		.bInterfaceProtocol = UIPROTO_HSHUBSTT,
+		.bInterfaceProtocol = 0,
 	},
 	.endpd = {
 		.bLength = sizeof(struct usb_endpoint_descriptor),

Modified: stable/8/sys/dev/usb/controller/musb_otg.c
==============================================================================
--- stable/8/sys/dev/usb/controller/musb_otg.c	Sat Nov 27 19:37:33 2010	(r215945)
+++ stable/8/sys/dev/usb/controller/musb_otg.c	Sat Nov 27 19:38:40 2010	(r215946)
@@ -2181,7 +2181,7 @@ static const struct musbotg_config_desc 
 		.bNumEndpoints = 1,
 		.bInterfaceClass = UICLASS_HUB,
 		.bInterfaceSubClass = UISUBCLASS_HUB,
-		.bInterfaceProtocol = UIPROTO_HSHUBSTT,
+		.bInterfaceProtocol = 0,
 	},
 	.endpd = {
 		.bLength = sizeof(struct usb_endpoint_descriptor),

Modified: stable/8/sys/dev/usb/controller/ohci.c
==============================================================================
--- stable/8/sys/dev/usb/controller/ohci.c	Sat Nov 27 19:37:33 2010	(r215945)
+++ stable/8/sys/dev/usb/controller/ohci.c	Sat Nov 27 19:38:40 2010	(r215946)
@@ -2105,7 +2105,7 @@ struct ohci_config_desc ohci_confd =
 		.bNumEndpoints = 1,
 		.bInterfaceClass = UICLASS_HUB,
 		.bInterfaceSubClass = UISUBCLASS_HUB,
-		.bInterfaceProtocol = UIPROTO_FSHUB,
+		.bInterfaceProtocol = 0,
 	},
 	.endpd = {
 		.bLength = sizeof(struct usb_endpoint_descriptor),

Modified: stable/8/sys/dev/usb/controller/uss820dci.c
==============================================================================
--- stable/8/sys/dev/usb/controller/uss820dci.c	Sat Nov 27 19:37:33 2010	(r215945)
+++ stable/8/sys/dev/usb/controller/uss820dci.c	Sat Nov 27 19:38:40 2010	(r215946)
@@ -1740,7 +1740,7 @@ static const struct usb_device_descripto
 	.bcdUSB = {0x00, 0x02},
 	.bDeviceClass = UDCLASS_HUB,
 	.bDeviceSubClass = UDSUBCLASS_HUB,
-	.bDeviceProtocol = UDPROTO_HSHUBSTT,
+	.bDeviceProtocol = UDPROTO_FSHUB,
 	.bMaxPacketSize = 64,
 	.bcdDevice = {0x00, 0x01},
 	.iManufacturer = 1,
@@ -1776,7 +1776,7 @@ static const struct uss820dci_config_des
 		.bNumEndpoints = 1,
 		.bInterfaceClass = UICLASS_HUB,
 		.bInterfaceSubClass = UISUBCLASS_HUB,
-		.bInterfaceProtocol = UIPROTO_HSHUBSTT,
+		.bInterfaceProtocol = 0,
 	},
 
 	.endpd = {


More information about the svn-src-all mailing list