ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

xhci: add xhci_port_reset 

Move port reset logic to its own function.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Gerd Hoffmann 2012-10-26 10:22:37 +02:00
parent f705a36280
commit 40030130d1
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hw/usb/hcd-xhci.c
View File

@ -2387,6 +2387,13 @@ static void xhci_port_update(XHCIPort *port, int is_detach)
xhci_port_notify(port, PORTSC_CSC); 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) static void xhci_reset(DeviceState *dev)
{ {
XHCIState *xhci = DO_UPCAST(XHCIState, pci_dev.qdev, 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 */ /* read/write bits */
portsc &= ~(PORTSC_PP|PORTSC_WCE|PORTSC_WDE|PORTSC_WOE); portsc &= ~(PORTSC_PP|PORTSC_WCE|PORTSC_WDE|PORTSC_WOE);
portsc |= (val & (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 */ /* write-1-to-start bits */
if (val & PORTSC_PR) { if (val & PORTSC_PR) {
DPRINTF("xhci: port %d reset\n", port); xhci_port_reset(port);
usb_device_reset(port->uport->dev);
portsc |= PORTSC_PRC | PORTSC_PED;
} }
port->portsc = portsc;
break; break;
case 0x04: /* PORTPMSC */ case 0x04: /* PORTPMSC */
case 0x08: /* PORTLI */ case 0x08: /* PORTLI */