dsp5680xx - fix jtag debug request failure handling

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 <rodrigorosa.lg@gmail.com>
Reviewed-on: http://openocd.zylin.com/221
Tested-by: jenkins
Reviewed-by: Øyvind Harboe <oyvindharboe@gmail.com>

diff --git a/src/target/dsp5680xx.c b/src/target/dsp5680xx.c
index 9c1856aeb77a558ae3e07368f60ce5678b77b73d..cca34bcdbc08bc6735953e8c049d72544d571593 100644 (file)
--- 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);