From e0c0810a8e62af36108cd5ac18b3f64952a7ef71 Mon Sep 17 00:00:00 2001 From: rodrigo_l_rosa Date: Tue, 4 Oct 2011 18:17:25 -0700 Subject: [PATCH] dsp5680xx - fix jtag debug request failure handling MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit if JTAG debug request fails then halting with a reset should be attempted. the failure was ignored previously. Change-Id: Ibec08e2e97f962d164a110c21aaa80bfc17b7f1a Signed-off-by: Rodrigo L. Rosa Reviewed-on: http://openocd.zylin.com/221 Tested-by: jenkins Reviewed-by: Øyvind Harboe --- src/target/dsp5680xx.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/target/dsp5680xx.c b/src/target/dsp5680xx.c index 9c1856ae..cca34bcd 100644 --- a/src/target/dsp5680xx.c +++ b/src/target/dsp5680xx.c @@ -548,10 +548,12 @@ static int eonce_enter_debug_mode_without_reset(struct target * target, uint16_t err_check_propagate(retval); retval = dsp5680xx_irscan(target, & instr, & ir_out,DSP5680XX_JTAG_CORE_TAP_IRLEN); err_check_propagate(retval); - if ((ir_out&JTAG_STATUS_MASK) == JTAG_STATUS_DEBUG) - target->state = TARGET_HALTED; - else - retval = ERROR_FAIL; +if ((ir_out&JTAG_STATUS_MASK) == JTAG_STATUS_DEBUG) + target->state = TARGET_HALTED; +else{ + retval = ERROR_FAIL; + err_check_propagate(retval); +} // Verify that debug mode is enabled uint16_t data_read_from_dr; retval = eonce_read_status_reg(target, &data_read_from_dr); -- 2.39.5