Author: hselasky
Date: Wed Oct 13 20:37:19 2010
New Revision: 213802
URL: http://svn.freebsd.org/changeset/base/213802
Log:
Correct some root HUB descriptor fields in multiple controller drivers.
Remove an unused structure.
Approved by: thompsa (mentor)
Modified:
head/sys/dev/usb/controller/at91dci.c
head/sys/dev/usb/controller/atmegadci.c
head/sys/dev/usb/controller/avr32dci.c
head/sys/dev/usb/controller/musb_otg.c
head/sys/dev/usb/controller/ohci.c
head/sys/dev/usb/controller/uss820dci.c
Modified: head/sys/dev/usb/controller/at91dci.c
==============================================================================
--- head/sys/dev/usb/controller/at91dci.c Wed Oct 13 20:36:42 2010
(r213801)
+++ head/sys/dev/usb/controller/at91dci.c Wed Oct 13 20:37:19 2010
(r213802)
@@ -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: head/sys/dev/usb/controller/atmegadci.c
==============================================================================
--- head/sys/dev/usb/controller/atmegadci.c Wed Oct 13 20:36:42 2010
(r213801)
+++ head/sys/dev/usb/controller/atmegadci.c Wed Oct 13 20:37:19 2010
(r213802)
@@ -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: head/sys/dev/usb/controller/avr32dci.c
==============================================================================
--- head/sys/dev/usb/controller/avr32dci.c Wed Oct 13 20:36:42 2010
(r213801)
+++ head/sys/dev/usb/controller/avr32dci.c Wed Oct 13 20:37:19 2010
(r213802)
@@ -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: head/sys/dev/usb/controller/musb_otg.c
==============================================================================
--- head/sys/dev/usb/controller/musb_otg.c Wed Oct 13 20:36:42 2010
(r213801)
+++ head/sys/dev/usb/controller/musb_otg.c Wed Oct 13 20:37:19 2010
(r213802)
@@ -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: head/sys/dev/usb/controller/ohci.c
==============================================================================
--- head/sys/dev/usb/controller/ohci.c Wed Oct 13 20:36:42 2010
(r213801)
+++ head/sys/dev/usb/controller/ohci.c Wed Oct 13 20:37:19 2010
(r213802)
@@ -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: head/sys/dev/usb/controller/uss820dci.c
==============================================================================
--- head/sys/dev/usb/controller/uss820dci.c Wed Oct 13 20:36:42 2010
(r213801)
+++ head/sys/dev/usb/controller/uss820dci.c Wed Oct 13 20:37:19 2010
(r213802)
@@ -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 = {
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
