commit e32cba29beb079165ddcd01a45242a8ac010319c
author Blue Swirl <blauwirbel@gmail.com> Tue Jul 21 19:57:32 2009 +0000
committer Blue Swirl <blauwirbel@gmail.com> Tue Jul 21 19:57:32 2009 +0000
tree 2680d9691524f56bbaaf8bde86d4a733305bd5bc
parent 7fc067350cb5a9218c607fce0a29af612ba48324

Sparc32: convert Sun4c interrupt controller to qdev

Signed-off-by: Blue Swirl <blauwirbel@gmail.com>

hw/sun4m.c

diff --git a/hw/sun4m.c b/hw/sun4m.c
index 1e24017..1e668fc 100644
--- a/hw/sun4m.c
+++ b/hw/sun4m.c
@@ -1502,13 +1502,15 @@
 {
     CPUState *env;
     void *iommu, *espdma, *ledma, *nvram;
-    qemu_irq *cpu_irqs, *slavio_irq, espdma_irq, ledma_irq;
+    qemu_irq *cpu_irqs, slavio_irq[8], espdma_irq, ledma_irq;
     qemu_irq *esp_reset, *le_reset;
     qemu_irq fdc_tc;
     unsigned long kernel_size;
     BlockDriverState *fd[MAX_FD];
     int drive_index;
     void *fw_cfg;
+    DeviceState *dev;
+    unsigned int i;
 
     /* init CPU */
     if (!cpu_model)
@@ -1521,8 +1523,11 @@
 
     prom_init(hwdef->slavio_base, bios_name);
 
-    slavio_intctl = sun4c_intctl_init(hwdef->intctl_base,
-                                      &slavio_irq, cpu_irqs);
+    dev = sun4c_intctl_init(hwdef->intctl_base, cpu_irqs);
+
+    for (i = 0; i < 8; i++) {
+        slavio_irq[i] = qdev_get_gpio_in(dev, i);
+    }
 
     iommu = iommu_init(hwdef->iommu_base, hwdef->iommu_version,
                        slavio_irq[hwdef->me_irq]);