X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Farmv7a.h;h=51f7b45aa6f0d82fb5e8eb1c122bddc657deead8;hb=1c619a2f12cbfe1887824d41e68e85a1c4f5a8b3;hp=b0083619fd0de888956bdf7ee045ae01609d181f;hpb=f5093e160534c269b8bc3590f5809ed3baead56f;p=openocd.git

diff --git a/src/target/armv7a.h b/src/target/armv7a.h
index b0083619fd..51f7b45aa6 100644
--- a/src/target/armv7a.h
+++ b/src/target/armv7a.h
@@ -24,43 +24,12 @@
 #include "armv4_5_mmu.h"
 #include "armv4_5_cache.h"
 
-typedef enum armv7a_mode
-{
-	ARMV7A_MODE_USR = 16,
-	ARMV7A_MODE_FIQ = 17,
-	ARMV7A_MODE_IRQ = 18,
-	ARMV7A_MODE_SVC = 19,
-	ARMV7A_MODE_ABT = 23,
-	ARMV7A_MODE_UND = 27,
-	ARMV7A_MODE_SYS = 31,
-	ARMV7A_MODE_MON = 22,
-	ARMV7A_MODE_ANY = -1
-} armv7a_t;
-
-typedef enum armv7a_state
-{
-	ARMV7A_STATE_ARM,
-	ARMV7A_STATE_THUMB,
-	ARMV7A_STATE_JAZELLE,
-	ARMV7A_STATE_THUMBEE,
-} armv7a_state_t;
-
 enum
 {
 	ARM_PC  = 15,
 	ARM_CPSR = 16
 }
 ;
-/* offsets into armv4_5 core register cache */
-enum
-{
-	ARMV7A_CPSR = 31,
-	ARMV7A_SPSR_FIQ = 32,
-	ARMV7A_SPSR_IRQ = 33,
-	ARMV7A_SPSR_SVC = 34,
-	ARMV7A_SPSR_ABT = 35,
-	ARMV7A_SPSR_UND = 36
-};
 
 #define ARMV7_COMMON_MAGIC 0x0A450999
 
@@ -76,10 +45,9 @@ enum
 
 struct armv7a_common
 {
+	struct arm armv4_5_common;
 	int common_magic;
 	struct reg_cache *core_cache;
-	enum armv7a_mode core_mode;
-	enum armv7a_state core_state;
 
 	/* arm adp debug port */
 	struct swjdp_common swjdp_info;
@@ -91,7 +59,6 @@ struct armv7a_common
 
 	/* Cache and Memory Management Unit */
 	struct armv4_5_mmu_common armv4_5_mmu;
-	struct arm armv4_5_common;
 
 	int (*read_cp15)(struct target *target,
 			uint32_t op1, uint32_t op2,
@@ -119,14 +86,14 @@ struct armv7a_algorithm
 {
 	int common_magic;
 
-	enum armv7a_mode core_mode;
-	enum armv7a_state core_state;
+	enum armv4_5_mode core_mode;
+	enum armv4_5_state core_state;
 };
 
 struct armv7a_core_reg
 {
 	int num;
-	enum armv7a_mode mode;
+	enum armv4_5_mode mode;
 	struct target *target;
 	struct armv7a_common *armv7a_common;
 };