stm32: determine all cpu types and use common examine

This patch determine all cpu types and not only
the cortex M3 and the stm32 target use the common
target examine function from the cortex_m sources.

Change-Id: If689dd994b3855284b927fc4b206f420cf32b6c7
Signed-off-by: Mathias K <kesmtp@freenet.de>
Reviewed-on: http://openocd.zylin.com/511
Tested-by: jenkins
Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>

4 files changed, 16 insertions, 65 deletions

diff --git a/src/target/arm_adi_v5.c b/src/target/arm_adi_v5.c
index 2203eb55..1ef7c1a0 100644
--- a/src/target/arm_adi_v5.c
+++ b/src/target/arm_adi_v5.c
@@ -1098,6 +1098,14 @@ int ahbap_debugport_init(struct adiv5_dap *dap)
 
 	LOG_DEBUG(" ");
 
+	/* test for initialized low level jtag hardware
+	 * this always fails for stlink hardware
+	 */
+	if (!dap->jtag_info) {
+		LOG_DEBUG("No low level jtag hardware found");
+		return ERROR_OK;
+	}
+
 	/* JTAG-DP or SWJ-DP, in JTAG mode
 	 * ... for SWD mode this is patched as part
 	 * of link switchover
diff --git a/src/target/cortex_m.c b/src/target/cortex_m.c
index 5ab120f2..76e197c1 100644
--- a/src/target/cortex_m.c
+++ b/src/target/cortex_m.c
@@ -1756,7 +1756,7 @@ fail1:
 	 */
 }
 
-static int cortex_m3_examine(struct target *target)
+int cortex_m3_examine(struct target *target)
 {
 	int retval;
 	uint32_t cpuid, fpcr;
@@ -1776,9 +1776,11 @@ static int cortex_m3_examine(struct target *target)
 		if (retval != ERROR_OK)
 			return retval;
 
-		if (((cpuid >> 4) & 0xc3f) == 0xc23)
-			LOG_DEBUG("Cortex-M3 r%" PRId8 "p%" PRId8 " processor detected",
-				(uint8_t)((cpuid >> 20) & 0xf), (uint8_t)((cpuid >> 0) & 0xf));
+		/* Get CPU Type */
+		i = (cpuid >> 4) & 0xf;
+
+		LOG_DEBUG("Cortex-M%d r%" PRId8 "p%" PRId8 " processor detected",
+				i, (uint8_t)((cpuid >> 20) & 0xf), (uint8_t)((cpuid >> 0) & 0xf));
 		LOG_DEBUG("cpuid: 0x%8.8" PRIx32 "", cpuid);
 
 		/* NOTE: FPB and DWT are both optional. */
diff --git a/src/target/cortex_m.h b/src/target/cortex_m.h
index ae0c8a59..a10368d5 100644
--- a/src/target/cortex_m.h
+++ b/src/target/cortex_m.h
@@ -180,6 +180,7 @@ target_to_cm3(struct target *target)
 			struct cortex_m3_common, armv7m);
 }
 
+int cortex_m3_examine(struct target *target);
 int cortex_m3_set_breakpoint(struct target *target, struct breakpoint *breakpoint);
 int cortex_m3_unset_breakpoint(struct target *target, struct breakpoint *breakpoint);
 int cortex_m3_add_breakpoint(struct target *target, struct breakpoint *breakpoint);
diff --git a/src/target/stm32_stlink.c b/src/target/stm32_stlink.c
index 171cc83c..64e83f53 100644
--- a/src/target/stm32_stlink.c
+++ b/src/target/stm32_stlink.c
@@ -245,66 +245,6 @@ static int stm32_stlink_target_create(struct target *target,
 	return ERROR_OK;
 }
 
-static int stm32_stlink_examine(struct target *target)
-{
-	int retval, i;
-	uint32_t cpuid, fpcr;
-	struct cortex_m3_common *cortex_m3 = target_to_cm3(target);
-
-	LOG_DEBUG("%s", __func__);
-
-	if (target->tap->hasidcode == false) {
-		LOG_ERROR("no IDCODE present on device");
-
-		return ERROR_COMMAND_SYNTAX_ERROR;
-	}
-
-	if (!target_was_examined(target)) {
-		target_set_examined(target);
-
-		LOG_INFO("IDCODE %x", target->tap->idcode);
-
-		/* Read from Device Identification Registers */
-		retval = target_read_u32(target, CPUID, &cpuid);
-		if (retval != ERROR_OK)
-			return retval;
-
-		if (((cpuid >> 4) & 0xc3f) == 0xc23)
-			LOG_DEBUG("Cortex-M3 r%" PRId8 "p%" PRId8 " processor detected",
-				(uint8_t)((cpuid >> 20) & 0xf), (uint8_t)((cpuid >> 0) & 0xf));
-		LOG_DEBUG("cpuid: 0x%8.8" PRIx32 "", cpuid);
-
-		/* Setup FPB */
-		target_read_u32(target, FP_CTRL, &fpcr);
-		cortex_m3->auto_bp_type = 1;
-		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(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++) {
-			cortex_m3->fp_comparator_list[i].type =
-				(i < cortex_m3->fp_num_code) ? FPCR_CODE : FPCR_LITERAL;
-			cortex_m3->fp_comparator_list[i].fpcr_address = FP_COMP0 + 4 * i;
-		}
-		LOG_DEBUG("FPB fpcr 0x%" PRIx32 ", numcode %i, numlit %i", fpcr,
-			cortex_m3->fp_num_code, cortex_m3->fp_num_lit);
-
-		/* Setup DWT */
-		cortex_m3_dwt_setup(cortex_m3, target);
-
-		/* These hardware breakpoints only work for code in flash! */
-		LOG_INFO("%s: hardware has %d breakpoints, %d watchpoints",
-				target_name(target),
-				cortex_m3->fp_num_code,
-				cortex_m3->dwt_num_comp);
-	}
-
-	return ERROR_OK;
-}
-
 static int stm32_stlink_load_context(struct target *target)
 {
 	struct armv7m_common *armv7m = target_to_armv7m(target);
@@ -723,7 +663,7 @@ struct target_type stm32_stlink_target = {
 
 	.init_target = stm32_stlink_init_target,
 	.target_create = stm32_stlink_target_create,
-	.examine = stm32_stlink_examine,
+	.examine = cortex_m3_examine,
 
 	.poll = stm32_stlink_poll,
 	.arch_state = armv7m_arch_state,