From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Gerd Hoffmann <kraxel@redhat.com>
Subject: [Qemu-devel] [PATCH 08/12] usb: add ifnum to USBEndpoint
Date: Fri, 6 Jan 2012 14:59:02 +0100 [thread overview]
Message-ID: <1325858346-1071-9-git-send-email-kraxel@redhat.com> (raw)
In-Reply-To: <1325858346-1071-1-git-send-email-kraxel@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
hw/usb.c | 14 ++++++++++++++
hw/usb.h | 3 +++
usb-linux.c | 1 +
3 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/hw/usb.c b/hw/usb.c
index 5d6baaf..6ba063a 100644
--- a/hw/usb.c
+++ b/hw/usb.c
@@ -422,6 +422,8 @@ void usb_ep_init(USBDevice *dev)
for (ep = 0; ep < USB_MAX_ENDPOINTS; ep++) {
dev->ep_in[ep].type = USB_ENDPOINT_XFER_INVALID;
dev->ep_out[ep].type = USB_ENDPOINT_XFER_INVALID;
+ dev->ep_in[ep].ifnum = 0;
+ dev->ep_out[ep].ifnum = 0;
}
}
@@ -444,3 +446,15 @@ void usb_ep_set_type(USBDevice *dev, int pid, int ep, uint8_t type)
struct USBEndpoint *uep = usb_ep_get(dev, pid, ep);
uep->type = type;
}
+
+uint8_t usb_ep_get_ifnum(USBDevice *dev, int pid, int ep)
+{
+ struct USBEndpoint *uep = usb_ep_get(dev, pid, ep);
+ return uep->ifnum;
+}
+
+void usb_ep_set_ifnum(USBDevice *dev, int pid, int ep, uint8_t ifnum)
+{
+ struct USBEndpoint *uep = usb_ep_get(dev, pid, ep);
+ uep->ifnum = ifnum;
+}
diff --git a/hw/usb.h b/hw/usb.h
index 85cbe71..60e8858 100644
--- a/hw/usb.h
+++ b/hw/usb.h
@@ -175,6 +175,7 @@ struct USBDescString {
struct USBEndpoint {
uint8_t type;
+ uint8_t ifnum;
};
/* definition of a USB device */
@@ -334,7 +335,9 @@ void usb_cancel_packet(USBPacket * p);
void usb_ep_init(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);
void usb_ep_set_type(USBDevice *dev, int pid, int ep, uint8_t type);
+void usb_ep_set_ifnum(USBDevice *dev, int pid, int ep, uint8_t ifnum);
void usb_attach(USBPort *port);
void usb_detach(USBPort *port);
diff --git a/usb-linux.c b/usb-linux.c
index 9967975..cb66ef3 100644
--- a/usb-linux.c
+++ b/usb-linux.c
@@ -1206,6 +1206,7 @@ static int usb_linux_update_endp_table(USBHostDevice *s)
assert(usb_ep_get_type(&s->dev, pid, ep) ==
USB_ENDPOINT_XFER_INVALID);
usb_ep_set_type(&s->dev, pid, ep, type);
+ usb_ep_set_ifnum(&s->dev, pid, ep, interface);
epd = get_endp(s, pid, ep);
epd->halted = 0;
--
1.7.1
next prev parent reply other threads:[~2012-01-06 13:59 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-06 13:58 [Qemu-devel] [PATCH 00/12] usb patch queue: audio, xhci Gerd Hoffmann
2012-01-06 13:58 ` [Qemu-devel] [PATCH 01/12] usb-host: rip out legacy procfs support Gerd Hoffmann
2012-01-06 13:58 ` [Qemu-devel] [PATCH 02/12] usb: track configuration and interface count in USBDevice Gerd Hoffmann
2012-01-06 13:58 ` [Qemu-devel] [PATCH 03/12] usb: track altsetting " Gerd Hoffmann
2012-01-06 13:58 ` [Qemu-devel] [PATCH 04/12] usb-desc: audio endpoint support Gerd Hoffmann
2012-01-06 13:58 ` [Qemu-devel] [PATCH 05/12] usb: add audio device model Gerd Hoffmann
2012-01-06 17:23 ` Alex Bradbury
2012-01-06 13:59 ` [Qemu-devel] [PATCH 06/12] xhci: Initial xHCI implementation Gerd Hoffmann
2012-01-06 14:54 ` Stefan Weil
2012-01-09 9:30 ` Gerd Hoffmann
2012-01-06 13:59 ` [Qemu-devel] [PATCH 07/12] usb: add USBEndpoint Gerd Hoffmann
2012-01-06 13:59 ` Gerd Hoffmann [this message]
2012-01-06 13:59 ` [Qemu-devel] [PATCH 09/12] usb-desc: USBEndpoint support Gerd Hoffmann
2012-01-06 13:59 ` [Qemu-devel] [PATCH 10/12] usb/debug: add usb_ep_dump Gerd Hoffmann
2012-01-06 13:59 ` [Qemu-devel] [PATCH 11/12] usb: add max_packet_size to USBEndpoint Gerd Hoffmann
2012-01-06 13:59 ` [Qemu-devel] [PATCH 12/12] usb: link packets to endpoints not devices Gerd Hoffmann
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=1325858346-1071-9-git-send-email-kraxel@redhat.com \
--to=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).