diff options
author | bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162> | 2005-07-02 18:11:44 +0000 |
---|---|---|
committer | bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162> | 2005-07-02 18:11:44 +0000 |
commit | 3de388f676e936097f99fb58e8a58c5461eb696e (patch) | |
tree | ab63f67817bf6bb17c1245bbc2e08cae7fe8d2de /hw/ide.c | |
parent | 73133662c6db9e58d02716d9517b3947c853de68 (diff) | |
download | qemu-3de388f676e936097f99fb58e8a58c5461eb696e.zip |
more generic i8259 support
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1487 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw/ide.c')
-rw-r--r-- | hw/ide.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -2008,7 +2008,7 @@ void isa_ide_init(int iobase, int iobase2, int irq, if (!ide_state) return; - ide_init2(ide_state, hd0, hd1, pic_set_irq_new, NULL, irq); + ide_init2(ide_state, hd0, hd1, pic_set_irq_new, isa_pic, irq); ide_init_ioport(ide_state, iobase, iobase2); } @@ -2337,9 +2337,9 @@ void pci_piix3_ide_init(PCIBus *bus, BlockDriverState **hd_table) PCI_ADDRESS_SPACE_IO, bmdma_map); ide_init2(&d->ide_if[0], hd_table[0], hd_table[1], - pic_set_irq_new, NULL, 14); + pic_set_irq_new, isa_pic, 14); ide_init2(&d->ide_if[2], hd_table[2], hd_table[3], - pic_set_irq_new, NULL, 15); + pic_set_irq_new, isa_pic, 15); ide_init_ioport(&d->ide_if[0], 0x1f0, 0x3f6); ide_init_ioport(&d->ide_if[2], 0x170, 0x376); } |