From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:52642) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RTGZf-0003GE-6k for qemu-devel@nongnu.org; Wed, 23 Nov 2011 12:25:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RTGZX-0008Kn-16 for qemu-devel@nongnu.org; Wed, 23 Nov 2011 12:25:31 -0500 Received: from mx1.redhat.com ([209.132.183.28]:6564) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RTGZW-0008Ka-Po for qemu-devel@nongnu.org; Wed, 23 Nov 2011 12:25:22 -0500 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id pANHPLeg029079 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 23 Nov 2011 12:25:21 -0500 From: Gerd Hoffmann Date: Wed, 23 Nov 2011 18:25:14 +0100 Message-Id: <1322069117-27150-5-git-send-email-kraxel@redhat.com> In-Reply-To: <1322069117-27150-1-git-send-email-kraxel@redhat.com> References: <1322069117-27150-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 4/7] usb-hub: implement reset List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann based on a patch from hkran@linux.vnet.ibm.com Signed-off-by: Gerd Hoffmann --- hw/usb-hub.c | 20 +++++++++++++++++--- 1 files changed, 17 insertions(+), 3 deletions(-) diff --git a/hw/usb-hub.c b/hw/usb-hub.c index 5b48763..e195937 100644 --- a/hw/usb-hub.c +++ b/hw/usb-hub.c @@ -222,7 +222,22 @@ static void usb_hub_complete(USBPort *port, USBPacket *packet) static void usb_hub_handle_reset(USBDevice *dev) { - /* XXX: do it */ + USBHubState *s = DO_UPCAST(USBHubState, dev, dev); + USBHubPort *port; + int i; + + for (i = 0; i < NUM_PORTS; i++) { + port = s->ports + i; + port->wPortStatus = PORT_STAT_POWER; + port->wPortChange = 0; + if (port->port.dev && port->port.dev->attached) { + port->wPortStatus |= PORT_STAT_CONNECTION; + port->wPortChange |= PORT_STAT_C_CONNECTION; + if (port->port.dev->speed == USB_SPEED_LOW) { + port->wPortStatus |= PORT_STAT_LOW_SPEED; + } + } + } } static int usb_hub_handle_control(USBDevice *dev, USBPacket *p, @@ -497,9 +512,8 @@ static int usb_hub_initfn(USBDevice *dev) &port->port, s, i, &usb_hub_port_ops, USB_SPEED_MASK_LOW | USB_SPEED_MASK_FULL); usb_port_location(&port->port, dev->port, i+1); - port->wPortStatus = PORT_STAT_POWER; - port->wPortChange = 0; } + usb_hub_handle_reset(dev); return 0; } -- 1.7.1