|
 |
d4cdad5 |
From 577aff1f1df0a41fd5e21f5ff2b470c36565211b Mon Sep 17 00:00:00 2001
|
|
|
d4cdad5 |
From: Hans de Goede <hdegoede@redhat.com>
|
|
|
d4cdad5 |
Date: Mon, 19 Dec 2011 14:55:15 +0100
|
|
|
d4cdad5 |
Subject: [PATCH 103/118] usb-redir: Pre-fill our isoc input buffer before
|
|
|
d4cdad5 |
sending pkts to the host
|
|
|
d4cdad5 |
|
|
|
d4cdad5 |
This is something which should have been done from the first version of
|
|
|
d4cdad5 |
usb-redir, but wasn't.
|
|
|
d4cdad5 |
|
|
|
d4cdad5 |
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
|
|
d4cdad5 |
---
|
|
|
d4cdad5 |
usb-redir.c | 16 ++++++++++++++++
|
|
|
d4cdad5 |
1 files changed, 16 insertions(+), 0 deletions(-)
|
|
|
d4cdad5 |
|
|
|
d4cdad5 |
diff --git a/usb-redir.c b/usb-redir.c
|
|
|
d4cdad5 |
index ab2c8fa..17ea7a7 100644
|
|
|
d4cdad5 |
--- a/usb-redir.c
|
|
|
d4cdad5 |
+++ b/usb-redir.c
|
|
|
d4cdad5 |
@@ -60,7 +60,9 @@ struct endp_data {
|
|
|
d4cdad5 |
uint8_t iso_error; /* For reporting iso errors to the HC */
|
|
|
d4cdad5 |
uint8_t interrupt_started;
|
|
|
d4cdad5 |
uint8_t interrupt_error;
|
|
|
d4cdad5 |
+ uint8_t bufpq_prefilled;
|
|
|
d4cdad5 |
QTAILQ_HEAD(, buf_packet) bufpq;
|
|
|
d4cdad5 |
+ int bufpq_size;
|
|
|
d4cdad5 |
int bufpq_target_size;
|
|
|
d4cdad5 |
};
|
|
|
d4cdad5 |
|
|
|
d4cdad5 |
@@ -296,6 +298,7 @@ static struct buf_packet *bufp_alloc(USBRedirDevice *dev,
|
|
|
d4cdad5 |
bufp->len = len;
|
|
|
d4cdad5 |
bufp->status = status;
|
|
|
d4cdad5 |
QTAILQ_INSERT_TAIL(&dev->endpoint[EP2I(ep)].bufpq, bufp, next);
|
|
|
d4cdad5 |
+ dev->endpoint[EP2I(ep)].bufpq_size++;
|
|
|
d4cdad5 |
return bufp;
|
|
|
d4cdad5 |
}
|
|
|
d4cdad5 |
|
|
|
d4cdad5 |
@@ -303,6 +306,7 @@ static void bufp_free(USBRedirDevice *dev, struct buf_packet *bufp,
|
|
|
d4cdad5 |
uint8_t ep)
|
|
|
d4cdad5 |
{
|
|
|
d4cdad5 |
QTAILQ_REMOVE(&dev->endpoint[EP2I(ep)].bufpq, bufp, next);
|
|
|
d4cdad5 |
+ dev->endpoint[EP2I(ep)].bufpq_size--;
|
|
|
d4cdad5 |
free(bufp->data);
|
|
|
d4cdad5 |
g_free(bufp);
|
|
|
d4cdad5 |
}
|
|
|
d4cdad5 |
@@ -373,14 +377,26 @@ static int usbredir_handle_iso_data(USBRedirDevice *dev, USBPacket *p,
|
|
|
d4cdad5 |
usbredirparser_do_write(dev->parser);
|
|
|
d4cdad5 |
DPRINTF("iso stream started ep %02X\n", ep);
|
|
|
d4cdad5 |
dev->endpoint[EP2I(ep)].iso_started = 1;
|
|
|
d4cdad5 |
+ dev->endpoint[EP2I(ep)].bufpq_prefilled = 0;
|
|
|
d4cdad5 |
}
|
|
|
d4cdad5 |
|
|
|
d4cdad5 |
if (ep & USB_DIR_IN) {
|
|
|
d4cdad5 |
struct buf_packet *isop;
|
|
|
d4cdad5 |
|
|
|
d4cdad5 |
+ if (dev->endpoint[EP2I(ep)].iso_started &&
|
|
|
d4cdad5 |
+ !dev->endpoint[EP2I(ep)].bufpq_prefilled) {
|
|
|
d4cdad5 |
+ if (dev->endpoint[EP2I(ep)].bufpq_size <
|
|
|
d4cdad5 |
+ dev->endpoint[EP2I(ep)].bufpq_target_size) {
|
|
|
d4cdad5 |
+ return usbredir_handle_status(dev, 0, 0);
|
|
|
d4cdad5 |
+ }
|
|
|
d4cdad5 |
+ dev->endpoint[EP2I(ep)].bufpq_prefilled = 1;
|
|
|
d4cdad5 |
+ }
|
|
|
d4cdad5 |
+
|
|
|
d4cdad5 |
isop = QTAILQ_FIRST(&dev->endpoint[EP2I(ep)].bufpq);
|
|
|
d4cdad5 |
if (isop == NULL) {
|
|
|
d4cdad5 |
DPRINTF2("iso-token-in ep %02X, no isop\n", ep);
|
|
|
d4cdad5 |
+ /* Re-fill the buffer */
|
|
|
d4cdad5 |
+ dev->endpoint[EP2I(ep)].bufpq_prefilled = 0;
|
|
|
d4cdad5 |
/* Check iso_error for stream errors, otherwise its an underrun */
|
|
|
d4cdad5 |
status = dev->endpoint[EP2I(ep)].iso_error;
|
|
|
d4cdad5 |
dev->endpoint[EP2I(ep)].iso_error = 0;
|
|
|
d4cdad5 |
--
|
|
|
d4cdad5 |
1.7.7.5
|
|
|
d4cdad5 |
|