X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fxsvf%2Fxsvf.c;h=1fe0b867020ce5a6e2def987f9ba4f85cab6bb33;hp=3fe2c0fd5317ba0393ec478904daaf573827a361;hb=23402315ce01071f30d7ec0c5ca7563ce41f1cc6;hpb=98723c4ecdbe06f90c66f3abec27b792c3b38e34

diff --git a/src/xsvf/xsvf.c b/src/xsvf/xsvf.c
index 3fe2c0fd53..1fe0b86702 100644
--- a/src/xsvf/xsvf.c
+++ b/src/xsvf/xsvf.c
@@ -219,21 +219,21 @@ COMMAND_HANDLER(handle_xsvf_command)
 	*/
 	struct jtag_tap *tap = NULL;
 
-	if (argc < 2)
+	if (CMD_ARGC < 2)
 	{
 		command_print(cmd_ctx, "usage: xsvf <device#|plain> <file> [<variant>] [quiet]");
 		return ERROR_FAIL;
 	}
 
-	/* we mess with args starting point below, snapshot filename here */
-	const char *filename = args[1];
+	/* we mess with CMD_ARGV starting point below, snapshot filename here */
+	const char *filename = CMD_ARGV[1];
 
-	if (strcmp(args[0], "plain") != 0)
+	if (strcmp(CMD_ARGV[0], "plain") != 0)
 	{
-		tap = jtag_tap_by_string(args[0]);
+		tap = jtag_tap_by_string(CMD_ARGV[0]);
 		if (!tap)
 		{
-			command_print(cmd_ctx, "Tap: %s unknown", args[0]);
+			command_print(cmd_ctx, "Tap: %s unknown", CMD_ARGV[0]);
 			return ERROR_FAIL;
 		}
 	}
@@ -245,14 +245,14 @@ COMMAND_HANDLER(handle_xsvf_command)
 	}
 
 	/* if this argument is present, then interpret xruntest counts as TCK cycles rather than as usecs */
-	if ((argc > 2) && (strcmp(args[2], "virt2") == 0))
+	if ((CMD_ARGC > 2) && (strcmp(CMD_ARGV[2], "virt2") == 0))
 	{
 		runtest_requires_tck = 1;
-		--argc;
-		++args;
+		--CMD_ARGC;
+		++CMD_ARGV;
 	}
 
-	if ((argc > 2) && (strcmp(args[2], "quiet") == 0))
+	if ((CMD_ARGC > 2) && (strcmp(CMD_ARGV[2], "quiet") == 0))
 	{
 		verbose = 0;
 	}
@@ -470,7 +470,7 @@ COMMAND_HANDLER(handle_xsvf_command)
 							TAP_IDLE,
 						};
 
-						jtag_add_pathmove(DIM(exception_path), exception_path);
+						jtag_add_pathmove(ARRAY_SIZE(exception_path), exception_path);
 
 						if (verbose)
 							LOG_USER("%s mismatch, xsdrsize=%d retry=%d", op_name, xsdrsize, attempt);
@@ -479,7 +479,7 @@ COMMAND_HANDLER(handle_xsvf_command)
 					field.tap = tap;
 					field.num_bits = xsdrsize;
 					field.out_value = dr_out_buf;
-					field.in_value = calloc(CEIL(field.num_bits, 8), 1);
+					field.in_value = calloc(DIV_ROUND_UP(field.num_bits, 8), 1);
 
 					if (tap == NULL)
 						jtag_add_plain_dr_scan(1, &field, jtag_set_end_state(TAP_DRPAUSE));
@@ -933,7 +933,7 @@ COMMAND_HANDLER(handle_xsvf_command)
 					field.tap = tap;
 					field.num_bits = xsdrsize;
 					field.out_value = dr_out_buf;
-					field.in_value = calloc(CEIL(field.num_bits, 8), 1);
+					field.in_value = calloc(DIV_ROUND_UP(field.num_bits, 8), 1);
 
 					if (attempt > 0 && verbose)
 						LOG_USER("LSDR retry %d", attempt);