[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 04/31] xhci: add xhci_port_notify
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 04/31] xhci: add xhci_port_notify |
Date: |
Thu, 1 Nov 2012 16:54:17 +0100 |
Create a function to notify the guest about port
status changes and put it into use.
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/usb/hcd-xhci.c | 31 +++++++++++++++++--------------
1 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c
index 62cca90..3af4639 100644
--- a/hw/usb/hcd-xhci.c
+++ b/hw/usb/hcd-xhci.c
@@ -2348,6 +2348,21 @@ static bool xhci_port_have_device(XHCIPort *port)
return true;
}
+static void xhci_port_notify(XHCIPort *port, uint32_t bits)
+{
+ XHCIEvent ev = { ER_PORT_STATUS_CHANGE, CC_SUCCESS,
+ port->portnr << 24 };
+
+ if ((port->portsc & bits) == bits) {
+ return;
+ }
+ port->portsc |= bits;
+ if (!xhci_running(port->xhci)) {
+ return;
+ }
+ xhci_event(port->xhci, &ev, 0);
+}
+
static void xhci_port_update(XHCIPort *port, int is_detach)
{
port->portsc = PORTSC_PP;
@@ -2369,13 +2384,7 @@ static void xhci_port_update(XHCIPort *port, int
is_detach)
}
}
- if (xhci_running(port->xhci)) {
- port->portsc |= PORTSC_CSC;
- XHCIEvent ev = { ER_PORT_STATUS_CHANGE, CC_SUCCESS,
- port->portnr << 24};
- xhci_event(port->xhci, &ev, 0);
- DPRINTF("xhci: port change event for port %d\n", port->portnr);
- }
+ xhci_port_notify(port, PORTSC_CSC);
}
static void xhci_reset(DeviceState *dev)
@@ -2865,18 +2874,12 @@ static void xhci_wakeup(USBPort *usbport)
{
XHCIState *xhci = usbport->opaque;
XHCIPort *port = xhci_lookup_port(xhci, usbport);
- XHCIEvent ev = { ER_PORT_STATUS_CHANGE, CC_SUCCESS,
- port->portnr << 24};
if (get_field(port->portsc, PORTSC_PLS) != PLS_U3) {
return;
}
set_field(&port->portsc, PLS_RESUME, PORTSC_PLS);
- if (port->portsc & PORTSC_PLC) {
- return;
- }
- port->portsc |= PORTSC_PLC;
- xhci_event(xhci, &ev, 0);
+ xhci_port_notify(port, PORTSC_PLC);
}
static void xhci_complete(USBPort *port, USBPacket *packet)
--
1.7.1
- [Qemu-devel] [PULL 00/31] usb patch queue, Gerd Hoffmann, 2012/11/01
- [Qemu-devel] [PATCH 03/31] xhci: add xhci_port_have_device, Gerd Hoffmann, 2012/11/01
- [Qemu-devel] [PATCH 04/31] xhci: add xhci_port_notify,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 06/31] xhci: set pls in xhci_port_update & xhci_port_reset, Gerd Hoffmann, 2012/11/01
- [Qemu-devel] [PATCH 08/31] xhci: allow address slot being called multiple times, Gerd Hoffmann, 2012/11/01
- [Qemu-devel] [PATCH 10/31] usb/ehci: Abstract away PCI DMA API, Gerd Hoffmann, 2012/11/01
- [Qemu-devel] [PATCH 07/31] xhci: add port trace points, Gerd Hoffmann, 2012/11/01
- [Qemu-devel] [PATCH 09/31] usb/ehci: parameterise the register region offsets, Gerd Hoffmann, 2012/11/01
- [Qemu-devel] [PATCH 20/31] usb/ehci-pci: add ich9 00:1a.* variant, Gerd Hoffmann, 2012/11/01
- [Qemu-devel] [PATCH 02/31] xhci: s/xhci_update_port/xhci_port_update/, Gerd Hoffmann, 2012/11/01
- [Qemu-devel] [PATCH 21/31] usb/ehci-pci: add helper to create ich9 usb controllers, Gerd Hoffmann, 2012/11/01
- [Qemu-devel] [PATCH 11/31] usb/ehci: seperate out PCIisms, Gerd Hoffmann, 2012/11/01
- [Qemu-devel] [PATCH 29/31] usb-redir: Use reject rather the disconnect on bad ep info, Gerd Hoffmann, 2012/11/01