X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Fxscale.c;h=b9a367ad6d81301aa7371e4448ed81728be82617;hb=35b3c95299a97c05078f7dd662d66c89a356869d;hp=89ecc2658739484cafabcc79d7e9d4a09513afb6;hpb=d47e1b8f362379d8a2307f49e2b42115a3f40524;p=openocd.git

diff --git a/src/target/xscale.c b/src/target/xscale.c
index 89ecc26587..b9a367ad6d 100644
--- a/src/target/xscale.c
+++ b/src/target/xscale.c
@@ -64,7 +64,6 @@ int xscale_restore_context(target_t *target);
 int xscale_assert_reset(target_t *target);
 int xscale_deassert_reset(target_t *target);
 int xscale_soft_reset_halt(struct target_s *target);
-int xscale_prepare_reset_halt(struct target_s *target);
 
 int xscale_set_reg_u32(reg_t *reg, u32 value);
 
@@ -105,7 +104,6 @@ target_type_t xscale_target =
 	.assert_reset = xscale_assert_reset,
 	.deassert_reset = xscale_deassert_reset,
 	.soft_reset_halt = xscale_soft_reset_halt,
-	.prepare_reset_halt = xscale_prepare_reset_halt,
 
 	.get_gdb_reg_list = armv4_5_get_gdb_reg_list,
 
@@ -1265,7 +1263,7 @@ int xscale_halt(target_t *target)
 
 	if (target->state == TARGET_HALTED)
 	{
-		LOG_WARNING("target was already halted");
+		LOG_DEBUG("target was already halted");
 		return ERROR_OK;
 	}
 	else if (target->state == TARGET_UNKNOWN)
@@ -1780,14 +1778,6 @@ int xscale_soft_reset_halt(struct target_s *target)
 	return ERROR_OK;
 }
 
-int xscale_prepare_reset_halt(struct target_s *target)
-{
-	/* nothing to be done for reset_halt on XScale targets
-	 * we always halt after a reset to upload the debug handler
-	 */
-	return ERROR_OK;
-}
-
 int xscale_read_core_reg(struct target_s *target, int num, enum armv4_5_mode mode)
 {