X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Farm7tdmi.c;h=3bd5236442210313a7591df03bdbdb8db381a959;hb=7e4adfe1c53aa18d4feba1e58ceb5c5aaa470775;hp=c7bbd776274a091494480758cc58818a109dec41;hpb=78c6b922e21849ed8a2d3af4ca55c84c3d1ac185;p=openocd.git

diff --git a/src/target/arm7tdmi.c b/src/target/arm7tdmi.c
index c7bbd77627..3bd5236442 100644
--- a/src/target/arm7tdmi.c
+++ b/src/target/arm7tdmi.c
@@ -29,6 +29,7 @@
 
 #include "arm7tdmi.h"
 #include "target_type.h"
+#include "register.h"
 
 
 /*
@@ -646,42 +647,6 @@ static void arm7tdmi_build_reg_cache(struct target *target)
 	armv4_5->core_cache = (*cache_p);
 }
 
-int arm7tdmi_examine(struct target *target)
-{
-	struct arm7_9_common *arm7_9 = target_to_arm7_9(target);
-	int retval;
-
-
-	if (!target_was_examined(target))
-	{
-		/* get pointers to arch-specific information */
-		struct reg_cache **cache_p = register_get_last_cache_p(&target->reg_cache);
-		struct reg_cache *t = embeddedice_build_reg_cache(target, arm7_9);
-		if (t == NULL)
-			return ERROR_FAIL;
-
-		(*cache_p) = t;
-		arm7_9->eice_cache = (*cache_p);
-
-		if (arm7_9->armv4_5_common.etm)
-			(*cache_p)->next = etm_build_reg_cache(target,
-					&arm7_9->jtag_info,
-					arm7_9->armv4_5_common.etm);
-
-		target_set_examined(target);
-	}
-	if ((retval = embeddedice_setup(target)) != ERROR_OK)
-		return retval;
-	if ((retval = arm7_9_setup(target)) != ERROR_OK)
-		return retval;
-	if (arm7_9->armv4_5_common.etm)
-	{
-		if ((retval = etm_setup(target)) != ERROR_OK)
-			return retval;
-	}
-	return ERROR_OK;
-}
-
 int arm7tdmi_init_target(struct command_context *cmd_ctx, struct target *target)
 {
 	arm7tdmi_build_reg_cache(target);
@@ -689,10 +654,9 @@ int arm7tdmi_init_target(struct command_context *cmd_ctx, struct target *target)
 	return ERROR_OK;
 }
 
-int arm7tdmi_init_arch_info(struct target *target, struct arm7tdmi_common *arm7tdmi, struct jtag_tap *tap)
+int arm7tdmi_init_arch_info(struct target *target,
+		struct arm7_9_common *arm7_9, struct jtag_tap *tap)
 {
-	struct arm7_9_common *arm7_9 = &arm7tdmi->arm7_9_common;
-
 	/* prepare JTAG information for the new target */
 	arm7_9->jtag_info.tap = tap;
 	arm7_9->jtag_info.scann_size = 4;
@@ -741,11 +705,11 @@ int arm7tdmi_init_arch_info(struct target *target, struct arm7tdmi_common *arm7t
 
 static int arm7tdmi_target_create(struct target *target, Jim_Interp *interp)
 {
-	struct arm7tdmi_common *arm7tdmi;
+	struct arm7_9_common *arm7_9;
 
-	arm7tdmi = calloc(1,sizeof(struct arm7tdmi_common));
-	arm7tdmi_init_arch_info(target, arm7tdmi, target->tap);
-	arm7tdmi->arm7_9_common.armv4_5_common.is_armv4 = true;
+	arm7_9 = calloc(1,sizeof(struct arm7_9_common));
+	arm7tdmi_init_arch_info(target, arm7_9, target->tap);
+	arm7_9->armv4_5_common.is_armv4 = true;
 
 	return ERROR_OK;
 }
@@ -773,8 +737,9 @@ struct target_type arm7tdmi_target =
 	.read_memory = arm7_9_read_memory,
 	.write_memory = arm7_9_write_memory,
 	.bulk_write_memory = arm7_9_bulk_write_memory,
-	.checksum_memory = arm7_9_checksum_memory,
-	.blank_check_memory = arm7_9_blank_check_memory,
+
+	.checksum_memory = arm_checksum_memory,
+	.blank_check_memory = arm_blank_check_memory,
 
 	.run_algorithm = armv4_5_run_algorithm,
 
@@ -786,5 +751,5 @@ struct target_type arm7tdmi_target =
 	.register_commands  = arm7_9_register_commands,
 	.target_create  = arm7tdmi_target_create,
 	.init_target = arm7tdmi_init_target,
-	.examine = arm7tdmi_examine,
+	.examine = arm7_9_examine,
 };