From: Tomas Vanek Date: Sat, 9 Jan 2016 17:56:23 +0000 (+0100) Subject: adi_v5_swd: invalidate dap->select during (re)connect X-Git-Tag: v0.10.0-rc1~274 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=fdb8c598ecd912147a08db53f2fd7bfa34b67d8a;p=openocd adi_v5_swd: invalidate dap->select during (re)connect Commit 830d0c55c0920606366a15560d1945f1e1942744 introduced a regression in error recovery after reconnect: If first SWD queue run in dap_dp_init() fails, DP_SELECT does not get reset. Change-Id: I947e2afe9933e4645a6141ece7816af8e6082cf2 Signed-off-by: Tomas Vanek Reviewed-on: http://openocd.zylin.com/3194 Tested-by: jenkins Reviewed-by: Andreas Fritiofson --- diff --git a/src/target/adi_v5_swd.c b/src/target/adi_v5_swd.c index 6990a8b9..f7a199c5 100644 --- a/src/target/adi_v5_swd.c +++ b/src/target/adi_v5_swd.c @@ -123,6 +123,8 @@ static int swd_connect(struct adiv5_dap *dap) status = swd_run_inner(dap); + dap->select = DP_SELECT_INVALID; + if (status == ERROR_OK) { LOG_INFO("SWD IDCODE %#8.8" PRIx32, idcode); dap->do_reconnect = false;