summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2013-08-27 17:00:04 +0200
committerGerd Hoffmann <kraxel@redhat.com>2013-09-02 11:06:20 +0200
commitbdebd6ee81f4d849aa8541c289203e3992450db0 (patch)
treee75ddfc666f8a1b38fa6bbd89864e4497ffde4f4
parentb8cbc1374acdc1d8081f1dc57ef1249d263cf389 (diff)
downloadqemu-bdebd6ee81f4d849aa8541c289203e3992450db0.tar.gz
qemu-bdebd6ee81f4d849aa8541c289203e3992450db0.tar.bz2
qemu-bdebd6ee81f4d849aa8541c289203e3992450db0.zip
Revert "usb-hub: report status changes only once"
This reverts commit a309ee6e0a256f690760abfba44fceaa52a7c2f3. This isn't in line with the usb specification and adds regressions, win7 fails to drive the usb hub for example. Was added because it "solved" the issue of hubs interacting badly with the xhci host controller. Now with the root cause being fixed in xhci (commit <FIXME>) we can revert this one. Cc: qemu-stable@nongnu.org Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
-rw-r--r--hw/usb/dev-hub.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/hw/usb/dev-hub.c b/hw/usb/dev-hub.c
index 54f63c0d47..58647b4859 100644
--- a/hw/usb/dev-hub.c
+++ b/hw/usb/dev-hub.c
@@ -33,7 +33,6 @@ typedef struct USBHubPort {
USBPort port;
uint16_t wPortStatus;
uint16_t wPortChange;
- uint16_t wPortChange_reported;
} USBHubPort;
typedef struct USBHubState {
@@ -468,11 +467,8 @@ static void usb_hub_handle_data(USBDevice *dev, USBPacket *p)
status = 0;
for(i = 0; i < NUM_PORTS; i++) {
port = &s->ports[i];
- if (port->wPortChange &&
- port->wPortChange_reported != port->wPortChange) {
+ if (port->wPortChange)
status |= (1 << (i + 1));
- }
- port->wPortChange_reported = port->wPortChange;
}
if (status != 0) {
trace_usb_hub_status_report(s->dev.addr, status);