newdap: Ignore -irlen/-irmask/etc newdap params on SWD or CMSIS-DAP 26/2226/3
authorAngus Gratton <gus@projectgus.com>
Wed, 23 Jul 2014 22:14:04 +0000 (08:14 +1000)
committerAndreas Fritiofson <andreas.fritiofson@gmail.com>
Mon, 11 Aug 2014 20:49:05 +0000 (20:49 +0000)
Previously the -irlen parameter was required even though it is not
a part of the SWD or CMSIS-DAP transports.

This may eventually need to be changed for CMSIS-DAP once that
supports JTAG as well.

Change-Id: Ia02b67840c19c7cf1c7a75063648c0174176a311
Signed-off-by: Angus Gratton <gus@projectgus.com>
Reviewed-on: http://openocd.zylin.com/2226
Tested-by: jenkins
Reviewed-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
src/jtag/tcl.c

index dd2be1e..647ac70 100644 (file)
@@ -553,8 +553,15 @@ static int jim_newtap_cmd(Jim_GetOptInfo *goi)
        LOG_DEBUG("Creating New Tap, Chip: %s, Tap: %s, Dotted: %s, %d params",
                pTap->chip, pTap->tapname, pTap->dotted_name, goi->argc);
 
+       if (!transport_is_jtag()) {
+               /* SWD or CMSIS-DAP (which is currently SWD-only) doesn't
+                  require any JTAG tap parameters */
+               jtag_tap_init(pTap);
+               return JIM_OK;
+       }
+
        /* IEEE specifies that the two LSBs of an IR scan are 01, so make
-        * that the default.  The "-irlen" and "-irmask" options are only
+        * that the default.  The "-ircapture" and "-irmask" options are only
         * needed to cope with nonstandard TAPs, or to specify more bits.
         */
        pTap->ir_capture_mask = 0x03;