From c120fb6d893a89d9805d0b4d6083e47810143f2d Mon Sep 17 00:00:00 2001 From: Paul Fertser Date: Sun, 2 Nov 2014 15:03:16 +0300 Subject: [PATCH] target: improve robustness of polling and reexamination When a target was present on OpenOCD start but later disappeared for whatever reason (typically unstable connection or target going to sleep) and reappeared only for a brief period of time, reexamination would fail, and poll would no longer run. This patch fixes it. Change-Id: I61f9b5a3f366a761320e233f4e1689f926b5556d Signed-off-by: Paul Fertser Reviewed-on: http://openocd.zylin.com/2370 Reviewed-by: Andreas Fritiofson Tested-by: jenkins --- src/target/target.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/target/target.c b/src/target/target.c index d7a2c4815d..b74c6a0cc9 100644 --- a/src/target/target.c +++ b/src/target/target.c @@ -2425,7 +2425,13 @@ static int handle_target(void *priv) if (target->backoff.times > 0) { LOG_USER("Polling target %s succeeded again, trying to reexamine", target_name(target)); target_reset_examined(target); - target_examine_one(target); + retval = target_examine_one(target); + /* Target examination could have failed due to unstable connection, + * but we set the examined flag anyway to repoll it later */ + if (retval != ERROR_OK) { + target->examined = true; + return retval; + } } target->backoff.times = 0; -- 2.30.2