X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fxsvf%2Fxsvf.c;h=539fbdc6688365a0a1373b2f093550ba2a3f9aaf;hp=9af9767e7158c597370c3ba3cbcda509b1e14609;hb=ff5deeeeaa4f394931e3c5ccfb4cfd33beda0743;hpb=2861877b32a7a2f4022a1c3d9b66c9b4879878ac

diff --git a/src/xsvf/xsvf.c b/src/xsvf/xsvf.c
index 9af9767e71..539fbdc668 100644
--- a/src/xsvf/xsvf.c
+++ b/src/xsvf/xsvf.c
@@ -41,8 +41,8 @@
 #endif
 
 #include "xsvf.h"
-#include "jtag.h"
-#include "svf.h"
+#include <jtag/jtag.h>
+#include <svf/svf.h>
 
 
 /* XSVF commands, from appendix B of xapp503.pdf  */
@@ -1050,13 +1050,23 @@ COMMAND_HANDLER(handle_xsvf_command)
 	return ERROR_OK;
 }
 
+static const struct command_registration xsvf_command_handlers[] = {
+	{
+		.name = "xsvf",
+		.handler = handle_xsvf_command,
+		.mode = COMMAND_EXEC,
+		.help = "Runs a XSVF file.  If 'virt2' is given, xruntest "
+			"counts are interpreted as TCK cycles rather than "
+			"as microseconds.  Without the 'quiet' option, all "
+			"comments, retries, and mismatches will be reported.",
+		.usage = "(tapname|'plain') filename ['virt2'] ['quiet']",
+	},
+	COMMAND_REGISTRATION_DONE
+};
+
 int xsvf_register_commands(struct command_context *cmd_ctx)
 {
-	register_command(cmd_ctx, NULL, "xsvf",
-			&handle_xsvf_command, COMMAND_EXEC,
-			"run xsvf <file> [virt2] [quiet]");
-
-	return ERROR_OK;
+	return register_commands(cmd_ctx, NULL, xsvf_command_handlers);
 }
 
 #if 0   /* this comment style used to try and keep uncrustify from adding * at begin of line */