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

usb: uhci: remote wakeup support. 

Add support for remote wakeup to the UHCI adapter.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Gerd Hoffmann 2010-12-01 11:47:40 +01:00
parent 01eacab6e9
commit 9159f6798e
1 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
hw/usb-uhci.c
View File

@ -57,13 +57,18 @@
#define TD_CTRL_NAK (1 << 19) #define TD_CTRL_NAK (1 << 19)
#define TD_CTRL_TIMEOUT (1 << 18) #define TD_CTRL_TIMEOUT (1 << 18)
#define UHCI_PORT_SUSPEND (1 << 12)
#define UHCI_PORT_RESET (1 << 9) #define UHCI_PORT_RESET (1 << 9)
#define UHCI_PORT_LSDA (1 << 8) #define UHCI_PORT_LSDA (1 << 8)
#define UHCI_PORT_RD (1 << 6)
#define UHCI_PORT_ENC (1 << 3) #define UHCI_PORT_ENC (1 << 3)
#define UHCI_PORT_EN (1 << 2) #define UHCI_PORT_EN (1 << 2)
#define UHCI_PORT_CSC (1 << 1) #define UHCI_PORT_CSC (1 << 1)
#define UHCI_PORT_CCS (1 << 0) #define UHCI_PORT_CCS (1 << 0)
#define UHCI_PORT_READ_ONLY (0x1bb)
#define UHCI_PORT_WRITE_CLEAR (UHCI_PORT_CSC | UHCI_PORT_ENC)
#define FRAME_TIMER_FREQ 1000 #define FRAME_TIMER_FREQ 1000
#define FRAME_MAX_LOOPS 100 #define FRAME_MAX_LOOPS 100
@ -497,9 +502,10 @@ static void uhci_ioport_writew(void *opaque, uint32_t addr, uint32_t val)
usb_send_msg(dev, USB_MSG_RESET); usb_send_msg(dev, USB_MSG_RESET);
} }
} }
port->ctrl = (port->ctrl & 0x01fb) | (val & ~0x01fb); port->ctrl &= UHCI_PORT_READ_ONLY;
port->ctrl |= (val & ~UHCI_PORT_READ_ONLY);
/* some bits are reset when a '1' is written to them */ /* some bits are reset when a '1' is written to them */
port->ctrl &= ~(val & 0x000a); port->ctrl &= ~(val & UHCI_PORT_WRITE_CLEAR);
} }
break; break;
} }
@ -629,6 +635,18 @@ static void uhci_detach(USBPort *port1)
uhci_resume(s); uhci_resume(s);
} }
static void uhci_wakeup(USBDevice *dev)
{
USBBus *bus = usb_bus_from_device(dev);
UHCIState *s = container_of(bus, UHCIState, bus);
UHCIPort *port = s->ports + dev->port->index;
if (port->ctrl & UHCI_PORT_SUSPEND && !(port->ctrl & UHCI_PORT_RD)) {
port->ctrl |= UHCI_PORT_RD;
uhci_resume(s);
}
}
static int uhci_broadcast_packet(UHCIState *s, USBPacket *p) static int uhci_broadcast_packet(UHCIState *s, USBPacket *p)
{ {
int i, ret; int i, ret;
@ -1094,6 +1112,7 @@ static void uhci_map(PCIDevice *pci_dev, int region_num,
static USBPortOps uhci_port_ops = { static USBPortOps uhci_port_ops = {
.attach = uhci_attach, .attach = uhci_attach,
.detach = uhci_detach, .detach = uhci_detach,
.wakeup = uhci_wakeup,
}; };
static int usb_uhci_common_initfn(UHCIState *s) static int usb_uhci_common_initfn(UHCIState *s)