From 20c59c38927902a8e2c67da7d9a24b5222a31cb7 Mon Sep 17 00:00:00 2001 From: Michael Davidsaver Date: Tue, 3 Nov 2015 13:49:41 +0000 Subject: armv7-m: Return DeviceState* from armv7m_init() Change armv7m_init to return the DeviceState* for the NVIC. This allows access to all GPIO blocks, not just the IRQ inputs. Move qdev_get_gpio_in() calls out of armv7m_init() into board code for stellaris and stm32f205 boards. Signed-off-by: Michael Davidsaver Reviewed-by: Peter Crosthwaite Signed-off-by: Peter Maydell --- include/hw/arm/arm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/hw/arm') diff --git a/include/hw/arm/arm.h b/include/hw/arm/arm.h index 9217b70eb1..67ba7db3bb 100644 --- a/include/hw/arm/arm.h +++ b/include/hw/arm/arm.h @@ -17,7 +17,7 @@ #include "cpu.h" /* armv7m.c */ -qemu_irq *armv7m_init(MemoryRegion *system_memory, int mem_size, int num_irq, +DeviceState *armv7m_init(MemoryRegion *system_memory, int mem_size, int num_irq, const char *kernel_filename, const char *cpu_model); /* -- cgit v1.2.3