PERFORCE change 181679 for review

[Hans Petter Selasky]

http://p4web.freebsd.org/@@181679?ac=10

Change 181679 by hselasky at hselasky_laptop001 on 2010/08/01 12:49:57

	USB controller:
		- correct HUB and interface protocol fields
		- remove unused structures

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/controller/at91dci.c#33 edit
.. //depot/projects/usb/src/sys/dev/usb/controller/atmegadci.c#45 edit
.. //depot/projects/usb/src/sys/dev/usb/controller/avr32dci.c#18 edit
.. //depot/projects/usb/src/sys/dev/usb/controller/ehci.c#56 edit
.. //depot/projects/usb/src/sys/dev/usb/controller/musb_otg.c#34 edit
.. //depot/projects/usb/src/sys/dev/usb/controller/octusb.c#7 edit
.. //depot/projects/usb/src/sys/dev/usb/controller/ohci.c#37 edit
.. //depot/projects/usb/src/sys/dev/usb/controller/uss820dci.c#33 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/controller/at91dci.c#33 (text+ko) ====

@@ -1689,7 +1689,7 @@
 	.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 @@
 	.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 @@
 		.bNumEndpoints = 1,
 		.bInterfaceClass = UICLASS_HUB,
 		.bInterfaceSubClass = UISUBCLASS_HUB,
-		.bInterfaceProtocol = UIPROTO_HSHUBSTT,
+		.bInterfaceProtocol = 0,
 	},
 	.endpd = {
 		.bLength = sizeof(struct usb_endpoint_descriptor),

==== //depot/projects/usb/src/sys/dev/usb/controller/atmegadci.c#45 (text+ko) ====

@@ -1511,7 +1511,7 @@
 	.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 @@
 	.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 @@
 		.bNumEndpoints = 1,
 		.bInterfaceClass = UICLASS_HUB,
 		.bInterfaceSubClass = UISUBCLASS_HUB,
-		.bInterfaceProtocol = UIPROTO_HSHUBSTT,
+		.bInterfaceProtocol = 0,
 	},
 	.endpd = {
 		.bLength = sizeof(struct usb_endpoint_descriptor),

==== //depot/projects/usb/src/sys/dev/usb/controller/avr32dci.c#18 (text+ko) ====

@@ -1480,7 +1480,7 @@
 		.bNumEndpoints = 1,
 		.bInterfaceClass = UICLASS_HUB,
 		.bInterfaceSubClass = UISUBCLASS_HUB,
-		.bInterfaceProtocol = UIPROTO_HSHUBSTT,
+		.bInterfaceProtocol = 0,
 	},
 	.endpd = {
 		.bLength = sizeof(struct usb_endpoint_descriptor),

==== //depot/projects/usb/src/sys/dev/usb/controller/ehci.c#56 (text+ko) ====

@@ -3063,8 +3063,7 @@
 		.bNumEndpoints = 1,
 		.bInterfaceClass = UICLASS_HUB,
 		.bInterfaceSubClass = UISUBCLASS_HUB,
-		.bInterfaceProtocol = UIPROTO_HSHUBSTT,
-		0
+		.bInterfaceProtocol = 0,
 	},
 	.endpd = {
 		.bLength = sizeof(struct usb_endpoint_descriptor),

==== //depot/projects/usb/src/sys/dev/usb/controller/musb_otg.c#34 (text+ko) ====

@@ -2181,7 +2181,7 @@
 		.bNumEndpoints = 1,
 		.bInterfaceClass = UICLASS_HUB,
 		.bInterfaceSubClass = UISUBCLASS_HUB,
-		.bInterfaceProtocol = UIPROTO_HSHUBSTT,
+		.bInterfaceProtocol = 0,
 	},
 	.endpd = {
 		.bLength = sizeof(struct usb_endpoint_descriptor),

==== //depot/projects/usb/src/sys/dev/usb/controller/octusb.c#7 (text+ko) ====

@@ -1352,7 +1352,7 @@
 	.bcdUSB = {0x00, 0x02},
 	.bDeviceClass = UDCLASS_HUB,
 	.bDeviceSubClass = UDSUBCLASS_HUB,
-	.bDeviceProtocol = UDPROTO_FSHUB,
+	.bDeviceProtocol = UDPROTO_HSHUBSTT,
 	.bMaxPacketSize = 64,
 	.idVendor = {0},
 	.idProduct = {0},
@@ -1394,7 +1394,7 @@
 		.bNumEndpoints = 1,
 		.bInterfaceClass = UICLASS_HUB,
 		.bInterfaceSubClass = UISUBCLASS_HUB,
-		.bInterfaceProtocol = UIPROTO_FSHUB,
+		.bInterfaceProtocol = 0,
 	},
 	.endpd = {
 		.bLength = sizeof(struct usb_endpoint_descriptor),

==== //depot/projects/usb/src/sys/dev/usb/controller/ohci.c#37 (text+ko) ====

@@ -2105,7 +2105,7 @@
 		.bNumEndpoints = 1,
 		.bInterfaceClass = UICLASS_HUB,
 		.bInterfaceSubClass = UISUBCLASS_HUB,
-		.bInterfaceProtocol = UIPROTO_FSHUB,
+		.bInterfaceProtocol = 0,
 	},
 	.endpd = {
 		.bLength = sizeof(struct usb_endpoint_descriptor),

==== //depot/projects/usb/src/sys/dev/usb/controller/uss820dci.c#33 (text+ko) ====

@@ -1740,7 +1740,7 @@
 	.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 @@
 		.bNumEndpoints = 1,
 		.bInterfaceClass = UICLASS_HUB,
 		.bInterfaceSubClass = UISUBCLASS_HUB,
-		.bInterfaceProtocol = UIPROTO_HSHUBSTT,
+		.bInterfaceProtocol = 0,
 	},
 
 	.endpd = {