This makes the mem MemoryRegion available to derived instance_inits.
Signed-off-by: Andreas Färber
---
hw/usb/hcd-ehci-pci.c| 19 ++-
hw/usb/hcd-ehci-sysbus.c | 16 +---
hw/usb/hcd-ehci.c| 25 +++--
hw/usb/hcd-ehci.h|1 +
4 Dateien geändert, 43 Zeilen hinzugefügt(+), 18 Zeilen entfernt(-)
diff --git a/hw/usb/hcd-ehci-pci.c b/hw/usb/hcd-ehci-pci.c
index 70fc65e..05b4a6d 100644
--- a/hw/usb/hcd-ehci-pci.c
+++ b/hw/usb/hcd-ehci-pci.c
@@ -60,20 +60,28 @@ static int usb_ehci_pci_initfn(PCIDevice *dev)
pci_conf[0x6e] = 0x00;
pci_conf[0x6f] = 0xc0; /* USBLEFCTLSTS */
-s->caps[0x09] = 0x68;/* EECP */
-
s->irq = dev->irq[3];
s->dma = pci_dma_context(dev);
-s->capsbase = 0x00;
-s->opregbase = 0x20;
-
usb_ehci_realize(s, DEVICE(dev), NULL);
pci_register_bar(dev, 0, PCI_BASE_ADDRESS_SPACE_MEMORY, &s->mem);
return 0;
}
+static void usb_ehci_pci_init(Object *obj)
+{
+EHCIPCIState *i = PCI_EHCI(obj);
+EHCIState *s = &i->ehci;
+
+s->caps[0x09] = 0x68;/* EECP */
+
+s->capsbase = 0x00;
+s->opregbase = 0x20;
+
+usb_ehci_init(s, DEVICE(obj));
+}
+
static void usb_ehci_pci_write_config(PCIDevice *dev, uint32_t addr,
uint32_t val, int l)
{
@@ -122,6 +130,7 @@ static const TypeInfo ehci_pci_type_info = {
.name = TYPE_PCI_EHCI,
.parent = TYPE_PCI_DEVICE,
.instance_size = sizeof(EHCIPCIState),
+.instance_init = usb_ehci_pci_init,
.abstract = true,
.class_init = ehci_class_init,
};
diff --git a/hw/usb/hcd-ehci-sysbus.c b/hw/usb/hcd-ehci-sysbus.c
index 4be3d17..92594a2 100644
--- a/hw/usb/hcd-ehci-sysbus.c
+++ b/hw/usb/hcd-ehci-sysbus.c
@@ -36,15 +36,24 @@ static void usb_ehci_sysbus_realize(DeviceState *dev, Error
**errp)
{
SysBusDevice *d = SYS_BUS_DEVICE(dev);
EHCISysBusState *i = SYS_BUS_EHCI(dev);
-SysBusEHCIClass *sec = SYS_BUS_EHCI_GET_CLASS(dev);
+EHCIState *s = &i->ehci;
+
+usb_ehci_realize(s, dev, errp);
+sysbus_init_irq(d, &s->irq);
+}
+
+static void ehci_sysbus_init(Object *obj)
+{
+SysBusDevice *d = SYS_BUS_DEVICE(obj);
+EHCISysBusState *i = SYS_BUS_EHCI(obj);
+SysBusEHCIClass *sec = SYS_BUS_EHCI_GET_CLASS(obj);
EHCIState *s = &i->ehci;
s->capsbase = sec->capsbase;
s->opregbase = sec->opregbase;
s->dma = &dma_context_memory;
-usb_ehci_realize(s, dev, errp);
-sysbus_init_irq(d, &s->irq);
+usb_ehci_init(s, DEVICE(obj));
sysbus_init_mmio(d, &s->mem);
}
@@ -61,6 +70,7 @@ static const TypeInfo ehci_type_info = {
.name = TYPE_SYS_BUS_EHCI,
.parent= TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(EHCISysBusState),
+.instance_init = ehci_sysbus_init,
.abstract = true,
.class_init= ehci_sysbus_class_init,
.class_size= sizeof(SysBusEHCIClass),
diff --git a/hw/usb/hcd-ehci.c b/hw/usb/hcd-ehci.c
index 3d20556..b233c8f 100644
--- a/hw/usb/hcd-ehci.c
+++ b/hw/usb/hcd-ehci.c
@@ -2505,6 +2505,21 @@ void usb_ehci_realize(EHCIState *s, DeviceState *dev,
Error **errp)
{
int i;
+for (i = 0; i < NB_PORTS; i++) {
+usb_register_port(&s->bus, &s->ports[i], s, i, &ehci_port_ops,
+ USB_SPEED_MASK_HIGH);
+s->ports[i].dev = 0;
+}
+
+s->frame_timer = qemu_new_timer_ns(vm_clock, ehci_frame_timer, s);
+s->async_bh = qemu_bh_new(ehci_frame_timer, s);
+
+qemu_register_reset(ehci_reset, s);
+qemu_add_vm_change_state_handler(usb_ehci_vm_state_change, s);
+}
+
+void usb_ehci_init(EHCIState *s, DeviceState *dev)
+{
/* 2.2 host controller interface version */
s->caps[0x00] = (uint8_t)(s->opregbase - s->capsbase);
s->caps[0x01] = 0x00;
@@ -2519,21 +2534,11 @@ void usb_ehci_realize(EHCIState *s, DeviceState *dev,
Error **errp)
s->caps[0x0b] = 0x00;
usb_bus_new(&s->bus, &ehci_bus_ops, 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);
-s->ports[i].dev = 0;
-}
-s->frame_timer = qemu_new_timer_ns(vm_clock, ehci_frame_timer, s);
-s->async_bh = qemu_bh_new(ehci_frame_timer, s);
QTAILQ_INIT(&s->aqueues);
QTAILQ_INIT(&s->pqueues);
usb_packet_init(&s->ipacket);
-qemu_register_reset(ehci_reset, s);
-qemu_add_vm_change_state_handler(usb_ehci_vm_state_change, s);
-
memory_region_init(&s->mem, "ehci", MMIO_SIZE);
memory_region_init_io(&s->mem_caps, &ehci_mmio_caps_ops, s,
"capabilities", CAPA_SIZE);
diff --git a/hw/usb/hcd-ehci.h b/hw/usb/hcd-ehci.h
index 8105fcb..d0e847d 100644
--- a/hw/usb/hcd-ehci.h
+++ b/hw/usb/hcd-ehci.h
@@ -322,6 +322,7 @@ struct EHCIState {
extern const VMStateDescription vmstate_ehci;
+void usb_ehci_init(EHCIState *s, DeviceState *dev);
void usb_ehci_realize(E
