X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fjtag%2Ftcl.c;h=11687b9c1a88867951e4bf4ecb43ee25b75a4f53;hp=b95bf75665c26f538e91ef424b3289c2ca7fdaac;hb=bd0409aa938875ea5a8d8235f8996116be171b69;hpb=85830c32bfa3159cf05ba7619bf32c1c43db7f2e

diff --git a/src/jtag/tcl.c b/src/jtag/tcl.c
index b95bf75665..11687b9c1a 100644
--- a/src/jtag/tcl.c
+++ b/src/jtag/tcl.c
@@ -59,8 +59,6 @@ static const Jim_Nvp nvp_jtag_tap_event[] = {
 	{ .name = NULL, .value = -1 }
 };
 
-extern struct jtag_interface *jtag_interface;
-
 struct jtag_tap *jtag_tap_by_jim_obj(Jim_Interp *interp, Jim_Obj *o)
 {
 	const char *cp = Jim_GetString(o, NULL);
@@ -171,7 +169,10 @@ static int Jim_Command_drscan(Jim_Interp *interp, int argc, Jim_Obj *const *args
 		return JIM_ERR;
 
 	num_fields = (argc-2)/2;
-	assert(num_fields > 0);
+	if (num_fields <= 0) {
+		Jim_SetResultString(interp, "drscan: no scan fields supplied", -1);
+		return JIM_ERR;
+	}
 	fields = malloc(sizeof(struct scan_field) * num_fields);
 	for (i = 2; i < argc; i += 2) {
 		long bits;
@@ -552,8 +553,16 @@ 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 */
+		pTap->enabled = true;
+		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;
@@ -563,7 +572,7 @@ static int jim_newtap_cmd(Jim_GetOptInfo *goi)
 		e = Jim_GetOpt_Nvp(goi, opts, &n);
 		if (e != JIM_OK) {
 			Jim_GetOpt_NvpUnknown(goi, opts, 0);
-			free((void *)pTap->dotted_name);
+			free(cp);
 			free(pTap);
 			return e;
 		}
@@ -578,7 +587,7 @@ static int jim_newtap_cmd(Jim_GetOptInfo *goi)
 		    case NTAP_OPT_EXPECTED_ID:
 			    e = jim_newtap_expected_id(n, goi, pTap);
 			    if (JIM_OK != e) {
-				    free((void *)pTap->dotted_name);
+				    free(cp);
 				    free(pTap);
 				    return e;
 			    }
@@ -588,7 +597,7 @@ static int jim_newtap_cmd(Jim_GetOptInfo *goi)
 		    case NTAP_OPT_IRCAPTURE:
 			    e = jim_newtap_ir_param(n, goi, pTap);
 			    if (JIM_OK != e) {
-				    free((void *)pTap->dotted_name);
+				    free(cp);
 				    free(pTap);
 				    return e;
 			    }
@@ -1133,14 +1142,14 @@ COMMAND_HANDLER(handle_irscan_command)
 		}
 		int field_size = tap->ir_length;
 		fields[i].num_bits = field_size;
-		fields[i].out_value = malloc(DIV_ROUND_UP(field_size, 8));
+		uint8_t *v = malloc(DIV_ROUND_UP(field_size, 8));
 
 		uint64_t value;
 		retval = parse_u64(CMD_ARGV[i * 2 + 1], &value);
 		if (ERROR_OK != retval)
 			goto error_return;
-		void *v = (void *)fields[i].out_value;
 		buf_set_u64(v, 0, field_size, value);
+		fields[i].out_value = v;
 		fields[i].in_value = NULL;
 	}