xemu-project/xemu
1
0
Fork 0
mirror of https://github.com/xemu-project/xemu.git synced 2024-11-24 03:59:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

usb-hub: add usb_hub_port_update()

Browse Source 
Helper function to update port status bits which depends on the
connected device.  We need the same logic for device attach and
port reset, so factor it out.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-id: 20190524070310.4952-5-kraxel@redhat.com
This commit is contained in:
Gerd Hoffmann 2019-05-24 09:03:09 +02:00
parent 868a420393
commit 638ac2d843
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
hw/usb/dev-hub.c
View File

@ -188,18 +188,28 @@ static bool usb_hub_port_clear(USBHubPort *port, uint16_t status)
return usb_hub_port_change(port, status); return usb_hub_port_change(port, status);
} }
static bool usb_hub_port_update(USBHubPort *port)
{
bool notify = false;
if (port->port.dev && port->port.dev->attached) {
notify = usb_hub_port_set(port, PORT_STAT_CONNECTION);
if (port->port.dev->speed == USB_SPEED_LOW) {
usb_hub_port_set(port, PORT_STAT_LOW_SPEED);
} else {
usb_hub_port_clear(port, PORT_STAT_LOW_SPEED);
}
}
return notify;
}
static void usb_hub_attach(USBPort *port1) static void usb_hub_attach(USBPort *port1)
{ {
USBHubState *s = port1->opaque; USBHubState *s = port1->opaque;
USBHubPort *port = &s->ports[port1->index]; USBHubPort *port = &s->ports[port1->index];
trace_usb_hub_attach(s->dev.addr, port1->index + 1); trace_usb_hub_attach(s->dev.addr, port1->index + 1);
usb_hub_port_set(port, PORT_STAT_CONNECTION); usb_hub_port_update(port);
if (port->port.dev->speed == USB_SPEED_LOW) {
usb_hub_port_set(port, PORT_STAT_LOW_SPEED);
} else {
usb_hub_port_clear(port, PORT_STAT_LOW_SPEED);
}
usb_wakeup(s->intr, 0); usb_wakeup(s->intr, 0);
} }
@ -287,12 +297,7 @@ static void usb_hub_handle_reset(USBDevice *dev)
port->wPortStatus = 0; port->wPortStatus = 0;
port->wPortChange = 0; port->wPortChange = 0;
usb_hub_port_set(port, PORT_STAT_POWER); usb_hub_port_set(port, PORT_STAT_POWER);
if (port->port.dev && port->port.dev->attached) { usb_hub_port_update(port);
usb_hub_port_set(port, PORT_STAT_CONNECTION);
if (port->port.dev->speed == USB_SPEED_LOW) {
usb_hub_port_set(port, PORT_STAT_LOW_SPEED);
}
}
} }
} }