diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2013-08-20 14:54:29 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2013-08-20 14:54:29 +0100 |
| commit | 99d228d6e9b08488d62029c438f8381b8c72d109 (patch) | |
| tree | a690fc82b08cc236dffd5a1e8fab590d9fa131d6 | |
| parent | 9188dbf71accf9d97f2e434380ea210ba75705ca (diff) | |
| download | focaccia-qemu-99d228d6e9b08488d62029c438f8381b8c72d109.tar.gz focaccia-qemu-99d228d6e9b08488d62029c438f8381b8c72d109.zip | |
hw/arm/integratorcp: Don't use arm_pic_init_cpu()
Drop the now-deprecated arm_pic_init_cpu() in favour of directly getting the IRQ line from the ARMCPU object. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Message-id: 1375977856-25046-6-git-send-email-peter.maydell@linaro.org
| -rw-r--r-- | hw/arm/integratorcp.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/hw/arm/integratorcp.c b/hw/arm/integratorcp.c index d518188d0a..59c37262c3 100644 --- a/hw/arm/integratorcp.c +++ b/hw/arm/integratorcp.c @@ -465,7 +465,6 @@ static void integratorcp_init(QEMUMachineInitArgs *args) MemoryRegion *ram = g_new(MemoryRegion, 1); MemoryRegion *ram_alias = g_new(MemoryRegion, 1); qemu_irq pic[32]; - qemu_irq *cpu_pic; DeviceState *dev; int i; @@ -493,10 +492,10 @@ static void integratorcp_init(QEMUMachineInitArgs *args) qdev_init_nofail(dev); sysbus_mmio_map((SysBusDevice *)dev, 0, 0x10000000); - cpu_pic = arm_pic_init_cpu(cpu); dev = sysbus_create_varargs(TYPE_INTEGRATOR_PIC, 0x14000000, - cpu_pic[ARM_PIC_CPU_IRQ], - cpu_pic[ARM_PIC_CPU_FIQ], NULL); + qdev_get_gpio_in(DEVICE(cpu), ARM_CPU_IRQ), + qdev_get_gpio_in(DEVICE(cpu), ARM_CPU_FIQ), + NULL); for (i = 0; i < 32; i++) { pic[i] = qdev_get_gpio_in(dev, i); } |