Commit a6a65f17 authored by ntfreak's avatar ntfreak
Browse files

- only check normal resume, not debug resume

git-svn-id: svn://svn.berlios.de/openocd/trunk@777 b42882b7-edfa-0310-969c-e2dbd0fdcd60
parent 07713185
...@@ -267,8 +267,6 @@ int target_resume(struct target_s *target, int current, u32 address, int handle_ ...@@ -267,8 +267,6 @@ int target_resume(struct target_s *target, int current, u32 address, int handle_
int retval; int retval;
int timeout_ms = 5000; int timeout_ms = 5000;
enum target_state resume_state = debug_execution ? TARGET_DEBUG_RUNNING : TARGET_RUNNING;
/* We can't poll until after examine */ /* We can't poll until after examine */
if (!target->type->examined) if (!target->type->examined)
{ {
...@@ -279,17 +277,21 @@ int target_resume(struct target_s *target, int current, u32 address, int handle_ ...@@ -279,17 +277,21 @@ 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) if ((retval = target->type->resume(target, current, address, handle_breakpoints, debug_execution)) != ERROR_OK)
return retval; return retval;
/* wait for target to exit halted mode */ /* only check for resume event if normal resume */
target_poll(target); if (!debug_execution)
while (target->state != resume_state)
{ {
usleep(10000); /* wait for target to exit halted mode - not debug resume*/
target_poll(target); target_poll(target);
if ((timeout_ms -= 10) <= 0)
while (target->state != TARGET_RUNNING)
{ {
LOG_ERROR("timeout waiting for target resume"); usleep(10000);
return ERROR_TARGET_TIMEOUT; target_poll(target);
if ((timeout_ms -= 10) <= 0)
{
LOG_ERROR("timeout waiting for target resume");
return ERROR_TARGET_TIMEOUT;
}
} }
} }
......
...@@ -18,7 +18,7 @@ jtag_device 4 0x1 0xf 0xe ...@@ -18,7 +18,7 @@ jtag_device 4 0x1 0xf 0xe
# this will be fixed in later revisions of silicon # this will be fixed in later revisions of silicon
target cortex_m3 little reset_halt 0 lm3s target cortex_m3 little reset_halt 0 lm3s
# 2k working area at base of ram # 8k working area at base of ram
working_area 0 0x20000000 0x2000 nobackup working_area 0 0x20000000 0x2000 nobackup
#flash configuration #flash configuration
......
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