summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/target/target.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/target/target.c b/src/target/target.c
index c2fce59d..02016e77 100644
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -335,11 +335,15 @@ int target_process_reset(struct command_context_s *cmd_ctx, enum target_reset_mo
{
target->type->deassert_reset(target);
/* We can fail to bring the target into the halted state */
- target_poll(target);
- if (target->reset_halt&&((target->state != TARGET_HALTED)))
+ if (target->reset_halt)
{
- LOG_WARNING("Failed to reset target into halted mode - issuing halt");
- target->type->halt(target);
+ /* wait up to 1 second for halt. */
+ target_wait_state(target, TARGET_HALTED, 1000);
+ if (target->state != TARGET_HALTED)
+ {
+ LOG_WARNING("Failed to reset target into halted mode - issuing halt");
+ target->type->halt(target);
+ }
}
target = target->next;