[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 10/10] usb-host-libusb: Set stream id when submitting
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 10/10] usb-host-libusb: Set stream id when submitting bulk-stream transfers |
Date: |
Mon, 26 May 2014 10:47:07 +0200 |
From: Hans de Goede <address@hidden>
Signed-off-by: Hans de Goede <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/usb/host-libusb.c | 21 +++++++++++++++++----
1 file changed, 17 insertions(+), 4 deletions(-)
diff --git a/hw/usb/host-libusb.c b/hw/usb/host-libusb.c
index 401eb74..8007d1d 100644
--- a/hw/usb/host-libusb.c
+++ b/hw/usb/host-libusb.c
@@ -1214,10 +1214,23 @@ static void usb_host_handle_data(USBDevice *udev,
USBPacket *p)
usb_packet_copy(p, r->buffer, size);
}
ep = p->ep->nr | (r->in ? USB_DIR_IN : 0);
- libusb_fill_bulk_transfer(r->xfer, s->dh, ep,
- r->buffer, size,
- usb_host_req_complete_data, r,
- BULK_TIMEOUT);
+ if (p->stream) {
+#if LIBUSBX_API_VERSION >= 0x01000103
+ libusb_fill_bulk_stream_transfer(r->xfer, s->dh, ep, p->stream,
+ r->buffer, size,
+ usb_host_req_complete_data, r,
+ BULK_TIMEOUT);
+#else
+ usb_host_req_free(r);
+ p->status = USB_RET_STALL;
+ return;
+#endif
+ } else {
+ libusb_fill_bulk_transfer(r->xfer, s->dh, ep,
+ r->buffer, size,
+ usb_host_req_complete_data, r,
+ BULK_TIMEOUT);
+ }
break;
case USB_ENDPOINT_XFER_INT:
r = usb_host_req_alloc(s, p, p->pid == USB_TOKEN_IN, p->iov.size);
--
1.8.3.1
- [Qemu-devel] [PULL 00/10] usb queue: usb3 streams, xhci + mtp fixes, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 03/10] xhci: add xhci_get_flag, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 01/10] xhci: child detach fix, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 02/10] xhci: add endpoint cap on express bus only, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 04/10] usb-mtp: use bool to track MTPObject init status, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 05/10] usb-mtp: handle lseek failure, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 10/10] usb-host-libusb: Set stream id when submitting bulk-stream transfers,
Gerd Hoffmann <=
- [Qemu-devel] [PULL 07/10] usb-redir: Add support for bulk streams, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 09/10] usb-host-libusb: Add alloc / free streams ops, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 08/10] usb-host-libusb: Fill in endpoint max_streams when available, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 06/10] usb-mtp: handle usb_mtp_get_object failure, Gerd Hoffmann, 2014/05/26
- Re: [Qemu-devel] [PULL 00/10] usb queue: usb3 streams, xhci + mtp fixes, Peter Maydell, 2014/05/28