- reverted resume_target to old behaviour
git-svn-id: svn://svn.berlios.de/openocd/trunk@817 b42882b7-edfa-0310-969c-e2dbd0fdcd60__archive__
parent
a5914d0152
commit
6af107855d
|
@ -264,7 +264,6 @@ int target_halt(struct target_s *target)
|
|||
int target_resume(struct target_s *target, int current, u32 address, int handle_breakpoints, int debug_execution)
|
||||
{
|
||||
int retval;
|
||||
int timeout_ms = 5000;
|
||||
|
||||
/* We can't poll until after examine */
|
||||
if (!target->type->examined)
|
||||
|
@ -276,24 +275,6 @@ int target_resume(struct target_s *target, int current, u32 address, int handle_
|
|||
if ((retval = target->type->resume(target, current, address, handle_breakpoints, debug_execution)) != ERROR_OK)
|
||||
return retval;
|
||||
|
||||
/* only check for resume event if normal resume */
|
||||
if (!debug_execution)
|
||||
{
|
||||
/* wait for target to exit halted mode - not debug resume*/
|
||||
target_poll(target);
|
||||
|
||||
while (target->state != TARGET_RUNNING)
|
||||
{
|
||||
usleep(10000);
|
||||
target_poll(target);
|
||||
if ((timeout_ms -= 10) <= 0)
|
||||
{
|
||||
LOG_ERROR("timeout waiting for target resume");
|
||||
return ERROR_TARGET_TIMEOUT;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return retval;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue