[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 04/17] usb-desc: audio endpoint support
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 04/17] usb-desc: audio endpoint support |
Date: |
Fri, 13 Jan 2012 11:18:21 +0100 |
Add support for audio endpoints which have two more fields in the
descriptor. Also add support for extra class specific endpoint
descriptors.
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/usb-desc.c | 14 +++++++++++---
hw/usb-desc.h | 5 +++++
2 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/hw/usb-desc.c b/hw/usb-desc.c
index b9996a1..9c38661 100644
--- a/hw/usb-desc.c
+++ b/hw/usb-desc.c
@@ -192,9 +192,10 @@ int usb_desc_iface(const USBDescIface *iface, uint8_t
*dest, size_t len)
int usb_desc_endpoint(const USBDescEndpoint *ep, uint8_t *dest, size_t len)
{
- uint8_t bLength = 0x07;
+ uint8_t bLength = ep->is_audio ? 0x09 : 0x07;
+ uint8_t extralen = ep->extra ? ep->extra[0] : 0;
- if (len < bLength) {
+ if (len < bLength + extralen) {
return -1;
}
@@ -205,8 +206,15 @@ int usb_desc_endpoint(const USBDescEndpoint *ep, uint8_t
*dest, size_t len)
dest[0x04] = usb_lo(ep->wMaxPacketSize);
dest[0x05] = usb_hi(ep->wMaxPacketSize);
dest[0x06] = ep->bInterval;
+ if (ep->is_audio) {
+ dest[0x07] = ep->bRefresh;
+ dest[0x08] = ep->bSynchAddress;
+ }
+ if (ep->extra) {
+ memcpy(dest + bLength, ep->extra, extralen);
+ }
- return bLength;
+ return bLength + extralen;
}
int usb_desc_other(const USBDescOther *desc, uint8_t *dest, size_t len)
diff --git a/hw/usb-desc.h b/hw/usb-desc.h
index 5c14e4a..d6e07ea 100644
--- a/hw/usb-desc.h
+++ b/hw/usb-desc.h
@@ -71,6 +71,11 @@ struct USBDescEndpoint {
uint8_t bmAttributes;
uint16_t wMaxPacketSize;
uint8_t bInterval;
+ uint8_t bRefresh;
+ uint8_t bSynchAddress;
+
+ uint8_t is_audio; /* has bRefresh + bSynchAddress */
+ uint8_t *extra;
};
struct USBDescOther {
--
1.7.1
- [Qemu-devel] [PULL 00/17] usb patch queue: audio, xhci, usbredir, Gerd Hoffmann, 2012/01/13
- [Qemu-devel] [PATCH 08/17] usb: add ifnum to USBEndpoint, Gerd Hoffmann, 2012/01/13
- [Qemu-devel] [PATCH 12/17] usb: link packets to endpoints not devices, Gerd Hoffmann, 2012/01/13
- [Qemu-devel] [PATCH 01/17] usb-host: rip out legacy procfs support, Gerd Hoffmann, 2012/01/13
- [Qemu-devel] [PATCH 17/17] usb-redir: Improve some debugging messages, Gerd Hoffmann, 2012/01/13
- [Qemu-devel] [PATCH 04/17] usb-desc: audio endpoint support,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 10/17] usb/debug: add usb_ep_dump, Gerd Hoffmann, 2012/01/13
- [Qemu-devel] [PATCH 09/17] usb-desc: USBEndpoint support, Gerd Hoffmann, 2012/01/13
- [Qemu-devel] [PATCH 14/17] usb-redir: Dynamically adjust iso buffering size based on ep interval, Gerd Hoffmann, 2012/01/13
- [Qemu-devel] [PATCH 16/17] usb-redir: Try to keep our buffer size near the target size, Gerd Hoffmann, 2012/01/13
- [Qemu-devel] [PATCH 02/17] usb: track configuration and interface count in USBDevice., Gerd Hoffmann, 2012/01/13
- [Qemu-devel] [PATCH 15/17] usb-redir: Pre-fill our isoc input buffer before sending pkts to the host, Gerd Hoffmann, 2012/01/13
- [Qemu-devel] [PATCH 07/17] usb: add USBEndpoint, Gerd Hoffmann, 2012/01/13
- [Qemu-devel] [PATCH 06/17] xhci: Initial xHCI implementation, Gerd Hoffmann, 2012/01/13
- [Qemu-devel] [PATCH 05/17] usb: add audio device model, Gerd Hoffmann, 2012/01/13
- [Qemu-devel] [PATCH 13/17] usb-redir: Clear iso / irq error when stopping the stream, Gerd Hoffmann, 2012/01/13