diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2013-08-20 14:54:31 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2013-08-20 14:54:31 +0100 |
| commit | b643e4b90bb0b70adde97a09349d8ca7067309d9 (patch) | |
| tree | cb3468541cd83e47af4afd35734405f7306c1e5e | |
| parent | e4a6540dedc6ec109a9ece3f8d83a143b7bde4e6 (diff) | |
hw/arm/pic_cpu: Remove the now-unneeded arm_pic_init_cpu()
Now all the boards have been converted arm_pic_init_cpu()
is unused and can just be deleted.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Message-id: 1375977856-25046-15-git-send-email-peter.maydell@linaro.org
| -rw-r--r-- | hw/arm/Makefile.objs | 2 | ||||
| -rw-r--r-- | hw/arm/pic_cpu.c | 25 | ||||
| -rw-r--r-- | include/hw/arm/arm.h | 5 |
3 files changed, 1 insertions, 31 deletions
diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs index 9e3a06fc18..3671b42738 100644 --- a/hw/arm/Makefile.objs +++ b/hw/arm/Makefile.objs @@ -1,6 +1,6 @@ obj-y += boot.o collie.o exynos4_boards.o gumstix.o highbank.o obj-y += integratorcp.o kzm.o mainstone.o musicpal.o nseries.o -obj-y += omap_sx1.o palm.o pic_cpu.o realview.o spitz.o stellaris.o +obj-y += omap_sx1.o palm.o realview.o spitz.o stellaris.o obj-y += tosa.o versatilepb.o vexpress.o xilinx_zynq.o z2.o obj-y += armv7m.o exynos4210.o pxa2xx.o pxa2xx_gpio.o pxa2xx_pic.o diff --git a/hw/arm/pic_cpu.c b/hw/arm/pic_cpu.c deleted file mode 100644 index 9c362735c0..0000000000 --- a/hw/arm/pic_cpu.c +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Generic ARM Programmable Interrupt Controller support. - * - * Copyright (c) 2006 CodeSourcery. - * Written by Paul Brook - * - * This code is licensed under the LGPL - */ - -#include "hw/hw.h" -#include "hw/arm/arm.h" - -/* Backwards compatibility shim; this can disappear when all - * board models have been updated to get IRQ and FIQ lines directly - * from the ARMCPU object rather than by calling this function. - */ -qemu_irq *arm_pic_init_cpu(ARMCPU *cpu) -{ - DeviceState *dev = DEVICE(cpu); - qemu_irq *irqs = g_new(qemu_irq, 2); - - irqs[0] = qdev_get_gpio_in(dev, ARM_CPU_IRQ); - irqs[1] = qdev_get_gpio_in(dev, ARM_CPU_FIQ); - return irqs; -} diff --git a/include/hw/arm/arm.h b/include/hw/arm/arm.h index bae87c6273..ecbbba871e 100644 --- a/include/hw/arm/arm.h +++ b/include/hw/arm/arm.h @@ -14,11 +14,6 @@ #include "exec/memory.h" #include "hw/irq.h" -/* The CPU is also modelled as an interrupt controller. */ -#define ARM_PIC_CPU_IRQ 0 -#define ARM_PIC_CPU_FIQ 1 -qemu_irq *arm_pic_init_cpu(ARMCPU *cpu); - /* armv7m.c */ qemu_irq *armv7m_init(MemoryRegion *address_space_mem, int flash_size, int sram_size, |