david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hw/arm/pic_cpu: Remove the now-unneeded arm_pic_init_cpu()

Browse Source 
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
This commit is contained in:
Peter Maydell 2013-08-20 14:54:31 +01:00
parent e4a6540ded
commit b643e4b90b
3 changed files with 1 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/arm/Makefile.objs
View File

@ -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

25
hw/arm/pic_cpu.c
View File

@ -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;
}

5
include/hw/arm/arm.h
View File

@ -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,