From patchwork Tue May 31 09:39:40 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans de Goede X-Patchwork-Id: 97995 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 BFA77B6F6E for ; Tue, 31 May 2011 19:39:55 +1000 (EST) Received: from localhost ([::1]:35442 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QRLQX-0006MC-2H for incoming@patchwork.ozlabs.org; Tue, 31 May 2011 05:39:53 -0400 Received: from eggs.gnu.org ([140.186.70.92]:48416) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QRLQC-0006EO-TU for qemu-devel@nongnu.org; Tue, 31 May 2011 05:39:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QRLQC-0003N3-1e for qemu-devel@nongnu.org; Tue, 31 May 2011 05:39:32 -0400 Received: from mx1.redhat.com ([209.132.183.28]:31104) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QRLQB-0003Mq-Nz for qemu-devel@nongnu.org; Tue, 31 May 2011 05:39:32 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p4V9dVPB009493 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 31 May 2011 05:39:31 -0400 Received: from shalem.localdomain.com (vpn1-4-207.ams2.redhat.com [10.36.4.207]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p4V9dSsB003893; Tue, 31 May 2011 05:39:30 -0400 From: Hans de Goede To: qemu-devel@nongnu.org Date: Tue, 31 May 2011 11:39:40 +0200 Message-Id: <1306834783-13070-2-git-send-email-hdegoede@redhat.com> In-Reply-To: <1306834783-13070-1-git-send-email-hdegoede@redhat.com> References: <1306834783-13070-1-git-send-email-hdegoede@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 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 Subject: [Qemu-devel] [PATCH 1/4] 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 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. --- 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 5b6878b..9e7d6d2 100644 --- a/hw/usb-ccid.c +++ b/hw/usb-ccid.c @@ -1283,6 +1283,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 57e8d6b..4f58ae8 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 097d789..5623f34 100644 --- a/hw/usb.h +++ b/hw/usb.h @@ -169,7 +169,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 9bab6e3..11829a2 100644 --- a/usb-bsd.c +++ b/usb-bsd.c @@ -368,8 +368,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 fe21da1..71e5f4d 100644 --- a/usb-linux.c +++ b/usb-linux.c @@ -1141,6 +1141,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);