david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

usb-host-libusb: Set stream id when submitting bulk-stream transfers

Browse Source 
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Hans de Goede 2013-11-21 17:21:02 +01:00 committed by Gerd Hoffmann
parent 56a9f18051
commit 8d1bd3c901
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hw/usb/host-libusb.c
View File

@ -1214,10 +1214,23 @@ static void usb_host_handle_data(USBDevice *udev, USBPacket *p)
usb_packet_copy(p, r->buffer, size); usb_packet_copy(p, r->buffer, size);
} }
ep = p->ep->nr | (r->in ? USB_DIR_IN : 0); ep = p->ep->nr | (r->in ? USB_DIR_IN : 0);
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, libusb_fill_bulk_transfer(r->xfer, s->dh, ep,
r->buffer, size, r->buffer, size,
usb_host_req_complete_data, r, usb_host_req_complete_data, r,
BULK_TIMEOUT); BULK_TIMEOUT);
}
break; break;
case USB_ENDPOINT_XFER_INT: case USB_ENDPOINT_XFER_INT:
r = usb_host_req_alloc(s, p, p->pid == USB_TOKEN_IN, p->iov.size); r = usb_host_req_alloc(s, p, p->pid == USB_TOKEN_IN, p->iov.size);