[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 2/6] usb: use USBDescriptor for device qualifier des
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 2/6] usb: use USBDescriptor for device qualifier descriptors. |
Date: |
Thu, 29 Mar 2012 16:48:54 +0200 |
Add device qualifier substruct to USBDescriptor,
use it in the descriptor generator code.
Signed-off-by: Gerd Hoffmann <address@hidden>
---
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
- [Qemu-devel] [PATCH 0/6] usb: descriptor rework., Gerd Hoffmann, 2012/03/29
- [Qemu-devel] [PATCH 3/6] usb: use USBDescriptor for config descriptors., Gerd Hoffmann, 2012/03/29
- [Qemu-devel] [PATCH 1/6] usb: add USBDescriptor, use for device descriptors., Gerd Hoffmann, 2012/03/29
- [Qemu-devel] [PATCH 4/6] usb: use USBDescriptor for interface descriptors., Gerd Hoffmann, 2012/03/29
- [Qemu-devel] [PATCH 6/6] usb-host: rewrite usb_linux_update_endp_table, Gerd Hoffmann, 2012/03/29
- [Qemu-devel] [PATCH 2/6] usb: use USBDescriptor for device qualifier descriptors.,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 5/6] usb: use USBDescriptor for endpoint descriptors., Gerd Hoffmann, 2012/03/29
- Re: [Qemu-devel] [PATCH 0/6] usb: descriptor rework., Hans de Goede, 2012/03/30