From 067a3ddc8876cee8451d6f690a051e413a593fdc Mon Sep 17 00:00:00 2001 From: Paul Brook Date: Tue, 26 May 2009 14:56:11 +0100 Subject: 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 --- hw/versatilepb.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'hw/versatilepb.c') diff --git a/hw/versatilepb.c b/hw/versatilepb.c index eed97d6..03cf4d8 100644 --- a/hw/versatilepb.c +++ b/hw/versatilepb.c @@ -135,7 +135,7 @@ static void vpb_sic_init(SysBusDevice *dev) int iomemtype; int i; - qdev_init_irq_sink(&dev->qdev, vpb_sic_set_irq, 32); + qdev_init_gpio_in(&dev->qdev, vpb_sic_set_irq, 32); for (i = 0; i < 32; i++) { sysbus_init_irq(dev, &s->parent[i]); } @@ -188,12 +188,12 @@ static void versatile_init(ram_addr_t ram_size, dev = sysbus_create_varargs("pl190", 0x10140000, cpu_pic[0], cpu_pic[1], NULL); for (n = 0; n < 32; n++) { - pic[n] = qdev_get_irq_sink(dev, n); + pic[n] = qdev_get_gpio_in(dev, n); } dev = sysbus_create_simple("versatilepb_sic", 0x10003000, NULL); for (n = 0; n < 32; n++) { sysbus_connect_irq(sysbus_from_qdev(dev), n, pic[n]); - sic[n] = qdev_get_irq_sink(dev, n); + sic[n] = qdev_get_gpio_in(dev, n); } sysbus_create_simple("pl050_keyboard", 0x10006000, sic[3]); -- cgit v1.1