Relax polling check if not in JTAG mode

Polling was disabled based on global variables jtag_trst and jtag_srst
which were never touched in non-JTAG mode. Modify the check and remove
the ugly workaround to avoid calls to a possibly uninitialized JTAG
subsystem.

Change-Id: I3b18c81e0fba7aaf35afe6f08c3fe8fa6f8443fd
Signed-off-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
Reviewed-on: http://openocd.zylin.com/2143
Tested-by: jenkins
Reviewed-by: Paul Fertser <fercerpav@gmail.com>

diff --git a/src/jtag/core.c b/src/jtag/core.c
index 24f6a511d7a0f5f8911b2d06f91f98008ea7edc4..f82b05e1e36a4890109964dfddd8489ef75237b4 100644 (file)
--- a/src/jtag/core.c
+++ b/src/jtag/core.c
@@ -166,6 +166,9 @@ bool is_jtag_poll_safe(void)
         * It is also implicitly disabled while TRST is active and
         * while SRST is gating the JTAG clock.
         */
         * It is also implicitly disabled while TRST is active and
         * while SRST is gating the JTAG clock.
         */

+       if (!transport_is_jtag())
+               return jtag_poll;
+

        if (!jtag_poll || jtag_trst != 0)
                return false;
        return jtag_srst == 0 || (jtag_reset_config & RESET_SRST_NO_GATING);
        if (!jtag_poll || jtag_trst != 0)
                return false;
        return jtag_srst == 0 || (jtag_reset_config & RESET_SRST_NO_GATING);

diff --git a/src/target/adi_v5_swd.c b/src/target/adi_v5_swd.c
index f08b0be0e8b3fe0b0c82d5858c1d51d3b4a854a0..f8d3650edb6894e42795f90f666a4e4384ece0f4 100644 (file)
--- a/src/target/adi_v5_swd.c
+++ b/src/target/adi_v5_swd.c
@@ -429,9 +429,6 @@ static int swd_init(struct command_context *ctx)
        if (status == ERROR_OK)
                LOG_INFO("SWD IDCODE %#8.8" PRIx32, idcode);
 
        if (status == ERROR_OK)
                LOG_INFO("SWD IDCODE %#8.8" PRIx32, idcode);
 

-       /* this is a workaround to get polling working */
-       jtag_add_reset(0, 0);
-

        return status;
 }
 
        return status;
 }