diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2012-05-02 16:49:39 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2012-06-19 13:24:44 +0000 |
| commit | b3387ede2f2b8a6ba3d5e922492f85a34db6f191 (patch) | |
| tree | 3f0ed4a5f92370deebd16c45fd1346f6711beadf /hw/arm_gic.c | |
| parent | c48c6522f550b9b704f7324164b00b5770ec7345 (diff) | |
hw/arm_gic: Move NVIC specific reset to armv7m_nvic_reset
Move the NVIC specific bits of reset to the NVIC's own
reset function, rather than using ifdefs in the common
arm_gic reset.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/arm_gic.c')
| -rw-r--r-- | hw/arm_gic.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/hw/arm_gic.c b/hw/arm_gic.c index 2d8ceb80f1..3293ae4c7b 100644 --- a/hw/arm_gic.c +++ b/hw/arm_gic.c @@ -743,23 +743,13 @@ static void gic_reset(DeviceState *dev) s->current_pending[i] = 1023; s->running_irq[i] = 1023; s->running_priority[i] = 0x100; -#ifdef NVIC - /* The NVIC doesn't have per-cpu interfaces, so enable by default. */ - s->cpu_enabled[i] = 1; -#else s->cpu_enabled[i] = 0; -#endif } for (i = 0; i < 16; i++) { GIC_SET_ENABLED(i, ALL_CPU_MASK); GIC_SET_TRIGGER(i); } -#ifdef NVIC - /* The NVIC is always enabled. */ - s->enabled = 1; -#else s->enabled = 0; -#endif } static void gic_save(QEMUFile *f, void *opaque) |