halting srst_pulls_trst targets is now snappier and has explicit warning.

git-svn-id: svn://svn.berlios.de/openocd/trunk@889 b42882b7-edfa-0310-969c-e2dbd0fdcd60
__archive__
oharboe 2008-08-05 10:50:10 +00:00
parent 1829361253
commit 20f505f695
1 changed files with 12 additions and 0 deletions

View File

@ -835,9 +835,21 @@ int arm7_9_deassert_reset(target_t *target)
if ((jtag_reset_config & RESET_SRST_PULLS_TRST)!=0) if ((jtag_reset_config & RESET_SRST_PULLS_TRST)!=0)
{ {
LOG_WARNING("srst pulls trst - can not reset into halted mode. Issuing halt after reset.");
/* set up embedded ice registers again */ /* set up embedded ice registers again */
if ((retval=target->type->examine(target))!=ERROR_OK) if ((retval=target->type->examine(target))!=ERROR_OK)
return retval; return retval;
if ((retval=target_poll(target))!=ERROR_OK)
{
return retval;
}
if ((retval=target_halt(target))!=ERROR_OK)
{
return retval;
}
} }
return retval; return retval;
} }