ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw/arm/exynos4210: 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-4-git-send-email-peter.maydell@linaro.org
This commit is contained in:
Peter Maydell 2013-08-20 14:54:28 +01:00
parent de3a658f5b
commit ad666d91f4
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hw/arm/exynos4210.c
View File

@ -137,10 +137,8 @@ void exynos4210_write_secondary(ARMCPU *cpu,
Exynos4210State *exynos4210_init(MemoryRegion *system_mem, Exynos4210State *exynos4210_init(MemoryRegion *system_mem,
unsigned long ram_size) unsigned long ram_size)
{ {
qemu_irq cpu_irq[EXYNOS4210_NCPUS];
int i, n; int i, n;
Exynos4210State *s = g_new(Exynos4210State, 1); Exynos4210State *s = g_new(Exynos4210State, 1);
qemu_irq *irqp;
qemu_irq gate_irq[EXYNOS4210_NCPUS][EXYNOS4210_IRQ_GATE_NINPUTS]; qemu_irq gate_irq[EXYNOS4210_NCPUS][EXYNOS4210_IRQ_GATE_NINPUTS];
unsigned long mem_size; unsigned long mem_size;
DeviceState *dev; DeviceState *dev;
@ -152,15 +150,6 @@ Exynos4210State *exynos4210_init(MemoryRegion *system_mem,
fprintf(stderr, "Unable to find CPU %d definition\n", n); fprintf(stderr, "Unable to find CPU %d definition\n", n);
exit(1); exit(1);
} }
/* Create PIC controller for each processor instance */
irqp = arm_pic_init_cpu(s->cpu[n]);
/*
* Get GICs gpio_in cpu_irq to connect a combiner to them later.
* Use only IRQ for a while.
*/
cpu_irq[n] = irqp[ARM_PIC_CPU_IRQ];
} }
/*** IRQs ***/ /*** IRQs ***/
@ -178,8 +167,9 @@ Exynos4210State *exynos4210_init(MemoryRegion *system_mem,
} }
busdev = SYS_BUS_DEVICE(dev); busdev = SYS_BUS_DEVICE(dev);
/* Connect IRQ Gate output to cpu_irq */ /* Connect IRQ Gate output to CPU's IRQ line */
sysbus_connect_irq(busdev, 0, cpu_irq[i]); sysbus_connect_irq(busdev, 0,
qdev_get_gpio_in(DEVICE(s->cpu[i]), ARM_CPU_IRQ));
} }
/* Private memory region and Internal GIC */ /* Private memory region and Internal GIC */