X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Faarch64.h;h=d7886a3d7697f6ad27e0edf7cd1fcfc456a9ebd8;hb=fc8885a9c30d720e17381d772df2ea5fb3729924;hp=513f06d183d264908420fec4a969a12e0aa5517d;hpb=d376f7f51831ca8816bb4aca00076b0668462775;p=openocd.git

diff --git a/src/target/aarch64.h b/src/target/aarch64.h
index 513f06d183..d7886a3d76 100644
--- a/src/target/aarch64.h
+++ b/src/target/aarch64.h
@@ -16,8 +16,8 @@
  *   Free Software Foundation, Inc.,                                       *
  ***************************************************************************/
 
-#ifndef AARCH64_H
-#define AARCH64_H
+#ifndef OPENOCD_TARGET_AARCH64_H
+#define OPENOCD_TARGET_AARCH64_H
 
 #include "armv8.h"
 
@@ -36,6 +36,11 @@
 
 #define AARCH64_PADDRDBG_CPU_SHIFT 13
 
+enum aarch64_isrmasking_mode {
+	AARCH64_ISRMASK_OFF,
+	AARCH64_ISRMASK_ON,
+};
+
 struct aarch64_brp {
 	int used;
 	int type;
@@ -48,25 +53,18 @@ struct aarch64_common {
 	int common_magic;
 
 	/* Context information */
-	uint32_t cpudbg_dscr;
-
 	uint32_t system_control_reg;
 	uint32_t system_control_reg_curr;
 
-	enum arm_mode curr_mode;
-
-
 	/* Breakpoint register pairs */
 	int brp_num_context;
 	int brp_num;
 	int brp_num_available;
 	struct aarch64_brp *brp_list;
 
-	/* Use aarch64_read_regs_through_mem for fast register reads */
-	int fast_reg_read;
-
 	struct armv8_common armv8_common;
 
+	enum aarch64_isrmasking_mode isrmasking_mode;
 };
 
 static inline struct aarch64_common *
@@ -75,4 +73,4 @@ target_to_aarch64(struct target *target)
 	return container_of(target->arch_info, struct aarch64_common, armv8_common.arm);
 }
 
-#endif /* AARCH64_H */
+#endif /* OPENOCD_TARGET_AARCH64_H */