X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fxsvf%2Fxsvf.c;h=01a941163b05852e69cfbc9d1b33447708c85ab0;hb=dc1685ca25567fe75c8d50c825fb0303fbb66fac;hp=c6daf5fddfb5fd8e1911645840d0ed214be13dde;hpb=d0809ac060b35a04e7f0bceb96e1868663bd18df;p=openocd.git

diff --git a/src/xsvf/xsvf.c b/src/xsvf/xsvf.c
index c6daf5fddf..01a941163b 100644
--- a/src/xsvf/xsvf.c
+++ b/src/xsvf/xsvf.c
@@ -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);
@@ -1050,7 +1050,7 @@ COMMAND_HANDLER(handle_xsvf_command)
 	return ERROR_OK;
 }
 
-int xsvf_register_commands(struct command_context_s *cmd_ctx)
+int xsvf_register_commands(struct command_context *cmd_ctx)
 {
 	register_command(cmd_ctx, NULL, "xsvf",
 			&handle_xsvf_command, COMMAND_EXEC,