[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 1/6] xhci: create xhci_detach_slot helper function
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 1/6] xhci: create xhci_detach_slot helper function |
Date: |
Mon, 14 Jan 2013 12:50:14 +0100 |
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/usb/hcd-xhci.c | 24 ++++++++++++++++++------
1 file changed, 18 insertions(+), 6 deletions(-)
diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c
index 92f2eee..3ff8bc1 100644
--- a/hw/usb/hcd-xhci.c
+++ b/hw/usb/hcd-xhci.c
@@ -2198,6 +2198,23 @@ static unsigned int xhci_get_slot(XHCIState *xhci,
XHCIEvent *event, XHCITRB *tr
return slotid;
}
+/* cleanup slot state on usb device detach */
+static void xhci_detach_slot(XHCIState *xhci, USBPort *uport)
+{
+ int slot;
+
+ for (slot = 0; slot < xhci->numslots; slot++) {
+ if (xhci->slots[slot].uport == uport) {
+ break;
+ }
+ }
+ if (slot == xhci->numslots) {
+ return;
+ }
+
+ xhci->slots[slot].uport = NULL;
+}
+
static TRBCCode xhci_get_port_bandwidth(XHCIState *xhci, uint64_t pctx)
{
dma_addr_t ctx;
@@ -2971,13 +2988,8 @@ static void xhci_child_detach(USBPort *uport, USBDevice
*child)
{
USBBus *bus = usb_bus_from_device(child);
XHCIState *xhci = container_of(bus, XHCIState, bus);
- int i;
- for (i = 0; i < xhci->numslots; i++) {
- if (xhci->slots[i].uport == uport) {
- xhci->slots[i].uport = NULL;
- }
- }
+ xhci_detach_slot(xhci, uport);
}
static USBPortOps xhci_uport_ops = {
--
1.7.9.7
- [Qemu-devel] [PULL 0/6] usb patch queue, Gerd Hoffmann, 2013/01/14
- [Qemu-devel] [PATCH 3/6] xhci: nuke transfe5rs on detach, Gerd Hoffmann, 2013/01/14
- [Qemu-devel] [PATCH 1/6] xhci: create xhci_detach_slot helper function,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 5/6] usb-host: Drop superfluous null test from usb_host_auto_scan(), Gerd Hoffmann, 2013/01/14
- [Qemu-devel] [PATCH 6/6] usb-host: Initialize dev->port the obviously safe way, Gerd Hoffmann, 2013/01/14
- [Qemu-devel] [PATCH 4/6] ehci: Assert state machine is sane w.r.t. EHCIQueue, Gerd Hoffmann, 2013/01/14
- [Qemu-devel] [PATCH 2/6] xhci: call xhci_detach_slot on root port detach too, Gerd Hoffmann, 2013/01/14
- Re: [Qemu-devel] [PULL 0/6] usb patch queue, Anthony Liguori, 2013/01/14