From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:44730) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RpLJ5-0007pR-TW for qemu-devel@nongnu.org; Mon, 23 Jan 2012 09:55:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RpLIs-0004U1-0s for qemu-devel@nongnu.org; Mon, 23 Jan 2012 09:55:34 -0500 Received: from mx1.redhat.com ([209.132.183.28]:12043) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RpLIr-0004Tf-KE for qemu-devel@nongnu.org; Mon, 23 Jan 2012 09:55:25 -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 q0NEtOgo012688 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 23 Jan 2012 09:55:24 -0500 From: Gerd Hoffmann Date: Mon, 23 Jan 2012 15:55:01 +0100 Message-Id: <1327330511-16307-16-git-send-email-kraxel@redhat.com> In-Reply-To: <1327330511-16307-1-git-send-email-kraxel@redhat.com> References: <1327330511-16307-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 15/25] usb: add USBEndpoint->{nr,pid} List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann Add a "nr" and "pid" fields to USBEndpoint so you can easily figure the endpoint number and direction of any given endpoint. Signed-off-by: Gerd Hoffmann --- hw/usb.c | 5 +++++ hw/usb.h | 2 ++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/hw/usb.c b/hw/usb.c index 9f44565..73b3ec2 100644 --- a/hw/usb.c +++ b/hw/usb.c @@ -409,10 +409,15 @@ void usb_ep_init(USBDevice *dev) { int ep; + dev->ep_ctl.nr = 0; dev->ep_ctl.type = USB_ENDPOINT_XFER_CONTROL; dev->ep_ctl.ifnum = 0; dev->ep_ctl.dev = dev; for (ep = 0; ep < USB_MAX_ENDPOINTS; ep++) { + dev->ep_in[ep].nr = ep + 1; + dev->ep_out[ep].nr = ep + 1; + dev->ep_in[ep].pid = USB_TOKEN_IN; + dev->ep_out[ep].pid = USB_TOKEN_OUT; dev->ep_in[ep].type = USB_ENDPOINT_XFER_INVALID; dev->ep_out[ep].type = USB_ENDPOINT_XFER_INVALID; dev->ep_in[ep].ifnum = 0; diff --git a/hw/usb.h b/hw/usb.h index 2c834d7..5202f3c 100644 --- a/hw/usb.h +++ b/hw/usb.h @@ -169,6 +169,8 @@ struct USBDescString { #define USB_MAX_INTERFACES 16 struct USBEndpoint { + uint8_t nr; + uint8_t pid; uint8_t type; uint8_t ifnum; int max_packet_size; -- 1.7.1