X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Farmv7m.h;h=353860a9347ad0bc79e2d3ca67fdce58f938304e;hb=1527272fb21beee7839335ea5587e879163d2ed1;hp=6b51c477906b9302de2edf8ff5d322703149985b;hpb=6c965a3da9cd6f5b2cf1b177d38723356c83d923;p=openocd.git

diff --git a/src/target/armv7m.h b/src/target/armv7m.h
index 6b51c47790..353860a934 100644
--- a/src/target/armv7m.h
+++ b/src/target/armv7m.h
@@ -26,7 +26,8 @@
 #ifndef ARMV7M_COMMON_H
 #define ARMV7M_COMMON_H
 
-#include "arm_adi_v5.h"
+#include <target/arm_adi_v5.h>
+#include <target/armv4_5.h>
 
 /* define for enabling armv7 gdb workarounds */
 #if 1
@@ -91,75 +92,76 @@ enum
 
 #define ARMV7M_COMMON_MAGIC 0x2A452A45
 
-typedef struct armv7m_common_s
+struct armv7m_common
 {
 	int common_magic;
-	reg_cache_t *core_cache;
+	struct reg_cache *core_cache;
 	enum armv7m_mode core_mode;
 	int exception_number;
-	swjdp_common_t swjdp_info;
+	struct swjdp_common swjdp_info;
 
 	/* Direct processor core register read and writes */
-	int (*load_core_reg_u32)(struct target_s *target, enum armv7m_regtype type, uint32_t num, uint32_t *value);
-	int (*store_core_reg_u32)(struct target_s *target, enum armv7m_regtype type, uint32_t num, uint32_t value);
+	int (*load_core_reg_u32)(struct target *target, enum armv7m_regtype type, uint32_t num, uint32_t *value);
+	int (*store_core_reg_u32)(struct target *target, enum armv7m_regtype type, uint32_t num, uint32_t value);
 	/* register cache to processor synchronization */
-	int (*read_core_reg)(struct target_s *target, int num);
-	int (*write_core_reg)(struct target_s *target, int num);
+	int (*read_core_reg)(struct target *target, unsigned num);
+	int (*write_core_reg)(struct target *target, unsigned num);
 
-	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);
-} armv7m_common_t;
+	void (*pre_restore_context)(struct target *target);
+	void (*post_restore_context)(struct target *target);
+};
 
-static inline struct armv7m_common_s *
-target_to_armv7m(struct target_s *target)
+static inline struct armv7m_common *
+target_to_armv7m(struct target *target)
 {
 	return target->arch_info;
 }
 
-typedef struct armv7m_algorithm_s
+struct armv7m_algorithm
 {
 	int common_magic;
 
 	enum armv7m_mode core_mode;
-} armv7m_algorithm_t;
+};
 
-typedef struct armv7m_core_reg_s
+struct armv7m_core_reg
 {
 	uint32_t num;
 	enum armv7m_regtype type;
-	target_t *target;
-	armv7m_common_t *armv7m_common;
-} armv7m_core_reg_t;
+	struct target *target;
+	struct armv7m_common *armv7m_common;
+};
 
-reg_cache_t *armv7m_build_reg_cache(target_t *target);
+struct reg_cache *armv7m_build_reg_cache(struct target *target);
 enum armv7m_mode armv7m_number_to_mode(int number);
 int armv7m_mode_to_number(enum armv7m_mode mode);
 
-int armv7m_arch_state(struct target_s *target);
-int armv7m_get_gdb_reg_list(target_t *target,
-		reg_t **reg_list[], int *reg_list_size);
+int armv7m_arch_state(struct target *target);
+int armv7m_get_gdb_reg_list(struct target *target,
+		struct reg **reg_list[], int *reg_list_size);
 
-int armv7m_register_commands(struct command_context_s *cmd_ctx);
-int armv7m_init_arch_info(target_t *target, armv7m_common_t *armv7m);
+int armv7m_init_arch_info(struct target *target, struct armv7m_common *armv7m);
 
-int armv7m_run_algorithm(struct target_s *target,
+int armv7m_run_algorithm(struct target *target,
 		int num_mem_params, struct mem_param *mem_params,
-		int num_reg_params, reg_param_t *reg_params,
+		int num_reg_params, struct reg_param *reg_params,
 		uint32_t entry_point, uint32_t exit_point,
 		int timeout_ms, void *arch_info);
 
-int armv7m_invalidate_core_regs(target_t *target);
+int armv7m_invalidate_core_regs(struct target *target);
 
-int armv7m_restore_context(target_t *target);
+int armv7m_restore_context(struct target *target);
 
-int armv7m_checksum_memory(struct target_s *target,
+int armv7m_checksum_memory(struct target *target,
 		uint32_t address, uint32_t count, uint32_t* checksum);
-int armv7m_blank_check_memory(struct target_s *target,
+int armv7m_blank_check_memory(struct target *target,
 		uint32_t address, uint32_t count, uint32_t* blank);
 
+extern const struct command_registration armv7m_command_handlers[];
+
 /* Thumb mode instructions
  */