[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 05/22] xhci: add xhci_port_reset
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 05/22] xhci: add xhci_port_reset |
Date: |
Tue, 30 Oct 2012 15:26:37 +0100 |
Move port reset logic to its own function.
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/usb/hcd-xhci.c | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c
index 3af4639..1db803c 100644
--- a/hw/usb/hcd-xhci.c
+++ b/hw/usb/hcd-xhci.c
@@ -2387,6 +2387,13 @@ static void xhci_port_update(XHCIPort *port, int
is_detach)
xhci_port_notify(port, PORTSC_CSC);
}
+static void xhci_port_reset(XHCIPort *port)
+{
+ DPRINTF("xhci: port %d reset\n", port);
+ usb_device_reset(port->uport->dev);
+ port->portsc |= PORTSC_PRC | PORTSC_PED;
+}
+
static void xhci_reset(DeviceState *dev)
{
XHCIState *xhci = DO_UPCAST(XHCIState, pci_dev.qdev, dev);
@@ -2549,13 +2556,11 @@ static void xhci_port_write(void *ptr, hwaddr reg,
/* read/write bits */
portsc &= ~(PORTSC_PP|PORTSC_WCE|PORTSC_WDE|PORTSC_WOE);
portsc |= (val & (PORTSC_PP|PORTSC_WCE|PORTSC_WDE|PORTSC_WOE));
+ port->portsc = portsc;
/* write-1-to-start bits */
if (val & PORTSC_PR) {
- DPRINTF("xhci: port %d reset\n", port);
- usb_device_reset(port->uport->dev);
- portsc |= PORTSC_PRC | PORTSC_PED;
+ xhci_port_reset(port);
}
- port->portsc = portsc;
break;
case 0x04: /* PORTPMSC */
case 0x08: /* PORTLI */
--
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 <=
- [Qemu-devel] [PATCH 03/22] xhci: add xhci_port_have_device, Gerd Hoffmann, 2012/10/30
- [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