From patchwork Fri Jun 24 10:59:30 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 101772 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 435DDB6F85 for ; Fri, 24 Jun 2011 21:15:16 +1000 (EST) Received: from localhost ([::1]:60561 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qa4Lu-0001qB-Gr for incoming@patchwork.ozlabs.org; Fri, 24 Jun 2011 07:15:10 -0400 Received: from eggs.gnu.org ([140.186.70.92]:34471) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qa473-0007Bj-Ip for qemu-devel@nongnu.org; Fri, 24 Jun 2011 06:59:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qa470-0001Ya-Ud for qemu-devel@nongnu.org; Fri, 24 Jun 2011 06:59:49 -0400 Received: from mx1.redhat.com ([209.132.183.28]:1029) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qa46z-0001Y0-Qt for qemu-devel@nongnu.org; Fri, 24 Jun 2011 06:59:46 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p5OAxjKa009132 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 24 Jun 2011 06:59:45 -0400 Received: from rincewind.home.kraxel.org (vpn1-4-202.ams2.redhat.com [10.36.4.202]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p5OAxgVP026800; Fri, 24 Jun 2011 06:59:43 -0400 Received: by rincewind.home.kraxel.org (Postfix, from userid 500) id 0D88540EED; Fri, 24 Jun 2011 12:59:37 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Fri, 24 Jun 2011 12:59:30 +0200 Message-Id: <1308913175-10454-9-git-send-email-kraxel@redhat.com> In-Reply-To: <1308913175-10454-1-git-send-email-kraxel@redhat.com> References: <1308913175-10454-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: Hans de Goede , Gerd Hoffmann Subject: [Qemu-devel] [PATCH 08/13] usb: Add a speedmask to devices X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Hans de Goede This is used to indicate at which speed[s] the device can operate, so that this can be checked to match the ports capabilities when it gets attached to a bus. Note that currently all usb1 emulated device claim to be fullspeed, this seems to not cause any problems, but still seems wrong, because with real hardware keyboards, mice and tablets usually are lo-speed, so reporting these as fullspeed devices seems wrong. Signed-off-by: Gerd Hoffmann --- hw/usb-ccid.c | 1 + hw/usb-desc.c | 10 ++++++++++ hw/usb.h | 3 +++ usb-bsd.c | 2 ++ usb-linux.c | 1 + 5 files changed, 17 insertions(+), 0 deletions(-) diff --git a/hw/usb-ccid.c b/hw/usb-ccid.c index 59c6431..30bb4d6 100644 --- a/hw/usb-ccid.c +++ b/hw/usb-ccid.c @@ -1271,6 +1271,7 @@ static int ccid_initfn(USBDevice *dev) s->migration_target_ip = 0; s->migration_target_port = 0; s->dev.speed = USB_SPEED_FULL; + s->dev.speedmask = USB_SPEED_MASK_FULL; s->notify_slot_change = false; s->powered = true; s->pending_answers_num = 0; diff --git a/hw/usb-desc.c b/hw/usb-desc.c index e4a4680..0b9d351 100644 --- a/hw/usb-desc.c +++ b/hw/usb-desc.c @@ -242,7 +242,17 @@ static void usb_desc_setdefaults(USBDevice *dev) void usb_desc_init(USBDevice *dev) { + const USBDesc *desc = dev->info->usb_desc; + + assert(desc != NULL); dev->speed = USB_SPEED_FULL; + dev->speedmask = 0; + if (desc->full) { + dev->speedmask |= USB_SPEED_MASK_FULL; + } + if (desc->high) { + dev->speedmask |= USB_SPEED_MASK_HIGH; + } usb_desc_setdefaults(dev); } diff --git a/hw/usb.h b/hw/usb.h index 06ce058..a6b311f 100644 --- a/hw/usb.h +++ b/hw/usb.h @@ -168,7 +168,10 @@ struct USBDevice { char *port_path; void *opaque; + /* Actual connected speed */ int speed; + /* Supported speeds, not in info because it may be variable (hostdevs) */ + int speedmask; uint8_t addr; char product_desc[32]; int auto_attach; diff --git a/usb-bsd.c b/usb-bsd.c index c1bcc4a..3b97eb4 100644 --- a/usb-bsd.c +++ b/usb-bsd.c @@ -367,8 +367,10 @@ USBDevice *usb_host_device_open(const char *devname) if (dev_info.udi_speed == 1) { dev->dev.speed = USB_SPEED_LOW - 1; + dev->dev.speedmask = USB_SPEED_MASK_LOW; } else { dev->dev.speed = USB_SPEED_FULL - 1; + dev->dev.speedmask = USB_SPEED_MASK_FULL; } if (strncmp(dev_info.udi_product, "product", 7) != 0) { diff --git a/usb-linux.c b/usb-linux.c index 9b6f2be..4d22c9c 100644 --- a/usb-linux.c +++ b/usb-linux.c @@ -1167,6 +1167,7 @@ static int usb_host_open(USBHostDevice *dev, int bus_num, } } dev->dev.speed = speed; + dev->dev.speedmask = (1 << speed); printf("husb: grabbed usb device %d.%d\n", bus_num, addr);