From: Zachary T Welch <zw@superlucidity.net>
Date: Sat, 21 Nov 2009 04:12:21 +0000 (-0800)
Subject: jlink: use register_commands()
X-Git-Tag: v0.4.0-rc1~388
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=b1d034bf2f665cfa5633c8c6b46570d7ce6064a4;p=openocd

jlink: use register_commands()

Use register_commands() with command registration array.
---

diff --git a/src/jtag/jlink.c b/src/jtag/jlink.c
index 1ca9c390..24fb0e89 100644
--- a/src/jtag/jlink.c
+++ b/src/jtag/jlink.c
@@ -627,16 +627,26 @@ COMMAND_HANDLER(jlink_handle_jlink_hw_jtag_command)
 	return ERROR_OK;
 }
 
+static const struct command_registration jlink_command_handlers[] = {
+	{
+		.name = "jlink_info",
+		.handler = &jlink_handle_jlink_info_command,
+		.mode = COMMAND_EXEC,
+		.help = "show jlink info",
+	},
+	{
+		.name = "jlink_hw_jtag",
+		.handler = &jlink_handle_jlink_hw_jtag_command,
+		.mode = COMMAND_EXEC,
+		.help = "access J-Link HW JTAG command version",
+		.usage = "[2|3]",
+	},
+	COMMAND_REGISTRATION_DONE
+};
+
 static int jlink_register_commands(struct command_context *cmd_ctx)
 {
-
-	COMMAND_REGISTER(cmd_ctx, NULL, "jlink_info",
-		&jlink_handle_jlink_info_command, COMMAND_EXEC,
-		"query jlink info");
-	COMMAND_REGISTER(cmd_ctx, NULL, "jlink_hw_jtag",
-		&jlink_handle_jlink_hw_jtag_command, COMMAND_EXEC,
-		"set/get jlink hw jtag command version [2 | 3]");
-	return ERROR_OK;
+	return register_commands(cmd_ctx, NULL, jlink_command_handlers);
 }
 
 struct jtag_interface jlink_interface = {