diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2012-10-26 10:15:47 +0200 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2012-11-01 13:10:09 +0100 |
| commit | 6a32f80f056b577d275268e4f6f3477ba721c94f (patch) | |
| tree | 3d5a2be1e7707ab86d49aea9cb3de29463c3f674 /hw/usb/hcd-xhci.c | |
| parent | f321402785f443d7b95e746aae686e28d74e344c (diff) | |
| download | qemu-6a32f80f056b577d275268e4f6f3477ba721c94f.zip qemu-6a32f80f056b577d275268e4f6f3477ba721c94f.tar.gz qemu-6a32f80f056b577d275268e4f6f3477ba721c94f.tar.bz2 | |
xhci: add xhci_port_have_device
Factor out the code which checks whenever a usb device is attached
to the port in question. No functional change.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'hw/usb/hcd-xhci.c')
| -rw-r--r-- | hw/usb/hcd-xhci.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c index f5ab692..62cca90 100644 --- a/hw/usb/hcd-xhci.c +++ b/hw/usb/hcd-xhci.c @@ -2337,11 +2337,21 @@ static void xhci_process_commands(XHCIState *xhci) } } +static bool xhci_port_have_device(XHCIPort *port) +{ + if (!port->uport->dev || !port->uport->dev->attached) { + return false; /* no device present */ + } + if (!((1 << port->uport->dev->speed) & port->speedmask)) { + return false; /* speed mismatch */ + } + return true; +} + static void xhci_port_update(XHCIPort *port, int is_detach) { port->portsc = PORTSC_PP; - if (port->uport->dev && port->uport->dev->attached && !is_detach && - (1 << port->uport->dev->speed) & port->speedmask) { + if (!is_detach && xhci_port_have_device(port)) { port->portsc |= PORTSC_CCS; switch (port->uport->dev->speed) { case USB_SPEED_LOW: |