From patchwork Wed Jan 12 11:20:06 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 78574 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 0840EB6F2B for ; Thu, 13 Jan 2011 00:39:34 +1100 (EST) Received: from localhost ([127.0.0.1]:37022 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pczfb-00022e-EQ for incoming@patchwork.ozlabs.org; Wed, 12 Jan 2011 07:19:19 -0500 Received: from [140.186.70.92] (port=56128 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pcyl5-0006Bd-5O 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-0001au-H8 for qemu-devel@nongnu.org; Wed, 12 Jan 2011 06:20:53 -0500 Received: from mx1.redhat.com ([209.132.183.28]:40006) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Pcyl2-0001ad-8r for qemu-devel@nongnu.org; Wed, 12 Jan 2011 06:20:52 -0500 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id p0CBKpRw024929 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 12 Jan 2011 06:20:51 -0500 Received: from rincewind.home.kraxel.org (vpn2-8-125.ams2.redhat.com [10.36.8.125]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p0CBKjrI006066; Wed, 12 Jan 2011 06:20:47 -0500 Received: by rincewind.home.kraxel.org (Postfix, from userid 500) id 1E28041621; Wed, 12 Jan 2011 12:20:16 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Wed, 12 Jan 2011 12:20:06 +0100 Message-Id: <1294831214-4499-25-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.25 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: Gerd Hoffmann Subject: [Qemu-devel] [PATCH v4 24/32] usb: add usb_desc_attach 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 usb_desc_attach() which sets up the device according to the speed the usb port is able to handle. This function can be hooked into the handle_attach callback. Signed-off-by: Gerd Hoffmann --- hw/usb-desc.c | 36 +++++++++++++++++++++++++++++++++--- hw/usb-desc.h | 1 + 2 files changed, 34 insertions(+), 3 deletions(-) diff --git a/hw/usb-desc.c b/hw/usb-desc.c index 56ef734..f01e1cf 100644 --- a/hw/usb-desc.c +++ b/hw/usb-desc.c @@ -153,16 +153,46 @@ int usb_desc_other(const USBDescOther *desc, uint8_t *dest, size_t len) /* ------------------------------------------------------------------ */ -void usb_desc_init(USBDevice *dev) +static void usb_desc_setdefaults(USBDevice *dev) { const USBDesc *desc = dev->info->usb_desc; assert(desc != NULL); - dev->speed = USB_SPEED_FULL; - dev->device = desc->full; + switch (dev->speed) { + case USB_SPEED_LOW: + case USB_SPEED_FULL: + dev->device = desc->full; + break; + case USB_SPEED_HIGH: + dev->device = desc->high; + break; + } dev->config = dev->device->confs; } +void usb_desc_init(USBDevice *dev) +{ + dev->speed = USB_SPEED_FULL; + usb_desc_setdefaults(dev); +} + +void usb_desc_attach(USBDevice *dev) +{ + const USBDesc *desc = dev->info->usb_desc; + + assert(desc != NULL); + if (desc->high && (dev->port->speedmask & USB_SPEED_MASK_HIGH)) { + dev->speed = USB_SPEED_HIGH; + } else if (desc->full && (dev->port->speedmask & USB_SPEED_MASK_FULL)) { + dev->speed = USB_SPEED_FULL; + } else { + fprintf(stderr, "usb: port/device speed mismatch for \"%s\"\n", + dev->info->product_desc); + return; + } + usb_desc_setdefaults(dev); +} + void usb_desc_set_string(USBDevice *dev, uint8_t index, const char *str) { USBDescString *s; diff --git a/hw/usb-desc.h b/hw/usb-desc.h index d441725..484c7c7 100644 --- a/hw/usb-desc.h +++ b/hw/usb-desc.h @@ -79,6 +79,7 @@ int usb_desc_other(const USBDescOther *desc, uint8_t *dest, size_t len); /* control message emulation helpers */ void usb_desc_init(USBDevice *dev); +void usb_desc_attach(USBDevice *dev); void usb_desc_set_string(USBDevice *dev, uint8_t index, const char *str); const char *usb_desc_get_string(USBDevice *dev, uint8_t index); int usb_desc_string(USBDevice *dev, int index, uint8_t *dest, size_t len);