From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:52497) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RlfQf-0003WQ-6B for qemu-devel@nongnu.org; Fri, 13 Jan 2012 06:36:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RlfQd-0000aj-5Q for qemu-devel@nongnu.org; Fri, 13 Jan 2012 06:36:16 -0500 Received: from mx1.redhat.com ([209.132.183.28]:6192) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RlfQc-0000aa-Nt for qemu-devel@nongnu.org; Fri, 13 Jan 2012 06:36:15 -0500 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q0DBaD0r030602 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 13 Jan 2012 06:36:14 -0500 From: Gerd Hoffmann Date: Fri, 13 Jan 2012 11:18:26 +0100 Message-Id: <1326449914-8591-10-git-send-email-kraxel@redhat.com> In-Reply-To: <1326449914-8591-1-git-send-email-kraxel@redhat.com> References: <1326449914-8591-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 09/17] usb-desc: USBEndpoint support List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann Initialize USBEndpoint structs from USBDesc* data. Signed-off-by: Gerd Hoffmann --- hw/usb-desc.c | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/hw/usb-desc.c b/hw/usb-desc.c index 9c38661..0768334 100644 --- a/hw/usb-desc.c +++ b/hw/usb-desc.c @@ -231,6 +231,27 @@ int usb_desc_other(const USBDescOther *desc, uint8_t *dest, size_t len) /* ------------------------------------------------------------------ */ +static void usb_desc_ep_init(USBDevice *dev) +{ + const USBDescIface *iface; + int i, e, pid, ep; + + usb_ep_init(dev); + for (i = 0; i < dev->ninterfaces; i++) { + iface = dev->ifaces[i]; + if (iface == NULL) { + continue; + } + for (e = 0; e < iface->bNumEndpoints; e++) { + pid = (iface->eps[e].bEndpointAddress & USB_DIR_IN) ? + USB_TOKEN_IN : USB_TOKEN_OUT; + ep = iface->eps[e].bEndpointAddress & 0x0f; + usb_ep_set_type(dev, pid, ep, iface->eps[e].bmAttributes & 0x03); + usb_ep_set_ifnum(dev, pid, ep, iface->bInterfaceNumber); + } + } +} + static const USBDescIface *usb_desc_find_interface(USBDevice *dev, int nif, int alt) { @@ -272,6 +293,7 @@ static int usb_desc_set_interface(USBDevice *dev, int index, int value) old = dev->altsetting[index]; dev->altsetting[index] = value; dev->ifaces[index] = iface; + usb_desc_ep_init(dev); if (dev->info->set_interface && old != value) { dev->info->set_interface(dev, index, old, value); -- 1.7.1