X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fsvf%2Fsvf.c;h=e6d842b7a5edb2175837f3c5454b95a65b172d73;hb=822c06d9e3983b37cd1830c594210973cb560991;hp=c51e60905ef4384d3c33eb357467e91799c9bbef;hpb=7bf1a86e473a12882bf6f71cb4d0d416394b69d4;p=openocd.git

diff --git a/src/svf/svf.c b/src/svf/svf.c
index c51e60905e..e6d842b7a5 100644
--- a/src/svf/svf.c
+++ b/src/svf/svf.c
@@ -31,9 +31,9 @@
 #include "config.h"
 #endif
 
-#include "jtag.h"
+#include <jtag/jtag.h>
 #include "svf.h"
-#include "time_support.h"
+#include <helper/time_support.h>
 
 
 // SVF command
@@ -310,7 +310,7 @@ COMMAND_HANDLER(handle_svf_command)
 
 	if ((CMD_ARGC < 1) || (CMD_ARGC > (1 + SVF_NUM_OF_OPTIONS)))
 	{
-		command_print(cmd_ctx, "usage: svf <file> [quiet]");
+		command_print(CMD_CTX, "usage: svf <file> [quiet]");
 		return ERROR_FAIL;
 	}
 
@@ -318,28 +318,28 @@ COMMAND_HANDLER(handle_svf_command)
 	svf_quiet = 0;
 	for (unsigned i = 1; i < CMD_ARGC; i++)
 	{
-		if (!strcmp(args[i], "quiet"))
+		if (!strcmp(CMD_ARGV[i], "quiet"))
 		{
 			svf_quiet = 1;
 		}
 		else
 		{
-			LOG_ERROR("unknown variant for svf: %s", args[i]);
+			LOG_ERROR("unknown variant for svf: %s", CMD_ARGV[i]);
 
 			// no need to free anything now
 			return ERROR_FAIL;
 		}
 	}
 
-	if ((svf_fd = open(args[0], O_RDONLY)) < 0)
+	if ((svf_fd = open(CMD_ARGV[0], O_RDONLY)) < 0)
 	{
-		command_print(cmd_ctx, "file \"%s\" not found", args[0]);
+		command_print(CMD_CTX, "file \"%s\" not found", CMD_ARGV[0]);
 
 		// no need to free anything now
 		return ERROR_FAIL;
 	}
 
-	LOG_USER("svf processing file: \"%s\"", args[0]);
+	LOG_USER("svf processing file: \"%s\"", CMD_ARGV[0]);
 
 	// get time
 	time_ago = timeval_ms();
@@ -392,7 +392,7 @@ COMMAND_HANDLER(handle_svf_command)
 
 	while (ERROR_OK == svf_read_command_from_file(svf_fd))
 	{
-		if (ERROR_OK != svf_run_command(cmd_ctx, svf_command_buffer))
+		if (ERROR_OK != svf_run_command(CMD_CTX, svf_command_buffer))
 		{
 			LOG_ERROR("fail to run command at line %d", svf_line_number);
 			ret = ERROR_FAIL;
@@ -410,7 +410,7 @@ COMMAND_HANDLER(handle_svf_command)
 	}
 
 	// print time
-	command_print(cmd_ctx, "%lld ms used", timeval_ms() - time_ago);
+	command_print(CMD_CTX, "%lld ms used", timeval_ms() - time_ago);
 
 free_all:
 
@@ -457,11 +457,11 @@ free_all:
 
 	if (ERROR_OK == ret)
 	{
-		command_print(cmd_ctx, "svf file programmed successfully for %d commands", command_num);
+		command_print(CMD_CTX, "svf file programmed successfully for %d commands", command_num);
 	}
 	else
 	{
-		command_print(cmd_ctx, "svf file programmed failed");
+		command_print(CMD_CTX, "svf file programmed failed");
 	}
 
 	return ret;
@@ -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)
 {
-	register_command(cmd_ctx, NULL, "svf",
-			&handle_svf_command, COMMAND_EXEC,
-			"run svf <file>");
-
-	return ERROR_OK;
+	return register_commands(cmd_ctx, NULL, svf_command_handlers);
 }