diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2013-08-20 14:54:30 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2013-08-20 14:54:30 +0100 |
| commit | 4f071cf9b53a236469500f08033335cc726db9b0 (patch) | |
| tree | cfc31434bd8c64bd26bfaec5c672b234f9de15dd /hw | |
| parent | 033ee5a5ac5dd01bcea76a6427d95f5390af43ca (diff) | |
| download | focaccia-qemu-4f071cf9b53a236469500f08033335cc726db9b0.tar.gz focaccia-qemu-4f071cf9b53a236469500f08033335cc726db9b0.zip | |
hw/arm/strongarm: 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-11-git-send-email-peter.maydell@linaro.org
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/arm/strongarm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/hw/arm/strongarm.c b/hw/arm/strongarm.c index 82a9492fdd..7b8ef8cbeb 100644 --- a/hw/arm/strongarm.c +++ b/hw/arm/strongarm.c @@ -1588,7 +1588,6 @@ StrongARMState *sa1110_init(MemoryRegion *sysmem, unsigned int sdram_size, const char *rev) { StrongARMState *s; - qemu_irq *pic; int i; s = g_malloc0(sizeof(StrongARMState)); @@ -1613,9 +1612,10 @@ StrongARMState *sa1110_init(MemoryRegion *sysmem, vmstate_register_ram_global(&s->sdram); memory_region_add_subregion(sysmem, SA_SDCS0, &s->sdram); - pic = arm_pic_init_cpu(s->cpu); s->pic = sysbus_create_varargs("strongarm_pic", 0x90050000, - pic[ARM_PIC_CPU_IRQ], pic[ARM_PIC_CPU_FIQ], NULL); + qdev_get_gpio_in(DEVICE(s->cpu), ARM_CPU_IRQ), + qdev_get_gpio_in(DEVICE(s->cpu), ARM_CPU_FIQ), + NULL); sysbus_create_varargs("pxa25x-timer", 0x90000000, qdev_get_gpio_in(s->pic, SA_PIC_OSTC0), |