[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v2 4/5] usb-hub: add usb_hub_port_update()
From: |
Philippe Mathieu-Daudé |
Subject: |
Re: [Qemu-devel] [PATCH v2 4/5] usb-hub: add usb_hub_port_update() |
Date: |
Fri, 24 May 2019 09:45:35 +0200 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 |
On 5/24/19 9:03 AM, Gerd Hoffmann wrote:
> 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 <address@hidden>
> ---
> 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 1cc92a5f9abe..29f4d6723e26 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);
> }
> }
>
>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Tested-by: Philippe Mathieu-Daudé <address@hidden>
- [Qemu-devel] [PATCH v2 0/5] usb-hub: cleanups, configurable port count, per-port power switching emulation., Gerd Hoffmann, 2019/05/24
- [Qemu-devel] [PATCH v2 4/5] usb-hub: add usb_hub_port_update(), Gerd Hoffmann, 2019/05/24
- Re: [Qemu-devel] [PATCH v2 4/5] usb-hub: add usb_hub_port_update(),
Philippe Mathieu-Daudé <=
- [Qemu-devel] [PATCH v2 1/5] usb-hub: tweak feature names, Gerd Hoffmann, 2019/05/24
- [Qemu-devel] [PATCH v2 5/5] usb-hub: emulate per port power switching, Gerd Hoffmann, 2019/05/24
- [Qemu-devel] [PATCH v2 2/5] usb-hub: make number of ports runtime-configurable, Gerd Hoffmann, 2019/05/24
- [Qemu-devel] [PATCH v2 3/5] usb-hub: add helpers to update port state, Gerd Hoffmann, 2019/05/24