From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:60898) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S5GZ0-0005mz-6f for qemu-devel@nongnu.org; Wed, 07 Mar 2012 08:06:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S5GYY-0008Ds-1o for qemu-devel@nongnu.org; Wed, 07 Mar 2012 08:05:53 -0500 Received: from mx1.redhat.com ([209.132.183.28]:27239) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S5GYX-0008DW-QC for qemu-devel@nongnu.org; Wed, 07 Mar 2012 08:05:25 -0500 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q27D5Oha031059 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 7 Mar 2012 08:05:24 -0500 From: Gerd Hoffmann Date: Wed, 7 Mar 2012 14:05:01 +0100 Message-Id: <1331125520-13467-2-git-send-email-kraxel@redhat.com> In-Reply-To: <1331125520-13467-1-git-send-email-kraxel@redhat.com> References: <1331125520-13467-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 01/20] usb-redir: Set ep type and interface List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Hans de Goede , Gerd Hoffmann From: Hans de Goede 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 Signed-off-by: Gerd Hoffmann --- usb-redir.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/usb-redir.c b/usb-redir.c index 755492f..a87de6e 100644 --- a/usb-redir.c +++ b/usb-redir.c @@ -1122,6 +1122,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; } @@ -1148,6 +1149,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++) { @@ -1172,7 +1174,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.1