@@ -38,7 +38,7 @@ static struct BusInfo isa_bus_info = {
.get_fw_dev_path = isabus_get_fw_dev_path,
};
-ISABus *isa_bus_new(DeviceState *dev)
+ISABus *isa_bus_bridge_init(DeviceState *dev)
{
if (isabus) {
fprintf(stderr, "Can't create a second ISA bus\n");
@@ -25,7 +25,7 @@ struct ISADeviceInfo {
isa_qdev_initfn init;
};
-ISABus *isa_bus_new(DeviceState *dev);
+ISABus *isa_bus_bridge_init(DeviceState *dev);
void isa_bus_irqs(qemu_irq *irqs);
qemu_irq isa_get_irq(int isairq);
void isa_init_irq(ISADevice *dev, qemu_irq *p, int isairq);
@@ -180,7 +180,7 @@ void mips_jazz_init (ram_addr_t ram_size,
/* ISA devices */
i8259 = i8259_init(env->irq[4]);
- isa_bus_new(NULL);
+ isa_bus_bridge_init(NULL);
isa_bus_irqs(i8259);
cpu_exit_irq = qemu_allocate_irqs(cpu_request_exit, NULL, 1);
DMA_init(0, cpu_exit_irq);
@@ -265,7 +265,7 @@ void mips_r4k_init (ram_addr_t ram_size,
/* The PIC is attached to the MIPS CPU INT0 pin */
i8259 = i8259_init(env->irq[2]);
- isa_bus_new(NULL);
+ isa_bus_bridge_init(NULL);
isa_bus_irqs(i8259);
rtc_init(2000, NULL);
@@ -134,7 +134,7 @@ static void pc_init1(MemoryRegion *system_memory,
} else {
pci_bus = NULL;
i440fx_state = NULL;
- isa_bus_new(NULL);
+ isa_bus_bridge_init(NULL);
}
isa_bus_irqs(isa_irq);
@@ -87,7 +87,7 @@ static int piix4_initfn(PCIDevice *dev)
{
PIIX4State *d = DO_UPCAST(PIIX4State, dev, dev);
- isa_bus_new(&d->dev.qdev);
+ isa_bus_bridge_init(&d->dev.qdev);
piix4_dev = &d->dev;
qemu_register_reset(piix4_reset, d);
return 0;
@@ -447,7 +447,7 @@ static int piix3_initfn(PCIDevice *dev)
{
PIIX3State *d = DO_UPCAST(PIIX3State, dev, dev);
- isa_bus_new(&d->dev.qdev);
+ isa_bus_bridge_init(&d->dev.qdev);
qemu_register_reset(piix3_reset, d);
return 0;
}
@@ -651,7 +651,7 @@ static void ppc_prep_init (ram_addr_t ram_size,
i8259 = i8259_init(first_cpu->irq_inputs[PPC6xx_INPUT_INT]);
pci_bus = pci_prep_init(i8259, get_system_memory(), get_system_io());
/* Hmm, prep has no pci-isa bridge ??? */
- isa_bus_new(NULL);
+ isa_bus_bridge_init(NULL);
isa_bus_irqs(i8259);
// pci_bus = i440fx_init();
/* Register 8 MB of ISA IO space (needed for non-contiguous map) */
@@ -544,7 +544,7 @@ pci_ebus_init1(PCIDevice *pci_dev)
{
EbusState *s = DO_UPCAST(EbusState, pci_dev, pci_dev);
- isa_bus_new(&pci_dev->qdev);
+ isa_bus_bridge_init(&pci_dev->qdev);
pci_dev->config[0x04] = 0x06; // command = bus master, pci mem
pci_dev->config[0x05] = 0x00;
@@ -490,7 +490,7 @@ static int vt82c686b_initfn(PCIDevice *d)
uint8_t *wmask;
int i;
- isa_bus_new(&d->qdev);
+ isa_bus_bridge_init(&d->qdev);
pci_conf = d->config;
pci_config_set_prog_interface(pci_conf, 0x0);
Signed-off-by: Hervé Poussineau <hpoussin@reactos.org> --- hw/isa-bus.c | 2 +- hw/isa.h | 2 +- hw/mips_jazz.c | 2 +- hw/mips_r4k.c | 2 +- hw/pc_piix.c | 2 +- hw/piix4.c | 2 +- hw/piix_pci.c | 2 +- hw/ppc_prep.c | 2 +- hw/sun4u.c | 2 +- hw/vt82c686.c | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-)