X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Fcortex_m3.h;h=e1f8ef8039018f642c068cb5216f6f7dfacb6bfc;hp=f4cefa7803256e5e5768611eedefe6338901e1a1;hb=89fa8ce2d8c58707f3dfda397138f8ee336e1a47;hpb=ce88e8adf7de87b0f2e5904c1f620e47774a0458;ds=sidebyside

diff --git a/src/target/cortex_m3.h b/src/target/cortex_m3.h
index f4cefa7803..e1f8ef8039 100644
--- a/src/target/cortex_m3.h
+++ b/src/target/cortex_m3.h
@@ -26,8 +26,6 @@
 #ifndef CORTEX_M3_H
 #define CORTEX_M3_H
 
-#include "register.h"
-#include "target.h"
 #include "armv7m.h"
 
 
@@ -45,6 +43,7 @@
 #define DCRSR_WnR	(1 << 16)
 
 #define DWT_CTRL	0xE0001000
+#define DWT_CYCCNT	0xE0001004
 #define DWT_COMP0	0xE0001020
 #define DWT_MASK0	0xE0001024
 #define DWT_FUNCTION0	0xE0001028
@@ -60,8 +59,6 @@
 #define FP_COMP6	0xE0002020
 #define FP_COMP7	0xE0002024
 
-#define DWT_CTRL	0xE0001000
-
 /* DCB_DHCSR bit and field definitions */
 #define DBGKEY		(0xA05F << 16)
 #define C_DEBUGEN	(1 << 0)
@@ -120,27 +117,33 @@
 #define FPCR_REPLACE_BKPT_HIGH  (2 << 30)
 #define FPCR_REPLACE_BKPT_BOTH  (3 << 30)
 
-typedef struct  cortex_m3_fp_comparator_s
+struct cortex_m3_fp_comparator
 {
 	int used;
 	int type;
 	uint32_t fpcr_value;
 	uint32_t fpcr_address;
-} cortex_m3_fp_comparator_t;
+};
 
-typedef struct  cortex_m3_dwt_comparator_s
+struct cortex_m3_dwt_comparator
 {
 	int used;
 	uint32_t comp;
 	uint32_t mask;
 	uint32_t function;
 	uint32_t dwt_comparator_address;
-} cortex_m3_dwt_comparator_t;
+};
+
+enum cortex_m3_soft_reset_config
+{
+	CORTEX_M3_RESET_SYSRESETREQ,
+	CORTEX_M3_RESET_VECTRESET,
+};
 
-typedef struct cortex_m3_common_s
+struct cortex_m3_common
 {
 	int common_magic;
-	arm_jtag_t jtag_info;
+	struct arm_jtag jtag_info;
 
 	/* Context information */
 	uint32_t dcb_dhcsr;
@@ -153,19 +156,24 @@ typedef struct cortex_m3_common_s
 	int fp_code_available;
 	int fpb_enabled;
 	int auto_bp_type;
-	cortex_m3_fp_comparator_t *fp_comparator_list;
+	struct cortex_m3_fp_comparator *fp_comparator_list;
 
 	/* Data Watchpoint and Trace (DWT) */
 	int dwt_num_comp;
 	int dwt_comp_available;
-	cortex_m3_dwt_comparator_t *dwt_comparator_list;
+	struct cortex_m3_dwt_comparator *dwt_comparator_list;
+	struct reg_cache *dwt_cache;
+
+	enum cortex_m3_soft_reset_config soft_reset_config;
 
-	/* Interrupts */
-	int intlinesnum;
-	uint32_t *intsetenable;
+	struct armv7m_common armv7m;
+};
 
-	armv7m_common_t armv7m;
-	void *arch_info;
-} cortex_m3_common_t;
+static inline struct cortex_m3_common *
+target_to_cm3(struct target *target)
+{
+	return container_of(target->arch_info,
+			struct cortex_m3_common, armv7m);
+}
 
 #endif /* CORTEX_M3_H */