interesting
/
riscv-openocd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

target: use consistent halt timeout 

On slow targets we sometimes get false messages about timeouts due to poll
using 1sec rather than the default 5sec timeout.

Change-Id: Icc81c78e0ca86cebf9eeb2f5307cf7a82f1f4ee8
Signed-off-by: Spencer Oliver <spen@spen-soft.co.uk>
Reviewed-on: http://openocd.zylin.com/1466
Tested-by: jenkins
This commit is contained in:
Spencer Oliver 2013-06-28 23:32:59 +01:00
parent ab90b87778
commit 8faa419fad
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/target/target.c
View File

@ -56,6 +56,9 @@
#include "image.h" #include "image.h"
#include "rtos/rtos.h" #include "rtos/rtos.h"
/* default halt wait timeout (ms) */
#define DEFAULT_HALT_TIMEOUT 5000
static int target_read_buffer_default(struct target *target, uint32_t address, static int target_read_buffer_default(struct target *target, uint32_t address,
uint32_t size, uint8_t *buffer); uint32_t size, uint8_t *buffer);
static int target_write_buffer_default(struct target *target, uint32_t address, static int target_write_buffer_default(struct target *target, uint32_t address,
@ -456,7 +459,7 @@ int target_poll(struct target *target)
target->halt_issued = false; target->halt_issued = false;
else { else {
long long t = timeval_ms() - target->halt_issued_time; long long t = timeval_ms() - target->halt_issued_time;
if (t > 1000) { if (t > DEFAULT_HALT_TIMEOUT) {
target->halt_issued = false; target->halt_issued = false;
LOG_INFO("Halt timed out, wake up GDB."); LOG_INFO("Halt timed out, wake up GDB.");
target_call_event_callbacks(target, TARGET_EVENT_GDB_HALT); target_call_event_callbacks(target, TARGET_EVENT_GDB_HALT);
@ -2409,7 +2412,7 @@ COMMAND_HANDLER(handle_wait_halt_command)
if (CMD_ARGC > 1) if (CMD_ARGC > 1)
return ERROR_COMMAND_SYNTAX_ERROR; return ERROR_COMMAND_SYNTAX_ERROR;
unsigned ms = 5000; unsigned ms = DEFAULT_HALT_TIMEOUT;
if (1 == CMD_ARGC) { if (1 == CMD_ARGC) {
int retval = parse_uint(CMD_ARGV[0], &ms); int retval = parse_uint(CMD_ARGV[0], &ms);
if (ERROR_OK != retval) if (ERROR_OK != retval)