From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:35387) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SDGf0-0002yl-DO for qemu-devel@nongnu.org; Thu, 29 Mar 2012 10:49:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SDGes-0004kJ-PW for qemu-devel@nongnu.org; Thu, 29 Mar 2012 10:49:09 -0400 Received: from mx1.redhat.com ([209.132.183.28]:25304) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SDGes-0004jw-HN for qemu-devel@nongnu.org; Thu, 29 Mar 2012 10:49:02 -0400 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.14.4/8.14.4) with ESMTP id q2TEn0S8005039 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 29 Mar 2012 10:49:00 -0400 From: Gerd Hoffmann Date: Thu, 29 Mar 2012 16:48:56 +0200 Message-Id: <1333032538-3919-5-git-send-email-kraxel@redhat.com> In-Reply-To: <1333032538-3919-1-git-send-email-kraxel@redhat.com> References: <1333032538-3919-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 4/6] usb: use USBDescriptor for interface descriptors. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann Add interface descriptor substruct to USBDescriptor, use it in the descriptor generator code. Signed-off-by: Gerd Hoffmann --- hw/usb/desc.c | 20 +++++++++++--------- hw/usb/desc.h | 9 +++++++++ 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/hw/usb/desc.c b/hw/usb/desc.c index 3466968..2b8febb 100644 --- a/hw/usb/desc.c +++ b/hw/usb/desc.c @@ -159,20 +159,22 @@ int usb_desc_iface(const USBDescIface *iface, uint8_t *dest, size_t len) { uint8_t bLength = 0x09; int i, rc, pos = 0; + USBDescriptor *d = (void *)dest; if (len < bLength) { return -1; } - dest[0x00] = bLength; - dest[0x01] = USB_DT_INTERFACE; - dest[0x02] = iface->bInterfaceNumber; - dest[0x03] = iface->bAlternateSetting; - dest[0x04] = iface->bNumEndpoints; - dest[0x05] = iface->bInterfaceClass; - dest[0x06] = iface->bInterfaceSubClass; - dest[0x07] = iface->bInterfaceProtocol; - dest[0x08] = iface->iInterface; + d->bLength = bLength; + d->bDescriptorType = USB_DT_INTERFACE; + + d->u.interface.bInterfaceNumber = iface->bInterfaceNumber; + d->u.interface.bAlternateSetting = iface->bAlternateSetting; + d->u.interface.bNumEndpoints = iface->bNumEndpoints; + d->u.interface.bInterfaceClass = iface->bInterfaceClass; + d->u.interface.bInterfaceSubClass = iface->bInterfaceSubClass; + d->u.interface.bInterfaceProtocol = iface->bInterfaceProtocol; + d->u.interface.iInterface = iface->iInterface; pos += bLength; for (i = 0; i < iface->ndesc; i++) { diff --git a/hw/usb/desc.h b/hw/usb/desc.h index 298e050..6f42eae 100644 --- a/hw/usb/desc.h +++ b/hw/usb/desc.h @@ -45,6 +45,15 @@ typedef struct USBDescriptor { uint8_t bmAttributes; uint8_t bMaxPower; } config; + struct { + uint8_t bInterfaceNumber; + uint8_t bAlternateSetting; + uint8_t bNumEndpoints; + uint8_t bInterfaceClass; + uint8_t bInterfaceSubClass; + uint8_t bInterfaceProtocol; + uint8_t iInterface; + } interface; } u; } QEMU_PACKED USBDescriptor; -- 1.7.1