mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

usb: use USBDescriptor for endpoint descriptors.

Browse Source 
Add endpoint descriptor substruct to USBDescriptor,
use it in the descriptor generator code.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Gerd Hoffmann 2012-03-29 16:01:21 +02:00
parent feafd797ee
commit e36a20d329
2 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hw/usb/desc.c
View File

@ -200,21 +200,23 @@ int usb_desc_endpoint(const USBDescEndpoint *ep, uint8_t *dest, size_t len)
{ {
uint8_t bLength = ep->is_audio ? 0x09 : 0x07; uint8_t bLength = ep->is_audio ? 0x09 : 0x07;
uint8_t extralen = ep->extra ? ep->extra[0] : 0; uint8_t extralen = ep->extra ? ep->extra[0] : 0;
USBDescriptor *d = (void *)dest;
if (len < bLength + extralen) { if (len < bLength + extralen) {
return -1; return -1;
} }
dest[0x00] = bLength; d->bLength = bLength;
dest[0x01] = USB_DT_ENDPOINT; d->bDescriptorType = USB_DT_ENDPOINT;
dest[0x02] = ep->bEndpointAddress;
dest[0x03] = ep->bmAttributes; d->u.endpoint.bEndpointAddress = ep->bEndpointAddress;
dest[0x04] = usb_lo(ep->wMaxPacketSize); d->u.endpoint.bmAttributes = ep->bmAttributes;
dest[0x05] = usb_hi(ep->wMaxPacketSize); d->u.endpoint.wMaxPacketSize_lo = usb_lo(ep->wMaxPacketSize);
dest[0x06] = ep->bInterval; d->u.endpoint.wMaxPacketSize_hi = usb_hi(ep->wMaxPacketSize);
d->u.endpoint.bInterval = ep->bInterval;
if (ep->is_audio) { if (ep->is_audio) {
dest[0x07] = ep->bRefresh; d->u.endpoint.bRefresh = ep->bRefresh;
dest[0x08] = ep->bSynchAddress; d->u.endpoint.bSynchAddress = ep->bSynchAddress;
} }
if (ep->extra) { if (ep->extra) {
memcpy(dest + bLength, ep->extra, extralen); memcpy(dest + bLength, ep->extra, extralen);

9
hw/usb/desc.h
View File

@ -54,6 +54,15 @@ typedef struct USBDescriptor {
uint8_t bInterfaceProtocol; uint8_t bInterfaceProtocol;
uint8_t iInterface; uint8_t iInterface;
} interface; } interface;
struct {
uint8_t bEndpointAddress;
uint8_t bmAttributes;
uint8_t wMaxPacketSize_lo;
uint8_t wMaxPacketSize_hi;
uint8_t bInterval;
uint8_t bRefresh; /* only audio ep */
uint8_t bSynchAddress; /* only audio ep */
} endpoint;
} u; } u;
} QEMU_PACKED USBDescriptor; } QEMU_PACKED USBDescriptor;