Revision ae027ad3 hw/mips_malta.c

b/hw/mips_malta.c
765 765
    target_long bios_size;
766 766
    int64_t kernel_entry;
767 767
    PCIBus *pci_bus;
768
    ISADevice *isa_dev;
768 769
    CPUState *env;
769 770
    RTCState *rtc_state;
770 771
    fdctrl_t *floppy_controller;
......
903 904
    }
904 905

  
905 906
    piix4_devfn = piix4_init(pci_bus, 80);
906
    pci_piix4_ide_init(pci_bus, hd, piix4_devfn + 1, i8259);
907
    isa_bus_irqs(i8259);
908
    pci_piix4_ide_init(pci_bus, hd, piix4_devfn + 1);
907 909
    usb_uhci_piix4_init(pci_bus, piix4_devfn + 2);
908
    smbus = piix4_pm_init(pci_bus, piix4_devfn + 3, 0x1100, i8259[9]);
910
    smbus = piix4_pm_init(pci_bus, piix4_devfn + 3, 0x1100, isa_reserve_irq(9));
909 911
    eeprom_buf = qemu_mallocz(8 * 256); /* XXX: make this persistent */
910 912
    for (i = 0; i < 8; i++) {
911 913
        /* TODO: Populate SPD eeprom data.  */
......
915 917
        qdev_prop_set_ptr(eeprom, "data", eeprom_buf + (i * 256));
916 918
        qdev_init(eeprom);
917 919
    }
918
    pit = pit_init(0x40, i8259[0]);
920
    pit = pit_init(0x40, isa_reserve_irq(0));
919 921
    DMA_init(0);
920 922

  
921 923
    /* Super I/O */
922
    i8042_init(i8259[1], i8259[12], 0x60);
923
    rtc_state = rtc_init(0x70, i8259[8], 2000);
924
    serial_init(0x3f8, i8259[4], 115200, serial_hds[0]);
925
    serial_init(0x2f8, i8259[3], 115200, serial_hds[1]);
924
    isa_dev = isa_create_simple("i8042", 0x60, 0x64, 1, 12);
925
 
926
    rtc_state = rtc_init(0x70, isa_reserve_irq(8), 2000);
927
    serial_init(0x3f8, isa_reserve_irq(4), 115200, serial_hds[0]);
928
    serial_init(0x2f8, isa_reserve_irq(3), 115200, serial_hds[1]);
926 929
    if (parallel_hds[0])
927
        parallel_init(0x378, i8259[7], parallel_hds[0]);
930
        parallel_init(0x378, isa_reserve_irq(7), parallel_hds[0]);
928 931
    for(i = 0; i < MAX_FD; i++) {
929 932
        dinfo = drive_get(IF_FLOPPY, 0, i);
930 933
        fd[i] = dinfo ? dinfo->bdrv : NULL;

Also available in: Unified diff