X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Farm9tdmi.c;h=1b7b64529eb878fde6e93b5620175473c506779f;hb=2280ddeea5fd82554696f1caa97f7a485a035da4;hp=147c0903e02d0363235ef96b31b22ec5ad89cb2a;hpb=ef746e27c55c14b7a4f6381c490e5c175e409c0b;p=openocd.git

diff --git a/src/target/arm9tdmi.c b/src/target/arm9tdmi.c
index 147c0903e0..1b7b64529e 100644
--- a/src/target/arm9tdmi.c
+++ b/src/target/arm9tdmi.c
@@ -742,43 +742,6 @@ static void arm9tdmi_build_reg_cache(struct target *target)
 	armv4_5->core_cache = (*cache_p);
 }
 
-int arm9tdmi_examine(struct target *target)
-{
-	int retval;
-	struct arm7_9_common *arm7_9 = target_to_arm7_9(target);
-
-	if (!target_was_examined(target))
-	{
-		struct reg_cache **cache_p = register_get_last_cache_p(&target->reg_cache);
-		struct reg_cache *t;
-		/* one extra register (vector catch) */
-		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)
-		{
-			struct arm_jtag *jtag_info = &arm7_9->jtag_info;
-			(*cache_p)->next = etm_build_reg_cache(target,
-					jtag_info, arm7_9->armv4_5_common.etm);
-			arm7_9->armv4_5_common.etm->reg_cache = (*cache_p)->next;
-		}
-		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 arm9tdmi_init_target(struct command_context *cmd_ctx,
 		struct target *target)
 {
@@ -975,8 +938,9 @@ struct target_type arm9tdmi_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,
 
@@ -988,5 +952,5 @@ struct target_type arm9tdmi_target =
 	.register_commands = arm9tdmi_register_commands,
 	.target_create = arm9tdmi_target_create,
 	.init_target = arm9tdmi_init_target,
-	.examine = arm9tdmi_examine,
+	.examine = arm7_9_examine,
 };