[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 03/22] xhci: add xhci_port_have_device
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 03/22] xhci: add xhci_port_have_device |
Date: |
Tue, 30 Oct 2012 15:26:35 +0100 |
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 <address@hidden>
---
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:
--
1.7.1
- [Qemu-devel] [PATCH 00/22] usb patch queue, Gerd Hoffmann, 2012/10/30
- [Qemu-devel] [PATCH 04/22] xhci: add xhci_port_notify, Gerd Hoffmann, 2012/10/30
- [Qemu-devel] [PATCH 02/22] xhci: s/xhci_update_port/xhci_port_update/, Gerd Hoffmann, 2012/10/30
- [Qemu-devel] [PATCH 07/22] xhci: add port trace points, Gerd Hoffmann, 2012/10/30
- [Qemu-devel] [PATCH 05/22] xhci: add xhci_port_reset, Gerd Hoffmann, 2012/10/30
- [Qemu-devel] [PATCH 03/22] xhci: add xhci_port_have_device,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 06/22] xhci: set pls in xhci_port_update & xhci_port_reset, Gerd Hoffmann, 2012/10/30
- [Qemu-devel] [PATCH 08/22] xhci: allow address slot being called multiple times, Gerd Hoffmann, 2012/10/30
- [Qemu-devel] [PATCH 01/22] xhci: add {get, set}_field macros & enum for pls, Gerd Hoffmann, 2012/10/30
- [Qemu-devel] [PATCH 18/22] usb/ehci-pci: dynamic type generation, Gerd Hoffmann, 2012/10/30
- [Qemu-devel] [PATCH 22/22] trace: allow disabling events in events file, Gerd Hoffmann, 2012/10/30
- [Qemu-devel] [PATCH 16/22] uhci: stick irq routing info into UHCIInfo too., Gerd Hoffmann, 2012/10/30
- [Qemu-devel] [PATCH 10/22] usb/ehci: Abstract away PCI DMA API, Gerd Hoffmann, 2012/10/30
- [Qemu-devel] [PATCH 19/22] usb/ehci-pci: add ich9 00:1a.* variant, Gerd Hoffmann, 2012/10/30
- [Qemu-devel] [PATCH 15/22] uhci: dynamic type generation, Gerd Hoffmann, 2012/10/30
- [Qemu-devel] [PATCH 14/22] usb/ehci: add sysbus variant, Gerd Hoffmann, 2012/10/30