|
 |
3f1f29 |
From d9c7f506bea5ed587ecf2178276e4bf82e370a67 Mon Sep 17 00:00:00 2001
|
|
|
3f1f29 |
From: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
3f1f29 |
Date: Thu, 7 Jul 2011 15:02:58 +0200
|
|
|
3f1f29 |
Subject: [PATCH 22/35] usb-hub: remove unused descriptor arrays
|
|
|
3f1f29 |
|
|
|
3f1f29 |
Somehow they where left over when converting the hub
|
|
|
3f1f29 |
to the new usb descriptor infrastructure ...
|
|
|
3f1f29 |
|
|
|
3f1f29 |
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
3f1f29 |
---
|
|
|
3f1f29 |
hw/usb-hub.c | 68 ----------------------------------------------------------
|
|
|
3f1f29 |
1 files changed, 0 insertions(+), 68 deletions(-)
|
|
|
3f1f29 |
|
|
|
3f1f29 |
diff --git a/hw/usb-hub.c b/hw/usb-hub.c
|
|
|
3f1f29 |
index b7557ce..b49a2fe 100644
|
|
|
3f1f29 |
--- a/hw/usb-hub.c
|
|
|
3f1f29 |
+++ b/hw/usb-hub.c
|
|
|
3f1f29 |
@@ -138,74 +138,6 @@ static const USBDesc desc_hub = {
|
|
|
3f1f29 |
.str = desc_strings,
|
|
|
3f1f29 |
};
|
|
|
3f1f29 |
|
|
|
3f1f29 |
-static const uint8_t qemu_hub_dev_descriptor[] = {
|
|
|
3f1f29 |
- 0x12, /* u8 bLength; */
|
|
|
3f1f29 |
- 0x01, /* u8 bDescriptorType; Device */
|
|
|
3f1f29 |
- 0x10, 0x01, /* u16 bcdUSB; v1.1 */
|
|
|
3f1f29 |
-
|
|
|
3f1f29 |
- 0x09, /* u8 bDeviceClass; HUB_CLASSCODE */
|
|
|
3f1f29 |
- 0x00, /* u8 bDeviceSubClass; */
|
|
|
3f1f29 |
- 0x00, /* u8 bDeviceProtocol; [ low/full speeds only ] */
|
|
|
3f1f29 |
- 0x08, /* u8 bMaxPacketSize0; 8 Bytes */
|
|
|
3f1f29 |
-
|
|
|
3f1f29 |
- 0x00, 0x00, /* u16 idVendor; */
|
|
|
3f1f29 |
- 0x00, 0x00, /* u16 idProduct; */
|
|
|
3f1f29 |
- 0x01, 0x01, /* u16 bcdDevice */
|
|
|
3f1f29 |
-
|
|
|
3f1f29 |
- 0x03, /* u8 iManufacturer; */
|
|
|
3f1f29 |
- 0x02, /* u8 iProduct; */
|
|
|
3f1f29 |
- 0x01, /* u8 iSerialNumber; */
|
|
|
3f1f29 |
- 0x01 /* u8 bNumConfigurations; */
|
|
|
3f1f29 |
-};
|
|
|
3f1f29 |
-
|
|
|
3f1f29 |
-/* XXX: patch interrupt size */
|
|
|
3f1f29 |
-static const uint8_t qemu_hub_config_descriptor[] = {
|
|
|
3f1f29 |
-
|
|
|
3f1f29 |
- /* one configuration */
|
|
|
3f1f29 |
- 0x09, /* u8 bLength; */
|
|
|
3f1f29 |
- 0x02, /* u8 bDescriptorType; Configuration */
|
|
|
3f1f29 |
- 0x19, 0x00, /* u16 wTotalLength; */
|
|
|
3f1f29 |
- 0x01, /* u8 bNumInterfaces; (1) */
|
|
|
3f1f29 |
- 0x01, /* u8 bConfigurationValue; */
|
|
|
3f1f29 |
- 0x00, /* u8 iConfiguration; */
|
|
|
3f1f29 |
- 0xe0, /* u8 bmAttributes;
|
|
|
3f1f29 |
- Bit 7: must be set,
|
|
|
3f1f29 |
- 6: Self-powered,
|
|
|
3f1f29 |
- 5: Remote wakeup,
|
|
|
3f1f29 |
- 4..0: resvd */
|
|
|
3f1f29 |
- 0x00, /* u8 MaxPower; */
|
|
|
3f1f29 |
-
|
|
|
3f1f29 |
- /* USB 1.1:
|
|
|
3f1f29 |
- * USB 2.0, single TT organization (mandatory):
|
|
|
3f1f29 |
- * one interface, protocol 0
|
|
|
3f1f29 |
- *
|
|
|
3f1f29 |
- * USB 2.0, multiple TT organization (optional):
|
|
|
3f1f29 |
- * two interfaces, protocols 1 (like single TT)
|
|
|
3f1f29 |
- * and 2 (multiple TT mode) ... config is
|
|
|
3f1f29 |
- * sometimes settable
|
|
|
3f1f29 |
- * NOT IMPLEMENTED
|
|
|
3f1f29 |
- */
|
|
|
3f1f29 |
-
|
|
|
3f1f29 |
- /* one interface */
|
|
|
3f1f29 |
- 0x09, /* u8 if_bLength; */
|
|
|
3f1f29 |
- 0x04, /* u8 if_bDescriptorType; Interface */
|
|
|
3f1f29 |
- 0x00, /* u8 if_bInterfaceNumber; */
|
|
|
3f1f29 |
- 0x00, /* u8 if_bAlternateSetting; */
|
|
|
3f1f29 |
- 0x01, /* u8 if_bNumEndpoints; */
|
|
|
3f1f29 |
- 0x09, /* u8 if_bInterfaceClass; HUB_CLASSCODE */
|
|
|
3f1f29 |
- 0x00, /* u8 if_bInterfaceSubClass; */
|
|
|
3f1f29 |
- 0x00, /* u8 if_bInterfaceProtocol; [usb1.1 or single tt] */
|
|
|
3f1f29 |
- 0x00, /* u8 if_iInterface; */
|
|
|
3f1f29 |
-
|
|
|
3f1f29 |
- /* one endpoint (status change endpoint) */
|
|
|
3f1f29 |
- 0x07, /* u8 ep_bLength; */
|
|
|
3f1f29 |
- 0x05, /* u8 ep_bDescriptorType; Endpoint */
|
|
|
3f1f29 |
- 0x81, /* u8 ep_bEndpointAddress; IN Endpoint 1 */
|
|
|
3f1f29 |
- 0x03, /* u8 ep_bmAttributes; Interrupt */
|
|
|
3f1f29 |
- 0x02, 0x00, /* u16 ep_wMaxPacketSize; 1 + (MAX_ROOT_PORTS / 8) */
|
|
|
3f1f29 |
- 0xff /* u8 ep_bInterval; (255ms -- usb 2.0 spec) */
|
|
|
3f1f29 |
-};
|
|
|
3f1f29 |
-
|
|
|
3f1f29 |
static const uint8_t qemu_hub_hub_descriptor[] =
|
|
|
3f1f29 |
{
|
|
|
3f1f29 |
0x00, /* u8 bLength; patched in later */
|
|
|
3f1f29 |
--
|
|
|
3f1f29 |
1.7.5.1
|
|
|
3f1f29 |
|