diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2012-01-10 18:05:22 +0100 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2012-02-10 11:31:57 +0100 |
| commit | e74495e3ade61ceabc5a00713900d8295e4042f4 (patch) | |
| tree | dc19f0053af7247e17b2b9a611519aea0b1cadf3 | |
| parent | 87e043f17e9b3781b3c29c02ff32abc23ac15708 (diff) | |
| download | focaccia-qemu-e74495e3ade61ceabc5a00713900d8295e4042f4.tar.gz focaccia-qemu-e74495e3ade61ceabc5a00713900d8295e4042f4.zip | |
usb-xhci: switch to usb_find_device()
Switch over xHCI to use the new usb_find_device() function for device lookup. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
| -rw-r--r-- | hw/usb-xhci.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/hw/usb-xhci.c b/hw/usb-xhci.c index 7028338a28..aa236c9a3f 100644 --- a/hw/usb-xhci.c +++ b/hw/usb-xhci.c @@ -1385,6 +1385,14 @@ static int xhci_complete_packet(XHCITransfer *xfer, int ret) return 0; } +static USBDevice *xhci_find_device(XHCIPort *port, uint8_t addr) +{ + if (!(port->portsc & PORTSC_PED)) { + return NULL; + } + return usb_find_device(&port->port, addr); +} + static int xhci_fire_ctl_transfer(XHCIState *xhci, XHCITransfer *xfer) { XHCITRB *trb_setup, *trb_status; @@ -1444,7 +1452,7 @@ static int xhci_fire_ctl_transfer(XHCIState *xhci, XHCITransfer *xfer) xfer->data_length = wLength; port = &xhci->ports[xhci->slots[xfer->slotid-1].port-1]; - dev = port->port.dev; + dev = xhci_find_device(port, xhci->slots[xfer->slotid-1].devaddr); if (!dev) { fprintf(stderr, "xhci: slot %d port %d has no device\n", xfer->slotid, xhci->slots[xfer->slotid-1].port); @@ -1502,7 +1510,7 @@ static int xhci_submit(XHCIState *xhci, XHCITransfer *xfer, XHCIEPContext *epctx } port = &xhci->ports[xhci->slots[xfer->slotid-1].port-1]; - dev = port->port.dev; + dev = xhci_find_device(port, xhci->slots[xfer->slotid-1].devaddr); if (!dev) { fprintf(stderr, "xhci: slot %d port %d has no device\n", xfer->slotid, xhci->slots[xfer->slotid-1].port); |