X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fjtag%2Ftcl.c;fp=src%2Fjtag%2Ftcl.c;h=647ac70c744ca87b60fd1e65bbd2f194991b8e57;hp=dd2be1e5ad3f58e06794d5440841d559704aaf16;hb=f701c0cbeb346df4cda378d3b4d5136aabba3b37;hpb=e1bc7f454568dc2cd1d89cfbe327c219ddc67dfc

diff --git a/src/jtag/tcl.c b/src/jtag/tcl.c
index dd2be1e5ad..647ac70c74 100644
--- a/src/jtag/tcl.c
+++ b/src/jtag/tcl.c
@@ -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;