[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 10/14] hw/arm/strongarm: Don't use arm_pic_init_cpu(
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PATCH 10/14] hw/arm/strongarm: Don't use arm_pic_init_cpu() |
Date: |
Thu, 8 Aug 2013 17:04:12 +0100 |
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 <address@hidden>
---
hw/arm/strongarm.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/hw/arm/strongarm.c b/hw/arm/strongarm.c
index 82a9492..7b8ef8c 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),
--
1.7.9.5
- [Qemu-devel] [PATCH 00/14] ARM: make IRQ/FIQ gpio lines on CPU object, Peter Maydell, 2013/08/08
- [Qemu-devel] [PATCH 14/14] hw/arm/pic_cpu: Remove the now-unneeded arm_pic_init_cpu(), Peter Maydell, 2013/08/08
- [Qemu-devel] [PATCH 13/14] hw/arm/xilinx_zynq: Don't use arm_pic_init_cpu(), Peter Maydell, 2013/08/08
- [Qemu-devel] [PATCH 11/14] hw/arm/versatilepb: Don't use arm_pic_init_cpu(), Peter Maydell, 2013/08/08
- [Qemu-devel] [PATCH 06/14] hw/arm/kzm: Don't use arm_pic_init_cpu(), Peter Maydell, 2013/08/08
- [Qemu-devel] [PATCH 10/14] hw/arm/strongarm: Don't use arm_pic_init_cpu(),
Peter Maydell <=
- [Qemu-devel] [PATCH 03/14] hw/arm/exynos4210: Don't use arm_pic_init_cpu(), Peter Maydell, 2013/08/08
- [Qemu-devel] [PATCH 05/14] hw/arm/integratorcp: Don't use arm_pic_init_cpu(), Peter Maydell, 2013/08/08
- [Qemu-devel] [PATCH 04/14] hw/arm/highbank: Don't use arm_pic_init_cpu(), Peter Maydell, 2013/08/08
- [Qemu-devel] [PATCH 01/14] target-arm: Make IRQ and FIQ gpio lines on the CPU object, Peter Maydell, 2013/08/08
- [Qemu-devel] [PATCH 02/14] hw/arm/armv7m: Don't use arm_pic_init_cpu(), Peter Maydell, 2013/08/08
- [Qemu-devel] [PATCH 09/14] hw/arm/realview: Don't use arm_pic_init_cpu(), Peter Maydell, 2013/08/08
- [Qemu-devel] [PATCH 08/14] hw/arm/omap*: Don't use arm_pic_init_cpu(), Peter Maydell, 2013/08/08
- [Qemu-devel] [PATCH 07/14] hw/arm/musicpal: Don't use arm_pic_init_cpu(), Peter Maydell, 2013/08/08
- [Qemu-devel] [PATCH 12/14] hw/arm/vexpress: Don't use arm_pic_init_cpu(), Peter Maydell, 2013/08/08
- Re: [Qemu-devel] [PATCH 00/14] ARM: make IRQ/FIQ gpio lines on CPU object, Peter Maydell, 2013/08/20