aboutsummaryrefslogtreecommitdiff
path: root/hw/integratorcp.c
diff options
context:
space:
mode:
authorPaul Brook <paul@codesourcery.com>2009-05-26 14:56:11 +0100
committerPaul Brook <paul@codesourcery.com>2009-05-26 14:56:11 +0100
commit067a3ddc8876cee8451d6f690a051e413a593fdc (patch)
tree1e0d067b7784874397b189947fde6f05dc3434ad /hw/integratorcp.c
parentc2fb26379e8bd0586f3ff054538217377f86635f (diff)
downloadqemu-067a3ddc8876cee8451d6f690a051e413a593fdc.zip
qemu-067a3ddc8876cee8451d6f690a051e413a593fdc.tar.gz
qemu-067a3ddc8876cee8451d6f690a051e413a593fdc.tar.bz2
Remove qdev irq sink handling
We have both IRQ sinks and GPIO inputs. These are in principle exactly the same thing, so remove the former. Signed-off-by: Paul Brook <paul@codesourcery.com>
Diffstat (limited to 'hw/integratorcp.c')
-rw-r--r--hw/integratorcp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/integratorcp.c b/hw/integratorcp.c
index 493866c..b6fbe15 100644
--- a/hw/integratorcp.c
+++ b/hw/integratorcp.c
@@ -378,7 +378,7 @@ static void icp_pic_init(SysBusDevice *dev)
icp_pic_state *s = FROM_SYSBUS(icp_pic_state, dev);
int iomemtype;
- qdev_init_irq_sink(&dev->qdev, icp_pic_set_irq, 32);
+ qdev_init_gpio_in(&dev->qdev, icp_pic_set_irq, 32);
sysbus_init_irq(dev, &s->parent_irq);
sysbus_init_irq(dev, &s->parent_fiq);
iomemtype = cpu_register_io_memory(0, icp_pic_readfn,
@@ -484,7 +484,7 @@ static void integratorcp_init(ram_addr_t ram_size,
cpu_pic[ARM_PIC_CPU_IRQ],
cpu_pic[ARM_PIC_CPU_FIQ], NULL);
for (i = 0; i < 32; i++) {
- pic[i] = qdev_get_irq_sink(dev, i);
+ pic[i] = qdev_get_gpio_in(dev, i);
}
sysbus_create_simple("integrator_pic", 0xca000000, pic[26]);
sysbus_create_varargs("integrator_pit", 0x13000000,