X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Farm7_9_common.h;h=8a6dce4f68b0061f9a4cd2dac546037f9fade507;hp=68197b46d65c5c43b73e01f2f87cebb1c9d517ff;hb=b1de5eb9a074b362e953e857c42cac9a9b18b2a3;hpb=efef05870d726fe4cb6786d785fae4628fe7ec1e

diff --git a/src/target/arm7_9_common.h b/src/target/arm7_9_common.h
index 68197b46d6..8a6dce4f68 100644
--- a/src/target/arm7_9_common.h
+++ b/src/target/arm7_9_common.h
@@ -30,7 +30,7 @@
 #define ARM7_9_COMMON_H
 
 #include "breakpoints.h"
-#include "etm.h"
+#include "armv4_5.h"
 
 #define	ARM7_9_COMMON_MAGIC 0x0a790a79 /**< */
 
@@ -39,6 +39,7 @@
  */
 typedef struct arm7_9_common_s
 {
+	struct arm armv4_5_common;
 	uint32_t common_magic;
 
 	arm_jtag_t jtag_info; /**< JTAG information for target */
@@ -46,6 +47,7 @@ typedef struct arm7_9_common_s
 
 	uint32_t arm_bkpt; /**< ARM breakpoint instruction */
 	uint16_t thumb_bkpt; /**< Thumb breakpoint instruction */
+
 	int sw_breakpoints_added; /**< Specifies which watchpoint software breakpoints are setup on */
 	int sw_breakpoint_count; /**< keep track of number of software breakpoints we have set */
 	int breakpoint_count; /**< Current number of set breakpoints */
@@ -54,24 +56,21 @@ typedef struct arm7_9_common_s
 	int wp0_used; /**< Specifies if and how watchpoint unit 0 is used */
 	int wp1_used; /**< Specifies if and how watchpoint unit 1 is used */
 	int wp1_used_default; /**< Specifies if and how watchpoint unit 1 is used by default */
-	int force_hw_bkpts;
 	int dbgreq_adjust_pc; /**< Amount of PC adjustment caused by a DBGREQ */
-	int use_dbgrq; /**< Specifies if DBGRQ should be used to halt the target */
-	int need_bypass_before_restart; /**< Specifies if there should be a bypass before a JTAG restart */
+	bool use_dbgrq; /**< Specifies if DBGRQ should be used to halt the target */
+	bool need_bypass_before_restart; /**< Specifies if there should be a bypass before a JTAG restart */
 
-	etm_context_t *etm_ctx;
+	bool has_single_step;
+	bool has_monitor_mode;
+	bool has_vector_catch; /**< Specifies if the target has a reset vector catch */
 
-	int has_single_step;
-	int has_monitor_mode;
-	int has_vector_catch; /**< Specifies if the target has a reset vector catch */
+	bool debug_entry_from_reset; /**< Specifies if debug entry was from a reset */
 
-	int debug_entry_from_reset; /**< Specifies if debug entry was from a reset */
+	bool fast_memory_access;
+	bool dcc_downloads;
 
 	struct working_area_s *dcc_working_area;
 
-	int fast_memory_access;
-	int dcc_downloads;
-
 	int (*examine_debug_reason)(target_t *target); /**< Function for determining why debug state was entered */
 
 	void (*change_to_arm)(target_t *target, uint32_t *r0, uint32_t *pc); /**< Function for changing from Thumb to ARM mode */
@@ -101,17 +100,21 @@ typedef struct arm7_9_common_s
 
 	void (*set_special_dbgrq)(target_t *target); /**< Function for setting DBGRQ if the normal way won't work */
 
-	void (*pre_debug_entry)(target_t *target); /**< Callback function called before entering debug mode */
 	void (*post_debug_entry)(target_t *target); /**< Callback function called after entering debug mode */
 
 	void (*pre_restore_context)(target_t *target); /**< Callback function called before restoring the processor context */
 	void (*post_restore_context)(target_t *target); /**< Callback function called after restoring the processor context */
 
-	armv4_5_common_t armv4_5_common;
-	void *arch_info;
 
 } arm7_9_common_t;
 
+static inline struct arm7_9_common_s *
+target_to_arm7_9(struct target_s *target)
+{
+	return container_of(target->arch_info, struct arm7_9_common_s,
+			armv4_5_common);
+}
+
 int arm7_9_register_commands(struct command_context_s *cmd_ctx);
 
 int arm7_9_poll(target_t *target);
@@ -138,7 +141,7 @@ int arm7_9_bulk_write_memory(target_t *target, uint32_t address, uint32_t count,
 int arm7_9_checksum_memory(struct target_s *target, uint32_t address, uint32_t count, uint32_t* checksum);
 int arm7_9_blank_check_memory(struct target_s *target, uint32_t address, uint32_t count, uint32_t* blank);
 
-int arm7_9_run_algorithm(struct target_s *target, int num_mem_params, mem_param_t *mem_params, int num_reg_prams, reg_param_t *reg_param, uint32_t entry_point, void *arch_info);
+int arm7_9_run_algorithm(struct target_s *target, int num_mem_params, struct mem_param *mem_params, int num_reg_prams, struct reg_param *reg_param, uint32_t entry_point, void *arch_info);
 
 int arm7_9_add_breakpoint(struct target_s *target, breakpoint_t *breakpoint);
 int arm7_9_remove_breakpoint(struct target_s *target, breakpoint_t *breakpoint);