Commit 75ba7397 authored by oharboe's avatar oharboe
Browse files

wait up to 1 second for halted state upon reset init/halt.

git-svn-id: svn://svn.berlios.de/openocd/trunk@884 b42882b7-edfa-0310-969c-e2dbd0fdcd60
parent 5021560c
......@@ -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;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment