[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 4/5] usb-hub: add usb_hub_port_update()
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 4/5] usb-hub: add usb_hub_port_update() |
Date: |
Wed, 22 May 2019 11:23:50 +0200 |
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.
---
hw/usb/dev-hub.c | 29 +++++++++++++++++------------
1 file changed, 17 insertions(+), 12 deletions(-)
diff --git a/hw/usb/dev-hub.c b/hw/usb/dev-hub.c
index 4940280264b4..c1bc9785878c 100644
--- a/hw/usb/dev-hub.c
+++ b/hw/usb/dev-hub.c
@@ -188,18 +188,28 @@ static bool usb_hub_port_clear(USBHubPort *port, uint16_t
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)
{
USBHubState *s = port1->opaque;
USBHubPort *port = &s->ports[port1->index];
trace_usb_hub_attach(s->dev.addr, port1->index + 1);
- 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);
- }
+ usb_hub_port_update(port);
usb_wakeup(s->intr, 0);
}
@@ -287,12 +297,7 @@ static void usb_hub_handle_reset(USBDevice *dev)
port->wPortStatus = 0;
port->wPortChange = 0;
usb_hub_port_set(port, PORT_STAT_POWER);
- if (port->port.dev && port->port.dev->attached) {
- 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);
- }
- }
+ usb_hub_port_update(port);
}
}
--
2.18.1
- [Qemu-devel] [PATCH 0/5] usb-hub: cleanups, configurable port count, per-port power switching emulation., Gerd Hoffmann, 2019/05/22
- [Qemu-devel] [PATCH 1/5] usb-hub: tweak feature names, Gerd Hoffmann, 2019/05/22
- [Qemu-devel] [PATCH 4/5] usb-hub: add usb_hub_port_update(),
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 2/5] usb-hub: make number of ports runtime-configurable, Gerd Hoffmann, 2019/05/22
- [Qemu-devel] [PATCH 3/5] usb-hub: add helpers to update port state, Gerd Hoffmann, 2019/05/22
- [Qemu-devel] [PATCH 5/5] usb-hub: emulate per port power switching, Gerd Hoffmann, 2019/05/22
- Re: [Qemu-devel] [PATCH 0/5] usb-hub: cleanups, configurable port count, per-port power switching emulation., no-reply, 2019/05/22