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