X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Farmv7m.h;h=7f8190bf7474d6c8cbdde25c510be10a22a449b5;hb=6435e75e147a6559ed4f784b5e89c8390e787a2a;hp=f3a74221ce9d3ea06bba73b5a680efbaa218b2ef;hpb=4da019edeb62154978dfac6a37e738814b2f2724;p=openocd.git

diff --git a/src/target/armv7m.h b/src/target/armv7m.h
index f3a74221ce..7f8190bf74 100644
--- a/src/target/armv7m.h
+++ b/src/target/armv7m.h
@@ -41,7 +41,7 @@ enum armv7m_mode
 	ARMV7M_MODE_ANY = -1
 };
 
-extern char* armv7m_mode_strings[];
+extern char *armv7m_mode_strings[];
 
 enum armv7m_regtype
 {
@@ -50,7 +50,7 @@ enum armv7m_regtype
 	ARMV7M_REGISTER_MEMMAP
 };
 
-extern char *armv7m_exception_string(int number);
+char *armv7m_exception_string(int number);
 
 /* offsets into armv7m core register cache */
 enum
@@ -91,65 +91,74 @@ 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, int num);
+	int (*write_core_reg)(struct target *target, int num);
 
-	int (*examine_debug_reason)(target_t *target);
-	void (*pre_debug_entry)(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);
+};
 
-	void *arch_info;
-} armv7m_common_t;
+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;
+};
 
-extern reg_cache_t *armv7m_build_reg_cache(target_t *target);
-extern enum armv7m_mode armv7m_number_to_mode(int number);
-extern int armv7m_mode_to_number(enum armv7m_mode mode);
+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);
 
-extern int armv7m_arch_state(struct target_s *target);
-extern 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);
 
-extern int armv7m_register_commands(struct command_context_s *cmd_ctx);
-extern int armv7m_init_arch_info(target_t *target, armv7m_common_t *armv7m);
+int armv7m_register_commands(struct command_context *cmd_ctx);
+int armv7m_init_arch_info(struct target *target, struct armv7m_common *armv7m);
 
-extern int armv7m_run_algorithm(struct target_s *target, int num_mem_params, mem_param_t *mem_params, int num_reg_params, reg_param_t *reg_params, uint32_t entry_point, uint32_t exit_point, int timeout_ms, void *arch_info);
+int armv7m_run_algorithm(struct target *target,
+		int num_mem_params, struct mem_param *mem_params,
+		int num_reg_params, struct reg_param *reg_params,
+		uint32_t entry_point, uint32_t exit_point,
+		int timeout_ms, void *arch_info);
 
-extern int armv7m_invalidate_core_regs(target_t *target);
+int armv7m_invalidate_core_regs(struct target *target);
 
-extern int armv7m_restore_context(target_t *target);
+int armv7m_restore_context(struct target *target);
 
-extern int armv7m_checksum_memory(struct target_s *target, uint32_t address, uint32_t count, uint32_t* checksum);
-extern int armv7m_blank_check_memory(struct target_s *target, uint32_t address, uint32_t count, uint32_t* blank);
+int armv7m_checksum_memory(struct target *target,
+		uint32_t address, uint32_t count, uint32_t* checksum);
+int armv7m_blank_check_memory(struct target *target,
+		uint32_t address, uint32_t count, uint32_t* blank);
 
 /* Thumb mode instructions
  */