X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fsvf%2Fsvf.c;h=54fc7d1399cb318b2d9752ac0bdf22ffe18ca1a8;hp=e7e815c1046513e8a9f003477a28f7dfb89c7923;hb=9b29cb58acbd14ed831d68fce4d6e6a1728f8caf;hpb=f19ac83152b54a204b8148815a538d868973e1e1

diff --git a/src/svf/svf.c b/src/svf/svf.c
index e7e815c104..54fc7d1399 100644
--- a/src/svf/svf.c
+++ b/src/svf/svf.c
@@ -382,7 +382,7 @@ COMMAND_HANDLER(handle_svf_command)
 		if (strcmp(CMD_ARGV[i], "-tap") == 0) {
 			tap = jtag_tap_by_string(CMD_ARGV[i+1]);
 			if (!tap) {
-				command_print(CMD_CTX, "Tap: %s unknown", CMD_ARGV[i+1]);
+				command_print(CMD, "Tap: %s unknown", CMD_ARGV[i+1]);
 				return ERROR_FAIL;
 			}
 			i++;
@@ -401,7 +401,7 @@ COMMAND_HANDLER(handle_svf_command)
 			svf_fd = fopen(CMD_ARGV[i], "r");
 			if (svf_fd == NULL) {
 				int err = errno;
-				command_print(CMD_CTX, "open(\"%s\"): %s", CMD_ARGV[i], strerror(err));
+				command_print(CMD, "open(\"%s\"): %s", CMD_ARGV[i], strerror(err));
 				/* no need to free anything now */
 				return ERROR_COMMAND_SYNTAX_ERROR;
 			} else
@@ -534,7 +534,7 @@ COMMAND_HANDLER(handle_svf_command)
 	time_measure_m = time_measure_s / 60;
 	time_measure_s %= 60;
 	if (time_measure_ms < 1000)
-		command_print(CMD_CTX,
+		command_print(CMD,
 			"\r\nTime used: %dm%ds%" PRId64 "ms ",
 			time_measure_m,
 			time_measure_s,
@@ -579,13 +579,13 @@ free_all:
 	svf_free_xxd_para(&svf_para.sir_para);
 
 	if (ERROR_OK == ret)
-		command_print(CMD_CTX,
+		command_print(CMD,
 			      "svf file programmed %s for %d commands with %d errors",
 			      (svf_ignore_error > 1) ? "unsuccessfully" : "successfully",
 			      command_num,
 			      (svf_ignore_error > 1) ? (svf_ignore_error - 1) : 0);
 	else
-		command_print(CMD_CTX, "svf file programmed failed");
+		command_print(CMD, "svf file programmed failed");
 
 	svf_ignore_error = 0;
 	return ret;
@@ -661,11 +661,13 @@ static int svf_read_command_from_file(FILE *fd)
 				if (svf_getline(&svf_read_line, &svf_read_line_size, svf_fd) <= 0)
 					return ERROR_FAIL;
 				i = -1;
+				/* fallthrough */
 			case '\r':
 				slash = 0;
 				/* Don't save '\r' and '\n' if no data is parsed */
 				if (!cmd_pos)
 					break;
+				/* fallthrough */
 			default:
 				/* The parsing code currently expects a space
 				 * before parentheses -- "TDI (123)".  Also a
@@ -739,6 +741,9 @@ parse_char:
 		pos++;
 	}
 
+	if (num == 0)
+		return ERROR_FAIL;
+
 	*num_of_argu = num;
 
 	return ERROR_OK;
@@ -985,7 +990,7 @@ static int svf_run_command(struct command_context *cmd_ctx, char *cmd_str)
 				/* TODO: set jtag speed to */
 				if (svf_para.frequency > 0) {
 					command_run_linef(cmd_ctx,
-							"adapter_khz %d",
+							"adapter speed %d",
 							(int)svf_para.frequency / 1000);
 					LOG_DEBUG("\tfrequency = %f", svf_para.frequency);
 				}
@@ -1305,13 +1310,12 @@ XXR_common:
 		case PIOMAP:
 			LOG_ERROR("PIO and PIOMAP are not supported");
 			return ERROR_FAIL;
-			break;
 		case RUNTEST:
 			/* RUNTEST [run_state] run_count run_clk [min_time SEC [MAXIMUM max_time
 			 * SEC]] [ENDSTATE end_state] */
 			/* RUNTEST [run_state] min_time SEC [MAXIMUM max_time SEC] [ENDSTATE
 			 * end_state] */
-			if ((num_of_argu < 3) && (num_of_argu > 11)) {
+			if ((num_of_argu < 3) || (num_of_argu > 11)) {
 				LOG_ERROR("invalid parameter of %s", argus[0]);
 				return ERROR_FAIL;
 			}
@@ -1527,7 +1531,6 @@ XXR_common:
 		default:
 			LOG_ERROR("invalid svf command: %s", argus[0]);
 			return ERROR_FAIL;
-			break;
 	}
 
 	if (!svf_quiet) {