Commit 5728fdce authored by oharboe's avatar oharboe
Browse files

Spen spotted a bug in warning for missing srst_pulls_trst

git-svn-id: svn://svn.berlios.de/openocd/trunk@714 b42882b7-edfa-0310-969c-e2dbd0fdcd60
parent 681981cc
...@@ -702,8 +702,6 @@ int arm7_9_poll(target_t *target) ...@@ -702,8 +702,6 @@ int arm7_9_poll(target_t *target)
if ((target->state == TARGET_RUNNING) || (target->state == TARGET_RESET)) if ((target->state == TARGET_RUNNING) || (target->state == TARGET_RESET))
{ {
int check_pc=0; int check_pc=0;
target->state = TARGET_HALTED;
if (target->state == TARGET_RESET) if (target->state == TARGET_RESET)
{ {
if ((target->reset_mode == RESET_HALT) || (target->reset_mode == RESET_INIT)) if ((target->reset_mode == RESET_HALT) || (target->reset_mode == RESET_INIT))
...@@ -715,6 +713,8 @@ int arm7_9_poll(target_t *target) ...@@ -715,6 +713,8 @@ int arm7_9_poll(target_t *target)
} }
} }
target->state = TARGET_HALTED;
if ((retval = arm7_9_debug_entry(target)) != ERROR_OK) if ((retval = arm7_9_debug_entry(target)) != ERROR_OK)
return retval; return retval;
...@@ -724,7 +724,7 @@ int arm7_9_poll(target_t *target) ...@@ -724,7 +724,7 @@ int arm7_9_poll(target_t *target)
u32 t=*((u32 *)reg->value); u32 t=*((u32 *)reg->value);
if (t!=0) if (t!=0)
{ {
LOG_ERROR("PC was not 0. Does this target does target need srst_pulls_trst?"); LOG_ERROR("PC was not 0. Does this target need srst_pulls_trst?");
} }
} }
......
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