motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-07 17:53:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

mac_newworld: move wiring of macio IRQs to macio_newworld_realize()

Browse source 
Since the macio device has a link to the PIC device, we can now wire up the
IRQs directly via qdev GPIOs rather than having to use an intermediate array.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
Mark Cave-Ayland 2018-05-03 21:24:41 +01:00 • committed by David Gibson
parent 040b27c0b9
commit 0fcd2a814a
3 changed files with 22 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

14
hw/ppc/mac_newworld.c
View file

@ -375,20 +375,6 @@ static void ppc_core99_init(MachineState *machine)
/* MacIO */
macio = NEWWORLD_MACIO(pci_create(pci_bus, -1, TYPE_NEWWORLD_MACIO));
dev = DEVICE(macio);
qdev_connect_gpio_out(dev, 0,
qdev_get_gpio_in(pic_dev, NEWWORLD_CUDA_IRQ));
qdev_connect_gpio_out(dev, 1,
qdev_get_gpio_in(pic_dev, NEWWORLD_ESCCB_IRQ));
qdev_connect_gpio_out(dev, 2,
qdev_get_gpio_in(pic_dev, NEWWORLD_ESCCA_IRQ));
qdev_connect_gpio_out(dev, 3,
qdev_get_gpio_in(pic_dev, NEWWORLD_IDE0_IRQ));
qdev_connect_gpio_out(dev, 4,
qdev_get_gpio_in(pic_dev, NEWWORLD_IDE0_DMA_IRQ));
qdev_connect_gpio_out(dev, 5,
qdev_get_gpio_in(pic_dev, NEWWORLD_IDE1_IRQ));
qdev_connect_gpio_out(dev, 6,
qdev_get_gpio_in(pic_dev, NEWWORLD_IDE1_DMA_IRQ));
qdev_prop_set_uint64(dev, "frequency", tbfreq);
object_property_set_link(OBJECT(macio), OBJECT(pic_dev), "pic",
&error_abort);