84 lines
2.9 KiB
Diff
84 lines
2.9 KiB
Diff
From 397fed3bc9bf6dd0e8e18c5be077897299e5c4e2 Mon Sep 17 00:00:00 2001
|
|
From: Hans de Goede <hdegoede@redhat.com>
|
|
Date: Thu, 30 Jun 2011 12:05:19 +0200
|
|
Subject: [PATCH 03/35] usb: Move (initial) call of usb_port_location to
|
|
usb_fill_port
|
|
|
|
Cleanup / preparation patch for companion controller support. Note that
|
|
as a "side-effect" this patch also fixes the milkymist-softusb controller
|
|
not having a port_location set for its ports.
|
|
|
|
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
|
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
---
|
|
hw/usb-bus.c | 1 +
|
|
hw/usb-ehci.c | 1 -
|
|
hw/usb-musb.c | 1 -
|
|
hw/usb-ohci.c | 1 -
|
|
hw/usb-uhci.c | 1 -
|
|
5 files changed, 1 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/hw/usb-bus.c b/hw/usb-bus.c
|
|
index 776974e..e37e8a2 100644
|
|
--- a/hw/usb-bus.c
|
|
+++ b/hw/usb-bus.c
|
|
@@ -149,6 +149,7 @@ static void usb_fill_port(USBPort *port, void *opaque, int index,
|
|
port->index = index;
|
|
port->ops = ops;
|
|
port->speedmask = speedmask;
|
|
+ usb_port_location(port, NULL, index + 1);
|
|
}
|
|
|
|
void usb_register_port(USBBus *bus, USBPort *port, void *opaque, int index,
|
|
diff --git a/hw/usb-ehci.c b/hw/usb-ehci.c
|
|
index 91fb7de..88cb2c2 100644
|
|
--- a/hw/usb-ehci.c
|
|
+++ b/hw/usb-ehci.c
|
|
@@ -2206,7 +2206,6 @@ static int usb_ehci_initfn(PCIDevice *dev)
|
|
for(i = 0; i < NB_PORTS; i++) {
|
|
usb_register_port(&s->bus, &s->ports[i], s, i, &ehci_port_ops,
|
|
USB_SPEED_MASK_HIGH);
|
|
- usb_port_location(&s->ports[i], NULL, i+1);
|
|
s->ports[i].dev = 0;
|
|
}
|
|
|
|
diff --git a/hw/usb-musb.c b/hw/usb-musb.c
|
|
index d15971f..84e6017 100644
|
|
--- a/hw/usb-musb.c
|
|
+++ b/hw/usb-musb.c
|
|
@@ -369,7 +369,6 @@ struct MUSBState *musb_init(qemu_irq *irqs)
|
|
usb_bus_new(&s->bus, &musb_bus_ops, NULL /* FIXME */);
|
|
usb_register_port(&s->bus, &s->port, s, 0, &musb_port_ops,
|
|
USB_SPEED_MASK_LOW | USB_SPEED_MASK_FULL);
|
|
- usb_port_location(&s->port, NULL, 1);
|
|
|
|
return s;
|
|
}
|
|
diff --git a/hw/usb-ohci.c b/hw/usb-ohci.c
|
|
index 1c29b9f..95e4623 100644
|
|
--- a/hw/usb-ohci.c
|
|
+++ b/hw/usb-ohci.c
|
|
@@ -1742,7 +1742,6 @@ static void usb_ohci_init(OHCIState *ohci, DeviceState *dev,
|
|
for (i = 0; i < num_ports; i++) {
|
|
usb_register_port(&ohci->bus, &ohci->rhport[i].port, ohci, i, &ohci_port_ops,
|
|
USB_SPEED_MASK_LOW | USB_SPEED_MASK_FULL);
|
|
- usb_port_location(&ohci->rhport[i].port, NULL, i+1);
|
|
}
|
|
|
|
ohci->async_td = 0;
|
|
diff --git a/hw/usb-uhci.c b/hw/usb-uhci.c
|
|
index 405fa7b..fd25d2a 100644
|
|
--- a/hw/usb-uhci.c
|
|
+++ b/hw/usb-uhci.c
|
|
@@ -1129,7 +1129,6 @@ static int usb_uhci_common_initfn(PCIDevice *dev)
|
|
for(i = 0; i < NB_PORTS; i++) {
|
|
usb_register_port(&s->bus, &s->ports[i].port, s, i, &uhci_port_ops,
|
|
USB_SPEED_MASK_LOW | USB_SPEED_MASK_FULL);
|
|
- usb_port_location(&s->ports[i].port, NULL, i+1);
|
|
}
|
|
s->frame_timer = qemu_new_timer_ns(vm_clock, uhci_frame_timer, s);
|
|
s->num_ports_vmstate = NB_PORTS;
|
|
--
|
|
1.7.5.1
|
|
|