diff options
Diffstat (limited to 'hw/alpha_dp264.c')
| -rw-r--r-- | hw/alpha_dp264.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/hw/alpha_dp264.c b/hw/alpha_dp264.c index 598b830e92..876335a773 100644 --- a/hw/alpha_dp264.c +++ b/hw/alpha_dp264.c @@ -50,6 +50,7 @@ static void clipper_init(ram_addr_t ram_size, { CPUState *cpus[4]; PCIBus *pci_bus; + ISABus *isa_bus; qemu_irq rtc_irq; long size, i; const char *palcode_filename; @@ -67,11 +68,12 @@ static void clipper_init(ram_addr_t ram_size, cpus[0]->trap_arg2 = smp_cpus; /* Init the chipset. */ - pci_bus = typhoon_init(ram_size, &rtc_irq, cpus, clipper_pci_map_irq); + pci_bus = typhoon_init(ram_size, &isa_bus, &rtc_irq, cpus, + clipper_pci_map_irq); - rtc_init(1980, rtc_irq); - pit_init(0x40, 0); - isa_create_simple("i8042"); + rtc_init(isa_bus, 1980, rtc_irq); + pit_init(isa_bus, 0x40, 0); + isa_create_simple(isa_bus, "i8042"); /* VGA setup. Don't bother loading the bios. */ alpha_pci_vga_setup(pci_bus); @@ -79,7 +81,7 @@ static void clipper_init(ram_addr_t ram_size, /* Serial code setup. */ for (i = 0; i < MAX_SERIAL_PORTS; ++i) { if (serial_hds[i]) { - serial_isa_init(i, serial_hds[i]); + serial_isa_init(isa_bus, i, serial_hds[i]); } } |