diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/arm/armv7m.h | 4 | ||||
| -rw-r--r-- | include/hw/intc/armv7m_nvic.h | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/include/hw/arm/armv7m.h b/include/hw/arm/armv7m.h index 360c35c5fb..fe8b248a6c 100644 --- a/include/hw/arm/armv7m.h +++ b/include/hw/arm/armv7m.h @@ -77,6 +77,10 @@ struct ARMv7MState { * NS systick device if appropriate. */ MemoryRegion systick_ns_mem; + /* Ditto, for the sysregs region provided by the NVIC */ + MemoryRegion sysreg_ns_mem; + /* MR providing default PPB behaviour */ + MemoryRegion defaultmem; /* Properties */ char *cpu_type; diff --git a/include/hw/intc/armv7m_nvic.h b/include/hw/intc/armv7m_nvic.h index 6a6a99090c..0180c7b0ca 100644 --- a/include/hw/intc/armv7m_nvic.h +++ b/include/hw/intc/armv7m_nvic.h @@ -80,9 +80,6 @@ struct NVICState { int vectpending_prio; /* group prio of the exeception in vectpending */ MemoryRegion sysregmem; - MemoryRegion sysreg_ns_mem; - MemoryRegion container; - MemoryRegion defaultmem; uint32_t num_irq; qemu_irq excpout; |