From patchwork Tue Apr 17 08:45:20 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 153105 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 3263AB707E for ; Tue, 17 Apr 2012 19:52:55 +1000 (EST) Received: from localhost ([::1]:52224 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SK55h-0002as-5s for incoming@patchwork.ozlabs.org; Tue, 17 Apr 2012 05:52:53 -0400 Received: from eggs.gnu.org ([208.118.235.92]:36028) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SK559-0001Ix-4Z for qemu-devel@nongnu.org; Tue, 17 Apr 2012 05:52:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SK552-0002Kp-Ul for qemu-devel@nongnu.org; Tue, 17 Apr 2012 05:52:18 -0400 Received: from mx1.redhat.com ([209.132.183.28]:7795) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SK552-0002KN-Ly for qemu-devel@nongnu.org; Tue, 17 Apr 2012 05:52:12 -0400 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.14.4/8.14.4) with ESMTP id q3H9q9h5000993 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 17 Apr 2012 05:52:11 -0400 Received: from rincewind.home.kraxel.org (ovpn-116-48.ams2.redhat.com [10.36.116.48]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q3H8jSs8003509; Tue, 17 Apr 2012 04:45:30 -0400 Received: by rincewind.home.kraxel.org (Postfix, from userid 500) id 00C6B40CF1; Tue, 17 Apr 2012 10:45:28 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Tue, 17 Apr 2012 10:45:20 +0200 Message-Id: <1334652326-27874-16-git-send-email-kraxel@redhat.com> In-Reply-To: <1334652326-27874-1-git-send-email-kraxel@redhat.com> References: <1334652326-27874-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. X-Received-From: 209.132.183.28 Cc: Gerd Hoffmann Subject: [Qemu-devel] [PATCH 15/21] usb: use USBDescriptor for config descriptors. 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 Add config descriptor substruct to USBDescriptor, use it in the descriptor generator code. Signed-off-by: Gerd Hoffmann --- hw/usb/desc.c | 22 ++++++++++++---------- hw/usb/desc.h | 9 +++++++++ 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/hw/usb/desc.c b/hw/usb/desc.c index 5cecb25..3466968 100644 --- a/hw/usb/desc.c +++ b/hw/usb/desc.c @@ -78,22 +78,24 @@ int usb_desc_config(const USBDescConfig *conf, uint8_t *dest, size_t len) { uint8_t bLength = 0x09; uint16_t wTotalLength = 0; + USBDescriptor *d = (void *)dest; int i, rc; if (len < bLength) { return -1; } - dest[0x00] = bLength; - dest[0x01] = USB_DT_CONFIG; - dest[0x04] = conf->bNumInterfaces; - dest[0x05] = conf->bConfigurationValue; - dest[0x06] = conf->iConfiguration; - dest[0x07] = conf->bmAttributes; - dest[0x08] = conf->bMaxPower; + d->bLength = bLength; + d->bDescriptorType = USB_DT_CONFIG; + + d->u.config.bNumInterfaces = conf->bNumInterfaces; + d->u.config.bConfigurationValue = conf->bConfigurationValue; + d->u.config.iConfiguration = conf->iConfiguration; + d->u.config.bmAttributes = conf->bmAttributes; + d->u.config.bMaxPower = conf->bMaxPower; wTotalLength += bLength; - /* handle grouped interfaces if any*/ + /* handle grouped interfaces if any */ for (i = 0; i < conf->nif_groups; i++) { rc = usb_desc_iface_group(&(conf->if_groups[i]), dest + wTotalLength, @@ -113,8 +115,8 @@ int usb_desc_config(const USBDescConfig *conf, uint8_t *dest, size_t len) wTotalLength += rc; } - dest[0x02] = usb_lo(wTotalLength); - dest[0x03] = usb_hi(wTotalLength); + d->u.config.wTotalLength_lo = usb_lo(wTotalLength); + d->u.config.wTotalLength_hi = usb_hi(wTotalLength); return wTotalLength; } diff --git a/hw/usb/desc.h b/hw/usb/desc.h index 15d0780..298e050 100644 --- a/hw/usb/desc.h +++ b/hw/usb/desc.h @@ -36,6 +36,15 @@ typedef struct USBDescriptor { uint8_t bNumConfigurations; uint8_t bReserved; } device_qualifier; + struct { + uint8_t wTotalLength_lo; + uint8_t wTotalLength_hi; + uint8_t bNumInterfaces; + uint8_t bConfigurationValue; + uint8_t iConfiguration; + uint8_t bmAttributes; + uint8_t bMaxPower; + } config; } u; } QEMU_PACKED USBDescriptor;