diff options
| author | Paul Brook <paul@codesourcery.com> | 2009-05-26 14:56:11 +0100 |
|---|---|---|
| committer | Paul Brook <paul@codesourcery.com> | 2009-05-26 14:56:11 +0100 |
| commit | 067a3ddc8876cee8451d6f690a051e413a593fdc (patch) | |
| tree | 1e0d067b7784874397b189947fde6f05dc3434ad /hw/musicpal.c | |
| parent | c2fb26379e8bd0586f3ff054538217377f86635f (diff) | |
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/musicpal.c')
| -rw-r--r-- | hw/musicpal.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/musicpal.c b/hw/musicpal.c index 1e0aff5cbb..9389af9589 100644 --- a/hw/musicpal.c +++ b/hw/musicpal.c @@ -1040,7 +1040,7 @@ static void mv88w8618_pic_init(SysBusDevice *dev) mv88w8618_pic_state *s = FROM_SYSBUS(mv88w8618_pic_state, dev); int iomemtype; - qdev_init_irq_sink(&dev->qdev, mv88w8618_pic_set_irq, 32); + qdev_init_gpio_in(&dev->qdev, mv88w8618_pic_set_irq, 32); sysbus_init_irq(dev, &s->parent_irq); iomemtype = cpu_register_io_memory(0, mv88w8618_pic_readfn, mv88w8618_pic_writefn, s); @@ -1534,7 +1534,7 @@ static void musicpal_init(ram_addr_t ram_size, dev = sysbus_create_simple("mv88w8618_pic", MP_PIC_BASE, cpu_pic[ARM_PIC_CPU_IRQ]); for (i = 0; i < 32; i++) { - pic[i] = qdev_get_irq_sink(dev, i); + pic[i] = qdev_get_gpio_in(dev, i); } sysbus_create_varargs("mv88w8618_pit", MP_PIT_BASE, pic[MP_TIMER1_IRQ], pic[MP_TIMER2_IRQ], pic[MP_TIMER3_IRQ], |