X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Fcortex_m3.c;h=bbdc85a24a83dd5df1c9ad2f3a80f8c8e47afb19;hb=2ec440588fa455e4609bae3d7fc146bf53f1bbab;hp=041f8061968f71c09b2ddcf4bb436bb105fd0ef1;hpb=53c05c8b1d5718b2acf5dbe0eb517dd427340041;p=openocd.git

diff --git a/src/target/cortex_m3.c b/src/target/cortex_m3.c
index 041f806196..bbdc85a24a 100644
--- a/src/target/cortex_m3.c
+++ b/src/target/cortex_m3.c
@@ -177,8 +177,8 @@ static int cortex_m3_endreset_event(target_t *target)
 	uint32_t dcb_demcr;
 	struct cortex_m3_common *cortex_m3 = target_to_cm3(target);
 	struct swjdp_common *swjdp = &cortex_m3->armv7m.swjdp_info;
-	cortex_m3_fp_comparator_t *fp_list = cortex_m3->fp_comparator_list;
-	cortex_m3_dwt_comparator_t *dwt_list = cortex_m3->dwt_comparator_list;
+	struct cortex_m3_fp_comparator *fp_list = cortex_m3->fp_comparator_list;
+	struct cortex_m3_dwt_comparator *dwt_list = cortex_m3->dwt_comparator_list;
 
 	mem_ap_read_atomic_u32(swjdp, DCB_DEMCR, &dcb_demcr);
 	LOG_DEBUG("DCB_DEMCR = 0x%8.8" PRIx32 "",dcb_demcr);
@@ -839,7 +839,7 @@ cortex_m3_set_breakpoint(struct target_s *target, struct breakpoint *breakpoint)
 	int fp_num = 0;
 	uint32_t hilo;
 	struct cortex_m3_common *cortex_m3 = target_to_cm3(target);
-	cortex_m3_fp_comparator_t *comparator_list = cortex_m3->fp_comparator_list;
+	struct cortex_m3_fp_comparator *comparator_list = cortex_m3->fp_comparator_list;
 
 	if (breakpoint->set)
 	{
@@ -904,7 +904,7 @@ cortex_m3_unset_breakpoint(struct target_s *target, struct breakpoint *breakpoin
 {
 	int retval;
 	struct cortex_m3_common *cortex_m3 = target_to_cm3(target);
-	cortex_m3_fp_comparator_t * comparator_list = cortex_m3->fp_comparator_list;
+	struct cortex_m3_fp_comparator * comparator_list = cortex_m3->fp_comparator_list;
 
 	if (!breakpoint->set)
 	{
@@ -1052,7 +1052,7 @@ cortex_m3_set_watchpoint(struct target_s *target, struct watchpoint *watchpoint)
 	 * watchpoint using comparator #1; comparator #0 matching cycle
 	 * count; send data trace info through ITM and TPIU; etc
 	 */
-	cortex_m3_dwt_comparator_t *comparator;
+	struct cortex_m3_dwt_comparator *comparator;
 
 	for (comparator = cortex_m3->dwt_comparator_list;
 			comparator->used && dwt_num < cortex_m3->dwt_num_comp;
@@ -1100,7 +1100,7 @@ static int
 cortex_m3_unset_watchpoint(struct target_s *target, struct watchpoint *watchpoint)
 {
 	struct cortex_m3_common *cortex_m3 = target_to_cm3(target);
-	cortex_m3_dwt_comparator_t *comparator;
+	struct cortex_m3_dwt_comparator *comparator;
 	int dwt_num;
 
 	if (!watchpoint->set)
@@ -1517,7 +1517,7 @@ cortex_m3_dwt_setup(struct cortex_m3_common *cm3, struct target_s *target)
 {
 	uint32_t dwtcr;
 	struct reg_cache *cache;
-	cortex_m3_dwt_comparator_t *comparator;
+	struct cortex_m3_dwt_comparator *comparator;
 	int reg, i;
 
 	target_read_u32(target, DWT_CTRL, &dwtcr);
@@ -1533,7 +1533,7 @@ cortex_m3_dwt_setup(struct cortex_m3_common *cm3, struct target_s *target)
 	cm3->dwt_num_comp = (dwtcr >> 28) & 0xF;
 	cm3->dwt_comp_available = cm3->dwt_num_comp;
 	cm3->dwt_comparator_list = calloc(cm3->dwt_num_comp,
-			sizeof(cortex_m3_dwt_comparator_t));
+			sizeof(struct cortex_m3_dwt_comparator));
 	if (!cm3->dwt_comparator_list) {
 fail0:
 		cm3->dwt_num_comp = 0;
@@ -1614,7 +1614,7 @@ static int cortex_m3_examine(struct target_s *target)
 		cortex_m3->fp_num_code = ((fpcr >> 8) & 0x70) | ((fpcr >> 4) & 0xF); /* bits [14:12] and [7:4] */
 		cortex_m3->fp_num_lit = (fpcr >> 8) & 0xF;
 		cortex_m3->fp_code_available = cortex_m3->fp_num_code;
-		cortex_m3->fp_comparator_list = calloc(cortex_m3->fp_num_code + cortex_m3->fp_num_lit, sizeof(cortex_m3_fp_comparator_t));
+		cortex_m3->fp_comparator_list = calloc(cortex_m3->fp_num_code + cortex_m3->fp_num_lit, sizeof(struct cortex_m3_fp_comparator));
 		cortex_m3->fpb_enabled = fpcr & 1;
 		for (i = 0; i < cortex_m3->fp_num_code + cortex_m3->fp_num_lit; i++)
 		{