{,x}svf: use register_commands()

Use register_commands() for registering {,x}svf commands.

diff --git a/src/svf/svf.c b/src/svf/svf.c
index 1fc38354db13be470ad750845d92b2880279c082..e01b9332c4d2ae2612a1a944bc51b8e0abc9d24b 100644 (file)
--- a/src/svf/svf.c
+++ b/src/svf/svf.c
@@ -1460,11 +1460,18 @@ static int svf_run_command(struct command_context *cmd_ctx, char *cmd_str)
        return ERROR_OK;
 }
 
+static const struct command_registration svf_command_handlers[] = {
+       {
+               .name = "svf",
+               .handler = &handle_svf_command,
+               .mode = COMMAND_EXEC,
+               .help = "Runs a SVF file.",
+               .usage = "<file>",
+       },
+       COMMAND_REGISTRATION_DONE
+};
+
 int svf_register_commands(struct command_context *cmd_ctx)
 {
-       COMMAND_REGISTER(cmd_ctx, NULL, "svf",
-                       &handle_svf_command, COMMAND_EXEC,
-                       "run svf <file>");
-
-       return ERROR_OK;
+       return register_commands(cmd_ctx, NULL, svf_command_handlers);
 }

diff --git a/src/xsvf/xsvf.c b/src/xsvf/xsvf.c
index 82ddb84b992a19a57de62b49921f4426296129db..f5c89d441bf14edefae70e47838f30413563b0a5 100644 (file)
--- a/src/xsvf/xsvf.c
+++ b/src/xsvf/xsvf.c
@@ -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 = "<file> [virt2] [quiet]",
+       },
+       COMMAND_REGISTRATION_DONE
+};
+
 int xsvf_register_commands(struct command_context *cmd_ctx)
 {
-       COMMAND_REGISTER(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 */