From: Andreas Fritiofson <andreas.fritiofson@gmail.com>
Date: Sun, 10 Mar 2013 11:50:29 +0000 (+0100)
Subject: target: Remove soft_reset_halt_imp
X-Git-Tag: v0.7.0-rc1~51
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=80b80ef9b43acd56358587724218131456049c59;p=openocd

target: Remove soft_reset_halt_imp

Change-Id: I12c907584ef73de570eba2dcfeb8477cabc6098f
Signed-off-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
Reviewed-on: http://openocd.zylin.com/1217
Tested-by: jenkins
Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>
---

diff --git a/src/target/target.c b/src/target/target.c
index e964f522..7e397569 100644
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -677,18 +677,18 @@ static int target_read_memory_imp(struct target *target, uint32_t address,
 	return target->type->read_memory_imp(target, address, size, count, buffer);
 }
 
-static int target_soft_reset_halt_imp(struct target *target)
+static int target_soft_reset_halt(struct target *target)
 {
 	if (!target_was_examined(target)) {
 		LOG_ERROR("Target not examined yet");
 		return ERROR_FAIL;
 	}
-	if (!target->type->soft_reset_halt_imp) {
+	if (!target->type->soft_reset_halt) {
 		LOG_ERROR("Target %s does not support soft_reset_halt",
 				target_name(target));
 		return ERROR_FAIL;
 	}
-	return target->type->soft_reset_halt_imp(target);
+	return target->type->soft_reset_halt(target);
 }
 
 /**
@@ -1099,9 +1099,6 @@ static int target_init_one(struct command_context *cmd_ctx,
 	type->read_memory_imp = target->type->read_memory;
 	type->read_memory = target_read_memory_imp;
 
-	type->soft_reset_halt_imp = target->type->soft_reset_halt;
-	type->soft_reset_halt = target_soft_reset_halt_imp;
-
 	/* Sanity-check MMU support ... stub in what we must, to help
 	 * implement it in stages, but warn if we need to do so.
 	 */
@@ -2498,7 +2495,7 @@ COMMAND_HANDLER(handle_soft_reset_halt_command)
 
 	LOG_USER("requesting target halt and executing a soft reset");
 
-	target->type->soft_reset_halt(target);
+	target_soft_reset_halt(target);
 
 	return ERROR_OK;
 }
diff --git a/src/target/target_type.h b/src/target/target_type.h
index 277607e2..99c8f513 100644
--- a/src/target/target_type.h
+++ b/src/target/target_type.h
@@ -88,7 +88,6 @@ struct target_type {
 	 * reset run; halt
      */
 	int (*deassert_reset)(struct target *target);
-	int (*soft_reset_halt_imp)(struct target *target);
 	int (*soft_reset_halt)(struct target *target);
 
 	/**