From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:35377) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SDGez-0002yV-2t for qemu-devel@nongnu.org; Thu, 29 Mar 2012 10:49:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SDGes-0004kS-QF for qemu-devel@nongnu.org; Thu, 29 Mar 2012 10:49:08 -0400 Received: from mx1.redhat.com ([209.132.183.28]:25680) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SDGes-0004jy-IE for qemu-devel@nongnu.org; Thu, 29 Mar 2012 10:49:02 -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 q2TEn0WD021500 (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:54 +0200 Message-Id: <1333032538-3919-3-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 2/6] usb: use USBDescriptor for device qualifier descriptors. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann Add device qualifier substruct to USBDescriptor, use it in the descriptor generator code. Signed-off-by: Gerd Hoffmann --- hw/usb/desc.c | 23 ++++++++++++----------- hw/usb/desc.h | 10 ++++++++++ 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/hw/usb/desc.c b/hw/usb/desc.c index de7e204..5cecb25 100644 --- a/hw/usb/desc.c +++ b/hw/usb/desc.c @@ -53,22 +53,23 @@ int usb_desc_device_qualifier(const USBDescDevice *dev, uint8_t *dest, size_t len) { uint8_t bLength = 0x0a; + USBDescriptor *d = (void *)dest; if (len < bLength) { return -1; } - dest[0x00] = bLength; - dest[0x01] = USB_DT_DEVICE_QUALIFIER; - - dest[0x02] = usb_lo(dev->bcdUSB); - dest[0x03] = usb_hi(dev->bcdUSB); - dest[0x04] = dev->bDeviceClass; - dest[0x05] = dev->bDeviceSubClass; - dest[0x06] = dev->bDeviceProtocol; - dest[0x07] = dev->bMaxPacketSize0; - dest[0x08] = dev->bNumConfigurations; - dest[0x09] = 0; /* reserved */ + d->bLength = bLength; + d->bDescriptorType = USB_DT_DEVICE_QUALIFIER; + + d->u.device_qualifier.bcdUSB_lo = usb_lo(dev->bcdUSB); + d->u.device_qualifier.bcdUSB_hi = usb_hi(dev->bcdUSB); + d->u.device_qualifier.bDeviceClass = dev->bDeviceClass; + d->u.device_qualifier.bDeviceSubClass = dev->bDeviceSubClass; + d->u.device_qualifier.bDeviceProtocol = dev->bDeviceProtocol; + d->u.device_qualifier.bMaxPacketSize0 = dev->bMaxPacketSize0; + d->u.device_qualifier.bNumConfigurations = dev->bNumConfigurations; + d->u.device_qualifier.bReserved = 0; return bLength; } diff --git a/hw/usb/desc.h b/hw/usb/desc.h index c5a242e..15d0780 100644 --- a/hw/usb/desc.h +++ b/hw/usb/desc.h @@ -26,6 +26,16 @@ typedef struct USBDescriptor { uint8_t iSerialNumber; uint8_t bNumConfigurations; } device; + struct { + uint8_t bcdUSB_lo; + uint8_t bcdUSB_hi; + uint8_t bDeviceClass; + uint8_t bDeviceSubClass; + uint8_t bDeviceProtocol; + uint8_t bMaxPacketSize0; + uint8_t bNumConfigurations; + uint8_t bReserved; + } device_qualifier; } u; } QEMU_PACKED USBDescriptor; -- 1.7.1