From patchwork Wed Jan 12 11:20:04 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 78569 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 68923B6F2B for ; Thu, 13 Jan 2011 00:26:43 +1100 (EST) Received: from localhost ([127.0.0.1]:36419 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PczK6-0000l4-Kp for incoming@patchwork.ozlabs.org; Wed, 12 Jan 2011 06:57:06 -0500 Received: from [140.186.70.92] (port=56149 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pcyl6-0006CN-7B for qemu-devel@nongnu.org; Wed, 12 Jan 2011 06:20:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Pcyl2-0001b1-NG for qemu-devel@nongnu.org; Wed, 12 Jan 2011 06:20:55 -0500 Received: from mx1.redhat.com ([209.132.183.28]:9460) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Pcyl2-0001al-GI for qemu-devel@nongnu.org; Wed, 12 Jan 2011 06:20:52 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id p0CBKpqH008311 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 12 Jan 2011 06:20:52 -0500 Received: from rincewind.home.kraxel.org (vpn2-8-125.ams2.redhat.com [10.36.8.125]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p0CBKjJG026810; Wed, 12 Jan 2011 06:20:47 -0500 Received: by rincewind.home.kraxel.org (Postfix, from userid 500) id E51044161E; Wed, 12 Jan 2011 12:20:15 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Wed, 12 Jan 2011 12:20:04 +0100 Message-Id: <1294831214-4499-23-git-send-email-kraxel@redhat.com> In-Reply-To: <1294831214-4499-1-git-send-email-kraxel@redhat.com> References: <1294831214-4499-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: Gerd Hoffmann Subject: [Qemu-devel] [PATCH v4 22/32] usb: add speed mask to ports X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Add a field to usb ports indicating the speed(s) they are able to handle. Signed-off-by: Gerd Hoffmann --- hw/usb-bus.c | 3 ++- hw/usb-hub.c | 3 ++- hw/usb-musb.c | 3 ++- hw/usb-ohci.c | 3 ++- hw/usb-uhci.c | 3 ++- hw/usb.h | 9 ++++++++- 6 files changed, 18 insertions(+), 6 deletions(-) diff --git a/hw/usb-bus.c b/hw/usb-bus.c index 9dc8793..e94b88d 100644 --- a/hw/usb-bus.c +++ b/hw/usb-bus.c @@ -113,7 +113,7 @@ USBDevice *usb_create_simple(USBBus *bus, const char *name) } void usb_register_port(USBBus *bus, USBPort *port, void *opaque, int index, - USBDevice *pdev, USBPortOps *ops) + USBDevice *pdev, USBPortOps *ops, int speedmask) { port->opaque = opaque; port->index = index; @@ -121,6 +121,7 @@ void usb_register_port(USBBus *bus, USBPort *port, void *opaque, int index, port->opaque = opaque; port->index = index; port->ops = ops; + port->speedmask = speedmask; QTAILQ_INSERT_TAIL(&bus->free, port, next); bus->nfree++; } diff --git a/hw/usb-hub.c b/hw/usb-hub.c index 8a80151..ba712d6 100644 --- a/hw/usb-hub.c +++ b/hw/usb-hub.c @@ -526,7 +526,8 @@ static int usb_hub_initfn(USBDevice *dev) for (i = 0; i < NUM_PORTS; i++) { port = &s->ports[i]; usb_register_port(usb_bus_from_device(dev), - &port->port, s, i, &s->dev, &usb_hub_port_ops); + &port->port, s, i, &s->dev, &usb_hub_port_ops, + USB_SPEED_MASK_LOW | USB_SPEED_MASK_FULL); port->wPortStatus = PORT_STAT_POWER; port->wPortChange = 0; } diff --git a/hw/usb-musb.c b/hw/usb-musb.c index 233a265..87eb9ca 100644 --- a/hw/usb-musb.c +++ b/hw/usb-musb.c @@ -349,7 +349,8 @@ struct MUSBState { } usb_bus_new(&s->bus, NULL /* FIXME */); - usb_register_port(&s->bus, &s->port, s, 0, NULL, &musb_port_ops); + usb_register_port(&s->bus, &s->port, s, 0, NULL, &musb_port_ops, + USB_SPEED_MASK_LOW | USB_SPEED_MASK_FULL); return s; } diff --git a/hw/usb-ohci.c b/hw/usb-ohci.c index c859540..0d42716 100644 --- a/hw/usb-ohci.c +++ b/hw/usb-ohci.c @@ -1699,7 +1699,8 @@ static void usb_ohci_init(OHCIState *ohci, DeviceState *dev, usb_bus_new(&ohci->bus, dev); ohci->num_ports = num_ports; for (i = 0; i < num_ports; i++) { - usb_register_port(&ohci->bus, &ohci->rhport[i].port, ohci, i, NULL, &ohci_port_ops); + usb_register_port(&ohci->bus, &ohci->rhport[i].port, ohci, i, NULL, &ohci_port_ops, + USB_SPEED_MASK_LOW | USB_SPEED_MASK_FULL); } ohci->async_td = 0; diff --git a/hw/usb-uhci.c b/hw/usb-uhci.c index 2d2a9e7..253561f 100644 --- a/hw/usb-uhci.c +++ b/hw/usb-uhci.c @@ -1129,7 +1129,8 @@ static int usb_uhci_common_initfn(UHCIState *s) usb_bus_new(&s->bus, &s->dev.qdev); for(i = 0; i < NB_PORTS; i++) { - usb_register_port(&s->bus, &s->ports[i].port, s, i, NULL, &uhci_port_ops); + usb_register_port(&s->bus, &s->ports[i].port, s, i, NULL, &uhci_port_ops, + USB_SPEED_MASK_LOW | USB_SPEED_MASK_FULL); } s->frame_timer = qemu_new_timer(vm_clock, uhci_frame_timer, s); s->expire_time = qemu_get_clock(vm_clock) + diff --git a/hw/usb.h b/hw/usb.h index 250ec71..407a114 100644 --- a/hw/usb.h +++ b/hw/usb.h @@ -44,6 +44,12 @@ #define USB_SPEED_LOW 0 #define USB_SPEED_FULL 1 #define USB_SPEED_HIGH 2 +#define USB_SPEED_SUPER 3 + +#define USB_SPEED_MASK_LOW (1 << USB_SPEED_LOW) +#define USB_SPEED_MASK_FULL (1 << USB_SPEED_FULL) +#define USB_SPEED_MASK_HIGH (1 << USB_SPEED_HIGH) +#define USB_SPEED_MASK_SUPER (1 << USB_SPEED_SUPER) #define USB_STATE_NOTATTACHED 0 #define USB_STATE_ATTACHED 1 @@ -226,6 +232,7 @@ typedef struct USBPortOps { /* USB port on which a device can be connected */ struct USBPort { USBDevice *dev; + int speedmask; USBPortOps *ops; void *opaque; USBDevice *pdev; @@ -339,7 +346,7 @@ USBDevice *usb_create(USBBus *bus, const char *name); USBDevice *usb_create_simple(USBBus *bus, const char *name); USBDevice *usbdevice_create(const char *cmdline); void usb_register_port(USBBus *bus, USBPort *port, void *opaque, int index, - USBDevice *pdev, USBPortOps *ops); + USBDevice *pdev, USBPortOps *ops, int speedmask); void usb_unregister_port(USBBus *bus, USBPort *port); int usb_device_attach(USBDevice *dev); int usb_device_detach(USBDevice *dev);