X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Fcortex_m3.h;h=fec0a9edbc4d294a6857c21b210ba41bfea81945;hp=d04923f954f88d848c427d225d2d3caef773d38e;hb=ef1cfb23947bd32798077c6abb5c25a049460ae9;hpb=6d3bed69dc023f49b51b6504d977463e722e9e9d

diff --git a/src/target/cortex_m3.h b/src/target/cortex_m3.h
index d04923f954..fec0a9edbc 100644
--- a/src/target/cortex_m3.h
+++ b/src/target/cortex_m3.h
@@ -134,9 +134,8 @@ typedef struct  cortex_m3_dwt_comparator_s
 typedef struct cortex_m3_common_s
 {
 	int common_magic;
-//	int (*full_context)(struct target_s *target);
-
 	arm_jtag_t jtag_info;
+	char *variant;
 	
 	/* Context information */
 	u32 dcb_dhcsr;
@@ -159,32 +158,8 @@ typedef struct cortex_m3_common_s
 	int intlinesnum;
 	u32 *intsetenable;
 	
-/*
-	u32 arm_bkpt;
-	u16 thumb_bkpt;
-	int sw_bkpts_use_wp;
-	int wp_available;
-	int wp0_used;
-	int wp1_used;
-	
-	int force_hw_bkpts;
-	int dbgreq_adjust_pc;
-	int use_dbgrq;
-	int has_etm;
-	
-	int reinit_embeddedice;
-	
-	struct working_area_s *dcc_working_area;
-	
-	int fast_memory_access;
-	int dcc_downloads;
-*/
-	/* breakpoint use map */
-	int sw_bkpts_enabled;
-
 	armv7m_common_t armv7m;
 	swjdp_common_t swjdp_info;
-	
 	void *arch_info;
 } cortex_m3_common_t;
 
@@ -198,7 +173,6 @@ int cortex_m3_step(struct target_s *target, int current, u32 address, int handle
 int cortex_m3_assert_reset(target_t *target);
 int cortex_m3_deassert_reset(target_t *target);
 int cortex_m3_soft_reset_halt(struct target_s *target);
-int cortex_m3_prepare_reset_halt(struct target_s *target);
 
 int cortex_m3_read_memory(struct target_s *target, u32 address, u32 size, u32 count, u8 *buffer);
 int cortex_m3_write_memory(struct target_s *target, u32 address, u32 size, u32 count, u8 *buffer);
@@ -212,6 +186,6 @@ int cortex_m3_add_watchpoint(struct target_s *target, watchpoint_t *watchpoint);
 int cortex_m3_remove_watchpoint(struct target_s *target, watchpoint_t *watchpoint);
 
 extern int cortex_m3_register_commands(struct command_context_s *cmd_ctx);
-extern int cortex_m3_init_arch_info(target_t *target, cortex_m3_common_t *cortex_m3, int chain_pos, char *variant);
+extern int cortex_m3_init_arch_info(target_t *target, cortex_m3_common_t *cortex_m3, int chain_pos, const char *variant);
 
 #endif /* CORTEX_M3_H */