From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:43044) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RjAKS-0004ie-1K for qemu-devel@nongnu.org; Fri, 06 Jan 2012 08:59:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RjAKK-0008WM-Qb for qemu-devel@nongnu.org; Fri, 06 Jan 2012 08:59:31 -0500 Received: from mx1.redhat.com ([209.132.183.28]:46646) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RjAKK-0008W6-Jw for qemu-devel@nongnu.org; Fri, 06 Jan 2012 08:59:24 -0500 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q06DxNq5001833 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 6 Jan 2012 08:59:23 -0500 From: Gerd Hoffmann Date: Fri, 6 Jan 2012 14:59:04 +0100 Message-Id: <1325858346-1071-11-git-send-email-kraxel@redhat.com> In-Reply-To: <1325858346-1071-1-git-send-email-kraxel@redhat.com> References: <1325858346-1071-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 10/12] usb/debug: add usb_ep_dump List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann Add function to dump endpoint data, for debugging purposes. Signed-off-by: Gerd Hoffmann --- hw/usb.c | 40 ++++++++++++++++++++++++++++++++++++++++ hw/usb.h | 1 + usb-linux.c | 3 +++ 3 files changed, 44 insertions(+), 0 deletions(-) diff --git a/hw/usb.c b/hw/usb.c index 6ba063a..f07cb9d 100644 --- a/hw/usb.c +++ b/hw/usb.c @@ -427,6 +427,46 @@ void usb_ep_init(USBDevice *dev) } } +void usb_ep_dump(USBDevice *dev) +{ + static const char *tname[] = { + [USB_ENDPOINT_XFER_CONTROL] = "control", + [USB_ENDPOINT_XFER_ISOC] = "isoc", + [USB_ENDPOINT_XFER_BULK] = "bulk", + [USB_ENDPOINT_XFER_INT] = "int", + }; + int ifnum, ep, first; + + fprintf(stderr, "Device \"%s\", config %d\n", + dev->product_desc, dev->configuration); + for (ifnum = 0; ifnum < 16; ifnum++) { + first = 1; + for (ep = 0; ep < USB_MAX_ENDPOINTS; ep++) { + if (dev->ep_in[ep].type != USB_ENDPOINT_XFER_INVALID && + dev->ep_in[ep].ifnum == ifnum) { + if (first) { + first = 0; + fprintf(stderr, " Interface %d, alternative %d\n", + ifnum, dev->altsetting[ifnum]); + } + fprintf(stderr, " Endpoint %d, IN, %s\n", ep, + tname[dev->ep_in[ep].type]); + } + if (dev->ep_out[ep].type != USB_ENDPOINT_XFER_INVALID && + dev->ep_out[ep].ifnum == ifnum) { + if (first) { + first = 0; + fprintf(stderr, " Interface %d, alternative %d\n", + ifnum, dev->altsetting[ifnum]); + } + fprintf(stderr, " Endpoint %d, OUT, %s\n", ep, + tname[dev->ep_out[ep].type]); + } + } + } + fprintf(stderr, "--\n"); +} + struct USBEndpoint *usb_ep_get(USBDevice *dev, int pid, int ep) { struct USBEndpoint *eps = pid == USB_TOKEN_IN ? dev->ep_in : dev->ep_out; diff --git a/hw/usb.h b/hw/usb.h index 60e8858..c35ff74 100644 --- a/hw/usb.h +++ b/hw/usb.h @@ -333,6 +333,7 @@ void usb_packet_complete(USBDevice *dev, USBPacket *p); void usb_cancel_packet(USBPacket * p); void usb_ep_init(USBDevice *dev); +void usb_ep_dump(USBDevice *dev); struct USBEndpoint *usb_ep_get(USBDevice *dev, int pid, int ep); uint8_t usb_ep_get_type(USBDevice *dev, int pid, int ep); uint8_t usb_ep_get_ifnum(USBDevice *dev, int pid, int ep); diff --git a/usb-linux.c b/usb-linux.c index cb66ef3..2a7b748 100644 --- a/usb-linux.c +++ b/usb-linux.c @@ -1214,6 +1214,9 @@ static int usb_linux_update_endp_table(USBHostDevice *s) i += descriptors[i]; } } +#ifdef DEBUG + usb_ep_dump(&s->dev); +#endif return 0; } -- 1.7.1