From 7d1f9bafc75b6230afa5b6a74d8e106926e04747 Mon Sep 17 00:00:00 2001 From: Spencer Oliver Date: Tue, 13 Mar 2012 15:32:29 +0000 Subject: [PATCH 1/1] target: remove unused declaration arm7_9_prepare_reset_halt is long since gone and the functionality is implemented in the target's assert_reset handler. Change-Id: Ib03c730cb39d68e5e3bb42f92af13daf8074e4e2 Signed-off-by: Spencer Oliver Reviewed-on: http://openocd.zylin.com/515 Tested-by: jenkins Reviewed-by: Peter Stuge --- src/target/arm7_9_common.h | 1 - src/target/cortex_m.c | 2 +- src/target/mips_m4k.c | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/target/arm7_9_common.h b/src/target/arm7_9_common.h index 6f1b51f919..0e706a75a2 100644 --- a/src/target/arm7_9_common.h +++ b/src/target/arm7_9_common.h @@ -141,7 +141,6 @@ int arm7_9_deassert_reset(struct target *target); int arm7_9_reset_request_halt(struct target *target); int arm7_9_early_halt(struct target *target); int arm7_9_soft_reset_halt(struct target *target); -int arm7_9_prepare_reset_halt(struct target *target); int arm7_9_halt(struct target *target); int arm7_9_resume(struct target *target, int current, uint32_t address, diff --git a/src/target/cortex_m.c b/src/target/cortex_m.c index 625065c579..5ab120f272 100644 --- a/src/target/cortex_m.c +++ b/src/target/cortex_m.c @@ -609,7 +609,7 @@ static int cortex_m3_halt(struct target *target) return ERROR_TARGET_FAILURE; } else { /* we came here in a reset_halt or reset_init sequence - * debug entry was already prepared in cortex_m3_prepare_reset_halt() + * debug entry was already prepared in cortex_m3_assert_reset() */ target->debug_reason = DBG_REASON_DBGRQ; diff --git a/src/target/mips_m4k.c b/src/target/mips_m4k.c index aa9dbe7ad2..623d55e0d8 100644 --- a/src/target/mips_m4k.c +++ b/src/target/mips_m4k.c @@ -191,7 +191,7 @@ static int mips_m4k_halt(struct target *target) return ERROR_TARGET_FAILURE; } else { /* we came here in a reset_halt or reset_init sequence - * debug entry was already prepared in mips32_prepare_reset_halt() + * debug entry was already prepared in mips_m4k_assert_reset() */ target->debug_reason = DBG_REASON_DBGRQ; -- 2.30.2