From d9c7f506bea5ed587ecf2178276e4bf82e370a67 Mon Sep 17 00:00:00 2001

From: Gerd Hoffmann <kraxel@redhat.com>

Date: Thu, 7 Jul 2011 15:02:58 +0200

Subject: [PATCH 22/35] usb-hub: remove unused descriptor arrays

Somehow they where left over when converting the hub

to the new usb descriptor infrastructure ...

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

---

 hw/usb-hub.c |   68 ----------------------------------------------------------

 1 files changed, 0 insertions(+), 68 deletions(-)

diff --git a/hw/usb-hub.c b/hw/usb-hub.c

index b7557ce..b49a2fe 100644

--- a/hw/usb-hub.c

+++ b/hw/usb-hub.c

@@ -138,74 +138,6 @@ static const USBDesc desc_hub = {

     .str  = desc_strings,

 };

-static const uint8_t qemu_hub_dev_descriptor[] = {

-	0x12,       /*  u8 bLength; */

-	0x01,       /*  u8 bDescriptorType; Device */

-	0x10, 0x01, /*  u16 bcdUSB; v1.1 */

-

-	0x09,	    /*  u8  bDeviceClass; HUB_CLASSCODE */

-	0x00,	    /*  u8  bDeviceSubClass; */

-	0x00,       /*  u8  bDeviceProtocol; [ low/full speeds only ] */

-	0x08,       /*  u8  bMaxPacketSize0; 8 Bytes */

-

-	0x00, 0x00, /*  u16 idVendor; */

- 	0x00, 0x00, /*  u16 idProduct; */

-	0x01, 0x01, /*  u16 bcdDevice */

-

-	0x03,       /*  u8  iManufacturer; */

-	0x02,       /*  u8  iProduct; */

-	0x01,       /*  u8  iSerialNumber; */

-	0x01        /*  u8  bNumConfigurations; */

-};

-

-/* XXX: patch interrupt size */

-static const uint8_t qemu_hub_config_descriptor[] = {

-

-	/* one configuration */

-	0x09,       /*  u8  bLength; */

-	0x02,       /*  u8  bDescriptorType; Configuration */

-	0x19, 0x00, /*  u16 wTotalLength; */

-	0x01,       /*  u8  bNumInterfaces; (1) */

-	0x01,       /*  u8  bConfigurationValue; */

-	0x00,       /*  u8  iConfiguration; */

-	0xe0,       /*  u8  bmAttributes;

-				 Bit 7: must be set,

-				     6: Self-powered,

-				     5: Remote wakeup,

-				     4..0: resvd */

-	0x00,       /*  u8  MaxPower; */

-

-	/* USB 1.1:

-	 * USB 2.0, single TT organization (mandatory):

-	 *	one interface, protocol 0

-	 *

-	 * USB 2.0, multiple TT organization (optional):

-	 *	two interfaces, protocols 1 (like single TT)

-	 *	and 2 (multiple TT mode) ... config is

-	 *	sometimes settable

-	 *	NOT IMPLEMENTED

-	 */

-

-	/* one interface */

-	0x09,       /*  u8  if_bLength; */

-	0x04,       /*  u8  if_bDescriptorType; Interface */

-	0x00,       /*  u8  if_bInterfaceNumber; */

-	0x00,       /*  u8  if_bAlternateSetting; */

-	0x01,       /*  u8  if_bNumEndpoints; */

-	0x09,       /*  u8  if_bInterfaceClass; HUB_CLASSCODE */

-	0x00,       /*  u8  if_bInterfaceSubClass; */

-	0x00,       /*  u8  if_bInterfaceProtocol; [usb1.1 or single tt] */

-	0x00,       /*  u8  if_iInterface; */

-

-	/* one endpoint (status change endpoint) */

-	0x07,       /*  u8  ep_bLength; */

-	0x05,       /*  u8  ep_bDescriptorType; Endpoint */

-	0x81,       /*  u8  ep_bEndpointAddress; IN Endpoint 1 */

- 	0x03,       /*  u8  ep_bmAttributes; Interrupt */

- 	0x02, 0x00, /*  u16 ep_wMaxPacketSize; 1 + (MAX_ROOT_PORTS / 8) */

-	0xff        /*  u8  ep_bInterval; (255ms -- usb 2.0 spec) */

-};

-

 static const uint8_t qemu_hub_hub_descriptor[] =

 {

 	0x00,			/*  u8  bLength; patched in later */

-- 

1.7.5.1