X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Farmv7a.h;h=625c3a9ae92666038933a8b3877617b31280e01c;hp=910a884c532227b211443f25da8ac9142d1ec7a9;hb=1186f7efa72a86a7000dce60b090bd4f822cdceb;hpb=74d09617b927ed7011098d5a65087dee1ef1e87a

diff --git a/src/target/armv7a.h b/src/target/armv7a.h
index 910a884c53..625c3a9ae9 100644
--- a/src/target/armv7a.h
+++ b/src/target/armv7a.h
@@ -21,7 +21,6 @@
 
 #include "register.h"
 #include "target.h"
-#include "log.h"
 #include "arm_adi_v5.h"
 #include "armv4_5.h"
 #include "armv4_5_mmu.h"
@@ -106,28 +105,28 @@ struct armv7a_common
 
 	/* Cache and Memory Management Unit */
 	struct armv4_5_mmu_common armv4_5_mmu;
-	armv4_5_common_t armv4_5_common;
+	struct arm armv4_5_common;
 
-//	int (*full_context)(struct target_s *target);
-//	int (*read_core_reg)(struct target_s *target, int num, enum armv7a_mode mode);
-//	int (*write_core_reg)(struct target_s *target, int num, enum armv7a_mode mode, u32 value);
-	int (*read_cp15)(struct target_s *target,
+//	int (*full_context)(struct target *target);
+//	int (*read_core_reg)(struct target *target, int num, enum armv7a_mode mode);
+//	int (*write_core_reg)(struct target *target, int num, enum armv7a_mode mode, u32 value);
+	int (*read_cp15)(struct target *target,
 			uint32_t op1, uint32_t op2,
 			uint32_t CRn, uint32_t CRm, uint32_t *value);
-	int (*write_cp15)(struct target_s *target,
+	int (*write_cp15)(struct target *target,
 			uint32_t op1, uint32_t op2,
 			uint32_t CRn, uint32_t CRm, uint32_t value);
 
-	int (*examine_debug_reason)(target_t *target);
-	void (*post_debug_entry)(target_t *target);
+	int (*examine_debug_reason)(struct target *target);
+	void (*post_debug_entry)(struct target *target);
 
-	void (*pre_restore_context)(target_t *target);
-	void (*post_restore_context)(target_t *target);
+	void (*pre_restore_context)(struct target *target);
+	void (*post_restore_context)(struct target *target);
 
 };
 
 static inline struct armv7a_common *
-target_to_armv7a(struct target_s *target)
+target_to_armv7a(struct target *target)
 {
 	return container_of(target->arch_info, struct armv7a_common,
 			armv4_5_common);
@@ -145,15 +144,15 @@ struct armv7a_core_reg
 {
 	int num;
 	enum armv7a_mode mode;
-	target_t *target;
+	struct target *target;
 	struct armv7a_common *armv7a_common;
 };
 
-int armv7a_arch_state(struct target_s *target);
-struct reg_cache *armv7a_build_reg_cache(target_t *target,
+int armv7a_arch_state(struct target *target);
+struct reg_cache *armv7a_build_reg_cache(struct target *target,
 		struct armv7a_common *armv7a_common);
-int armv7a_register_commands(struct command_context_s *cmd_ctx);
-int armv7a_init_arch_info(target_t *target, struct armv7a_common *armv7a);
+int armv7a_register_commands(struct command_context *cmd_ctx);
+int armv7a_init_arch_info(struct target *target, struct armv7a_common *armv7a);
 
 /* map psr mode bits to linear number */
 static inline int armv7a_mode_to_number(enum armv7a_mode mode)