diff options
| author | Hervé Poussineau <hpoussin@reactos.org> | 2011-12-15 22:09:51 +0100 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-12-20 15:44:30 -0600 |
| commit | 48a18b3c698295e4d891f34e919615e84e20f027 (patch) | |
| tree | 689d5ec205341895b0eef457f3c0313be53b5432 /hw/mips_jazz.c | |
| parent | 0fa29915cdcadb5853515703d3eca8992627dcf2 (diff) | |
isa: give ISABus/ISADevice to isa_create(), isa_bus_irqs() and isa_get_irq() functions
NULL is a valid bus/device, so there is no change in behaviour.
Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/mips_jazz.c')
| -rw-r--r-- | hw/mips_jazz.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/hw/mips_jazz.c b/hw/mips_jazz.c index 358de599b0..8ed66cecca 100644 --- a/hw/mips_jazz.c +++ b/hw/mips_jazz.c @@ -120,6 +120,7 @@ static void mips_jazz_init(MemoryRegion *address_space, NICInfo *nd; DeviceState *dev; SysBusDevice *sysbus; + ISABus *isa_bus; ISADevice *pit; DriveInfo *fds[MAX_FD]; qemu_irq esp_reset, dma_enable; @@ -183,12 +184,12 @@ static void mips_jazz_init(MemoryRegion *address_space, memory_region_add_subregion(address_space, 0x8000d000, dma_dummy); /* ISA devices */ - isa_bus_new(NULL, address_space_io); - i8259 = i8259_init(env->irq[4]); - isa_bus_irqs(i8259); + isa_bus = isa_bus_new(NULL, address_space_io); + i8259 = i8259_init(isa_bus, env->irq[4]); + isa_bus_irqs(isa_bus, i8259); cpu_exit_irq = qemu_allocate_irqs(cpu_request_exit, NULL, 1); DMA_init(0, cpu_exit_irq); - pit = pit_init(0x40, 0); + pit = pit_init(isa_bus, 0x40, 0); pcspk_init(pit); /* ISA IO space at 0x90000000 */ @@ -255,7 +256,7 @@ static void mips_jazz_init(MemoryRegion *address_space, fdctrl_init_sysbus(rc4030[1], 0, 0x80003000, fds); /* Real time clock */ - rtc_init(1980, NULL); + rtc_init(isa_bus, 1980, NULL); memory_region_init_io(rtc, &rtc_ops, NULL, "rtc", 0x1000); memory_region_add_subregion(address_space, 0x80004000, rtc); @@ -280,7 +281,7 @@ static void mips_jazz_init(MemoryRegion *address_space, /* Sound card */ /* FIXME: missing Jazz sound at 0x8000c000, rc4030[2] */ - audio_init(i8259, NULL); + audio_init(isa_bus, i8259, NULL); /* NVRAM */ dev = qdev_create(NULL, "ds1225y"); |