qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Hans de Goede <hdegoede@redhat.com>
To: Gerd Hoffmann <kraxel@redhat.com>
Cc: Hans de Goede <hdegoede@redhat.com>, qemu-devel@nongnu.org
Subject: [Qemu-devel] [PATCH 01/13] usb-redir: Set ep type and interface
Date: Fri,  2 Mar 2012 19:32:22 +0100	[thread overview]
Message-ID: <1330713154-3229-2-git-send-email-hdegoede@redhat.com> (raw)
In-Reply-To: <1330713154-3229-1-git-send-email-hdegoede@redhat.com>

Since we don't use usb_desc.c we need to do this ourselves. This fixes
iso transfers no longer working for USB 2 devices due to the ep->type
check in ehci.c

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
 usb-redir.c |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/usb-redir.c b/usb-redir.c
index fc58a0e..ef9fa96 100644
--- a/usb-redir.c
+++ b/usb-redir.c
@@ -1149,6 +1149,7 @@ static void usbredir_device_disconnect(void *priv)
     for (i = 0; i < MAX_ENDPOINTS; i++) {
         QTAILQ_INIT(&dev->endpoint[i].bufpq);
     }
+    usb_ep_init(&dev->dev);
     dev->interface_info.interface_count = 0;
 }
 
@@ -1175,6 +1176,7 @@ static void usbredir_ep_info(void *priv,
     struct usb_redir_ep_info_header *ep_info)
 {
     USBRedirDevice *dev = priv;
+    struct USBEndpoint *usb_ep;
     int i;
 
     for (i = 0; i < MAX_ENDPOINTS; i++) {
@@ -1199,7 +1201,13 @@ static void usbredir_ep_info(void *priv,
         default:
             ERROR("Received invalid endpoint type\n");
             usbredir_device_disconnect(dev);
+            return;
         }
+        usb_ep = usb_ep_get(&dev->dev,
+                            (i & 0x10) ? USB_TOKEN_IN : USB_TOKEN_OUT,
+                            i & 0x0f);
+        usb_ep->type = dev->endpoint[i].type;
+        usb_ep->ifnum = dev->endpoint[i].interface;
     }
 }
 
-- 
1.7.7.6

  reply	other threads:[~2012-03-02 18:30 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-03-02 18:32 [Qemu-devel] [PATCH 0/13] usb patches Hans de Goede
2012-03-02 18:32 ` Hans de Goede [this message]
2012-03-02 18:32 ` [Qemu-devel] [PATCH 02/13] usb-ehci: Never follow table entries with the T-bit set Hans de Goede
2012-03-02 18:32 ` [Qemu-devel] [PATCH 03/13] usb-ehci: split our qh queue into async and periodic queues Hans de Goede
2012-03-02 18:32 ` [Qemu-devel] [PATCH 04/13] usb-ehci: always call ehci_queues_rip_unused for period queues Hans de Goede
2012-03-02 18:32 ` [Qemu-devel] [PATCH 05/13] usb-ehci: Drop cached qhs when the doorbell gets rung Hans de Goede
2012-03-02 18:32 ` [Qemu-devel] [PATCH 06/13] usb-ehci: Rip the queues when the async or period schedule is halted Hans de Goede
2012-03-02 18:32 ` [Qemu-devel] [PATCH 07/13] usb-ehci: Any packet completion except for NAK should set the interrupt Hans de Goede
2012-03-02 18:32 ` [Qemu-devel] [PATCH 08/13] usb-ehci: Fix cerr tracking Hans de Goede
2012-03-02 18:32 ` [Qemu-devel] [PATCH 09/13] usb-ehci: Remove dead nakcnt code Hans de Goede
2012-03-02 18:32 ` [Qemu-devel] [PATCH 10/13] usb-ehci: Fix and simplify nakcnt handling Hans de Goede
2012-03-02 18:32 ` [Qemu-devel] [PATCH 11/13] usb-ehci: Cleanup itd error handling Hans de Goede
2012-03-02 18:32 ` [Qemu-devel] [PATCH 12/13] usb: return BABBLE rather then NAK when we receive too much data Hans de Goede
2012-03-02 18:32 ` [Qemu-devel] [PATCH 13/13] usb: add USB_RET_IOERROR Hans de Goede
  -- strict thread matches above, loose matches on Subject: below --
2012-03-02 20:27 [Qemu-devel] usb patches [v2] Hans de Goede
2012-03-02 20:27 ` [Qemu-devel] [PATCH 01/13] usb-redir: Set ep type and interface Hans de Goede

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1330713154-3229-2-git-send-email-hdegoede@redhat.com \
    --to=hdegoede@redhat.com \
    --cc=kraxel@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).