[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 15/17] usb-redir: Pre-fill our isoc input buffer bef
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 15/17] usb-redir: Pre-fill our isoc input buffer before sending pkts to the host |
Date: |
Fri, 13 Jan 2012 11:18:32 +0100 |
From: Hans de Goede <address@hidden>
This is something which should have been done from the first version of
usb-redir, but wasn't.
Signed-off-by: Hans de Goede <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>
---
usb-redir.c | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/usb-redir.c b/usb-redir.c
index 99a12d5..cdd929a 100644
--- a/usb-redir.c
+++ b/usb-redir.c
@@ -60,7 +60,9 @@ struct endp_data {
uint8_t iso_error; /* For reporting iso errors to the HC */
uint8_t interrupt_started;
uint8_t interrupt_error;
+ uint8_t bufpq_prefilled;
QTAILQ_HEAD(, buf_packet) bufpq;
+ int bufpq_size;
int bufpq_target_size;
};
@@ -296,6 +298,7 @@ static struct buf_packet *bufp_alloc(USBRedirDevice *dev,
bufp->len = len;
bufp->status = status;
QTAILQ_INSERT_TAIL(&dev->endpoint[EP2I(ep)].bufpq, bufp, next);
+ dev->endpoint[EP2I(ep)].bufpq_size++;
return bufp;
}
@@ -303,6 +306,7 @@ static void bufp_free(USBRedirDevice *dev, struct
buf_packet *bufp,
uint8_t ep)
{
QTAILQ_REMOVE(&dev->endpoint[EP2I(ep)].bufpq, bufp, next);
+ dev->endpoint[EP2I(ep)].bufpq_size--;
free(bufp->data);
g_free(bufp);
}
@@ -374,14 +378,26 @@ static int usbredir_handle_iso_data(USBRedirDevice *dev,
USBPacket *p,
usbredirparser_do_write(dev->parser);
DPRINTF("iso stream started ep %02X\n", ep);
dev->endpoint[EP2I(ep)].iso_started = 1;
+ dev->endpoint[EP2I(ep)].bufpq_prefilled = 0;
}
if (ep & USB_DIR_IN) {
struct buf_packet *isop;
+ if (dev->endpoint[EP2I(ep)].iso_started &&
+ !dev->endpoint[EP2I(ep)].bufpq_prefilled) {
+ if (dev->endpoint[EP2I(ep)].bufpq_size <
+ dev->endpoint[EP2I(ep)].bufpq_target_size) {
+ return usbredir_handle_status(dev, 0, 0);
+ }
+ dev->endpoint[EP2I(ep)].bufpq_prefilled = 1;
+ }
+
isop = QTAILQ_FIRST(&dev->endpoint[EP2I(ep)].bufpq);
if (isop == NULL) {
DPRINTF2("iso-token-in ep %02X, no isop\n", ep);
+ /* Re-fill the buffer */
+ dev->endpoint[EP2I(ep)].bufpq_prefilled = 0;
/* Check iso_error for stream errors, otherwise its an underrun */
status = dev->endpoint[EP2I(ep)].iso_error;
dev->endpoint[EP2I(ep)].iso_error = 0;
--
1.7.1
- [Qemu-devel] [PATCH 08/17] usb: add ifnum to USBEndpoint, (continued)
- [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, 2012/01/13
- [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 <=
- [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
- [Qemu-devel] [PATCH 03/17] usb: track altsetting in USBDevice, Gerd Hoffmann, 2012/01/13
- [Qemu-devel] [PATCH 11/17] usb: add max_packet_size to USBEndpoint, Gerd Hoffmann, 2012/01/13
- Re: [Qemu-devel] [PULL 00/17] usb patch queue: audio, xhci, usbredir, Anthony Liguori, 2012/01/13