qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Gerd Hoffmann <kraxel@redhat.com>
Subject: [Qemu-devel] [PATCH 22/23] usb-hub: remove unused descriptor arrays
Date: Fri,  8 Jul 2011 11:51:12 +0200	[thread overview]
Message-ID: <1310118673-26196-23-git-send-email-kraxel@redhat.com> (raw)
In-Reply-To: <1310118673-26196-1-git-send-email-kraxel@redhat.com>

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.1

  parent reply	other threads:[~2011-07-08  9:51 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-07-08  9:50 [Qemu-devel] [PULL] usb patch queue Gerd Hoffmann
2011-07-08  9:50 ` [Qemu-devel] [PATCH 01/23] hw/usb-musb.c: Don't misuse usb_packet_complete() Gerd Hoffmann
2011-07-08  9:50 ` [Qemu-devel] [PATCH 02/23] usb: Add a usb_fill_port helper function Gerd Hoffmann
2011-07-08  9:50 ` [Qemu-devel] [PATCH 03/23] usb: Move (initial) call of usb_port_location to usb_fill_port Gerd Hoffmann
2011-07-08  9:50 ` [Qemu-devel] [PATCH 04/23] usb: Add a register_companion USB bus op Gerd Hoffmann
2011-07-08  9:50 ` [Qemu-devel] [PATCH 05/23] usb: Make port wakeup and complete ops take a USBPort instead of a Device Gerd Hoffmann
2011-07-08  9:50 ` [Qemu-devel] [PATCH 06/23] usb: Replace device_destroy bus op with a child_detach port op Gerd Hoffmann
2011-07-08  9:50 ` [Qemu-devel] [PATCH 07/23] usb-ehci: drop unused num-ports state member Gerd Hoffmann
2011-07-08  9:50 ` [Qemu-devel] [PATCH 08/23] usb-ehci: Connect Status bit is read only, don't allow changing it by the guest Gerd Hoffmann
2011-07-08  9:50 ` [Qemu-devel] [PATCH 09/23] usb-ehci: cleanup port reset handling Gerd Hoffmann
2011-07-08  9:51 ` [Qemu-devel] [PATCH 10/23] usb: assert on calling usb_attach(port, NULL) on a port without a dev Gerd Hoffmann
2011-07-08  9:51 ` [Qemu-devel] [PATCH 11/23] usb-ehci: Fix handling of PED and PEDC port status bits Gerd Hoffmann
2011-07-08  9:51 ` [Qemu-devel] [PATCH 12/23] usb-ehci: Add support for registering companion controllers Gerd Hoffmann
2011-07-08  9:51 ` [Qemu-devel] [PATCH 13/23] usb-uhci: Add support for being a companion controller Gerd Hoffmann
2011-07-08  9:51 ` [Qemu-devel] [PATCH 14/23] usb-ohci: " Gerd Hoffmann
2011-07-08  9:51 ` [Qemu-devel] [PATCH 15/23] pci: add ich9 usb controller ids Gerd Hoffmann
2011-07-08  9:51 ` [Qemu-devel] [PATCH 16/23] uhci: add ich9 controllers Gerd Hoffmann
2011-07-08  9:51 ` [Qemu-devel] [PATCH 17/23] ehci: fix port count Gerd Hoffmann
2011-07-08  9:51 ` [Qemu-devel] [PATCH 18/23] ehci: add ich9 controller Gerd Hoffmann
2011-07-08  9:51 ` [Qemu-devel] [PATCH 19/23] usb: update documentation Gerd Hoffmann
2011-07-08  9:51 ` [Qemu-devel] [PATCH 20/23] usb_register_port(): do not set port->opaque and port->index twice Gerd Hoffmann
2011-07-08  9:51 ` [Qemu-devel] [PATCH 21/23] usb: fixup bluetooth descriptors Gerd Hoffmann
2011-07-08  9:51 ` Gerd Hoffmann [this message]
2011-07-08  9:51 ` [Qemu-devel] [PATCH 23/23] usb-ohci: raise interrupt on attach Gerd Hoffmann
2011-07-12 14:52 ` [Qemu-devel] [PULL] usb patch queue Gerd Hoffmann
2011-07-19 15:59 ` Anthony Liguori

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1310118673-26196-23-git-send-email-kraxel@redhat.com \
    --to=kraxel@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).