[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 14/15] armv7m_nvic.h: Move from include/hw/arm to in
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PATCH 14/15] armv7m_nvic.h: Move from include/hw/arm to include/hw/intc |
Date: |
Wed, 2 Aug 2017 17:44:00 +0100 |
The armv7m_nvic.h header file was accidentally placed in
include/hw/arm; move it to include/hw/intc to match where
its corresponding .c file lives.
Signed-off-by: Peter Maydell <address@hidden>
---
hw/intc/armv7m_nvic.c | 2 +-
include/hw/arm/armv7m.h | 2 +-
include/hw/{arm => intc}/armv7m_nvic.h | 0
3 files changed, 2 insertions(+), 2 deletions(-)
rename include/hw/{arm => intc}/armv7m_nvic.h (100%)
diff --git a/hw/intc/armv7m_nvic.c b/hw/intc/armv7m_nvic.c
index 343bc16..5a18025 100644
--- a/hw/intc/armv7m_nvic.c
+++ b/hw/intc/armv7m_nvic.c
@@ -17,7 +17,7 @@
#include "hw/sysbus.h"
#include "qemu/timer.h"
#include "hw/arm/arm.h"
-#include "hw/arm/armv7m_nvic.h"
+#include "hw/intc/armv7m_nvic.h"
#include "target/arm/cpu.h"
#include "exec/exec-all.h"
#include "qemu/log.h"
diff --git a/include/hw/arm/armv7m.h b/include/hw/arm/armv7m.h
index a9b3f2a..10eb058 100644
--- a/include/hw/arm/armv7m.h
+++ b/include/hw/arm/armv7m.h
@@ -11,7 +11,7 @@
#define HW_ARM_ARMV7M_H
#include "hw/sysbus.h"
-#include "hw/arm/armv7m_nvic.h"
+#include "hw/intc/armv7m_nvic.h"
#define TYPE_BITBAND "ARM,bitband-memory"
#define BITBAND(obj) OBJECT_CHECK(BitBandState, (obj), TYPE_BITBAND)
diff --git a/include/hw/arm/armv7m_nvic.h b/include/hw/intc/armv7m_nvic.h
similarity index 100%
rename from include/hw/arm/armv7m_nvic.h
rename to include/hw/intc/armv7m_nvic.h
--
2.7.4
- [Qemu-devel] [PATCH 13/15] target/arm: Create and use new function arm_v7m_is_handler_mode(), (continued)
- [Qemu-devel] [PATCH 13/15] target/arm: Create and use new function arm_v7m_is_handler_mode(), Peter Maydell, 2017/08/02
- [Qemu-devel] [PATCH 11/15] target/arm: Make arm_cpu_dump_state() handle the M-profile XPSR, Peter Maydell, 2017/08/02
- [Qemu-devel] [PATCH 08/15] target/arm: Define and use XPSR bit masks, Peter Maydell, 2017/08/02
- [Qemu-devel] [PATCH 14/15] armv7m_nvic.h: Move from include/hw/arm to include/hw/intc,
Peter Maydell <=
- [Qemu-devel] [PATCH 01/15] target/arm: Use MMUAccessType enum rather than int, Peter Maydell, 2017/08/02
- [Qemu-devel] [PATCH 15/15] nvic: Implement "user accesses BusFault" SCS region behaviour, Peter Maydell, 2017/08/02