diff options
| author | Michael Davidsaver <mdavidsaver@gmail.com> | 2015-11-03 13:49:41 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-11-03 13:49:41 +0000 |
| commit | 20c59c38927902a8e2c67da7d9a24b5222a31cb7 (patch) | |
| tree | 3082cca6786cbf21958a2d7743f462cb9ab9d6cf /include/hw/arm | |
| parent | c3a9a689c6ff07ba2e00bafc68626fad84587794 (diff) | |
| download | qemu-20c59c38927902a8e2c67da7d9a24b5222a31cb7.zip qemu-20c59c38927902a8e2c67da7d9a24b5222a31cb7.tar.gz qemu-20c59c38927902a8e2c67da7d9a24b5222a31cb7.tar.bz2 | |
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 <mdavidsaver@gmail.com>
Reviewed-by: Peter Crosthwaite <crosthwaite.peter@gmail.com>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/hw/arm')
| -rw-r--r-- | include/hw/arm/arm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/hw/arm/arm.h b/include/hw/arm/arm.h index 9217b70..67ba7db 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); /* |