From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Gerd Hoffmann <kraxel@redhat.com>
Subject: [Qemu-devel] [PATCH 05/25] usb-hub: implement find_device
Date: Mon, 23 Jan 2012 15:54:51 +0100 [thread overview]
Message-ID: <1327330511-16307-6-git-send-email-kraxel@redhat.com> (raw)
In-Reply-To: <1327330511-16307-1-git-send-email-kraxel@redhat.com>
Implement the find_device callback for the usb hub. It'll loop over all
ports, calling usb_find_device for all enabled ports until it finds a
matching device.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
hw/usb-hub.c | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/hw/usb-hub.c b/hw/usb-hub.c
index d83cfb5..c9f30d9 100644
--- a/hw/usb-hub.c
+++ b/hw/usb-hub.c
@@ -220,6 +220,26 @@ static void usb_hub_complete(USBPort *port, USBPacket *packet)
s->dev.port->ops->complete(s->dev.port, packet);
}
+static USBDevice *usb_hub_find_device(USBDevice *dev, uint8_t addr)
+{
+ USBHubState *s = DO_UPCAST(USBHubState, dev, dev);
+ USBHubPort *port;
+ USBDevice *downstream;
+ int i;
+
+ for (i = 0; i < NUM_PORTS; i++) {
+ port = &s->ports[i];
+ if (!(port->wPortStatus & PORT_STAT_ENABLE)) {
+ continue;
+ }
+ downstream = usb_find_device(&port->port, addr);
+ if (downstream != NULL) {
+ return downstream;
+ }
+ }
+ return NULL;
+}
+
static void usb_hub_handle_reset(USBDevice *dev)
{
USBHubState *s = DO_UPCAST(USBHubState, dev, dev);
@@ -541,6 +561,7 @@ static struct USBDeviceInfo hub_info = {
.qdev.vmsd = &vmstate_usb_hub,
.usb_desc = &desc_hub,
.init = usb_hub_initfn,
+ .find_device = usb_hub_find_device,
.handle_packet = usb_hub_handle_packet,
.handle_reset = usb_hub_handle_reset,
.handle_control = usb_hub_handle_control,
--
1.7.1
next prev parent reply other threads:[~2012-01-23 14:55 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-23 14:54 [Qemu-devel] [PATCH 00/25] *** SUBJECT HERE *** Gerd Hoffmann
2012-01-23 14:54 ` [Qemu-devel] [PATCH 01/25] usb: kill USB_MSG_{ATTACH,DETACH} Gerd Hoffmann
2012-01-23 14:54 ` [Qemu-devel] [PATCH 02/25] usb: kill USB_MSG_RESET Gerd Hoffmann
2012-01-23 14:54 ` [Qemu-devel] [PATCH 03/25] usb: kill usb_send_msg Gerd Hoffmann
2012-01-23 14:54 ` [Qemu-devel] [PATCH 04/25] usb: add usb_find_device() Gerd Hoffmann
2012-01-23 14:54 ` Gerd Hoffmann [this message]
2012-01-23 14:54 ` [Qemu-devel] [PATCH 06/25] usb: handle dev == NULL in usb_handle_packet() Gerd Hoffmann
2012-01-23 14:54 ` [Qemu-devel] [PATCH 07/25] usb-uhci: switch to usb_find_device() Gerd Hoffmann
2012-01-23 14:54 ` [Qemu-devel] [PATCH 08/25] usb-ehci: " Gerd Hoffmann
2012-01-23 14:54 ` [Qemu-devel] [PATCH 09/25] usb-ohci: " Gerd Hoffmann
2012-01-23 14:54 ` [Qemu-devel] [PATCH 10/25] usb-musb: " Gerd Hoffmann
2012-01-23 14:54 ` [Qemu-devel] [PATCH 11/25] usb-xhci: " Gerd Hoffmann
2012-01-23 14:54 ` [Qemu-devel] [PATCH 12/25] usb: kill handle_packet callback Gerd Hoffmann
2012-01-23 14:54 ` [Qemu-devel] [PATCH 13/25] usb: fold usb_generic_handle_packet into usb_handle_packet Gerd Hoffmann
2012-01-23 14:55 ` [Qemu-devel] [PATCH 14/25] usb: USBPacket: add status, rename owner -> ep Gerd Hoffmann
2012-01-23 14:55 ` [Qemu-devel] [PATCH 15/25] usb: add USBEndpoint->{nr,pid} Gerd Hoffmann
2012-01-23 14:55 ` [Qemu-devel] [PATCH 16/25] usb: Set USBEndpoint in usb_packet_setup() Gerd Hoffmann
2012-01-23 14:55 ` [Qemu-devel] [PATCH 17/25] usb: maintain async packet list per endpoint Gerd Hoffmann
2012-01-23 14:55 ` [Qemu-devel] [PATCH 18/25] usb: pass USBEndpoint to usb_wakeup Gerd Hoffmann
2012-01-23 14:55 ` [Qemu-devel] [PATCH 19/25] usb: add USBBusOps->wakeup_endpoint Gerd Hoffmann
2012-01-23 14:55 ` [Qemu-devel] [PATCH 20/25] xhci: signal low- and fullspeed support Gerd Hoffmann
2012-01-23 14:55 ` [Qemu-devel] [PATCH 21/25] xhci: add trb type name lookup support Gerd Hoffmann
2012-01-23 14:55 ` [Qemu-devel] [PATCH 22/25] xhci: stop on errors Gerd Hoffmann
2012-01-23 14:55 ` [Qemu-devel] [PATCH 23/25] xhci: kill port arg from xhci_setup_packet Gerd Hoffmann
2012-01-23 14:55 ` [Qemu-devel] [PATCH 24/25] xhci: remote wakeup support Gerd Hoffmann
2012-01-23 14:55 ` [Qemu-devel] [PATCH 25/25] xhci: handle USB_RET_NAK Gerd Hoffmann
2012-01-23 15:00 ` [Qemu-devel] [PATCH 00/25] *** SUBJECT HERE *** 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=1327330511-16307-6-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).