X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fhello.c;h=8cd5fabb47c4a50f1161503befd9c2baed0a54d1;hp=8c97a401e85f34ef5025bf314f0934f5c7430998;hb=ae710059291ba9830a9b20d899bdef6a5122dd73;hpb=833e7f5248778bcb31b4db1a1b91160995415203

diff --git a/src/hello.c b/src/hello.c
index 8c97a401e8..8cd5fabb47 100644
--- a/src/hello.c
+++ b/src/hello.c
@@ -20,7 +20,7 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include "log.h"
+#include <helper/log.h>
 
 COMMAND_HANDLER(handle_foo_command)
 {
@@ -53,25 +53,30 @@ COMMAND_HANDLER(handle_flag_command)
 			&foo_flag, "foo flag");
 }
 
-int foo_register_commands(struct command_context *cmd_ctx)
-{
-	// register several commands under the foo command
-	struct command *cmd = COMMAND_REGISTER(cmd_ctx, NULL, "foo",
-			NULL, COMMAND_ANY, "foo: command handler skeleton");
-
-	COMMAND_REGISTER(cmd_ctx, cmd, "bar",
-			&handle_foo_command, COMMAND_ANY,
-			"<address> [enable|disable] - an example command");
-	COMMAND_REGISTER(cmd_ctx, cmd, "baz",
-			&handle_foo_command, COMMAND_ANY,
-			"<address> [enable|disable] - a sample command");
-
-	COMMAND_REGISTER(cmd_ctx, cmd, "flag",
-			&handle_flag_command, COMMAND_ANY,
-			"[on|off] - set a flag");
-
-	return ERROR_OK;
-}
+static const struct command_registration foo_command_handlers[] = {
+	{
+		.name = "bar",
+		.handler = &handle_foo_command,
+		.mode = COMMAND_ANY,
+		.usage = "address ['enable'|'disable']",
+		.help = "an example command",
+	},
+	{
+		.name = "baz",
+		.handler = &handle_foo_command,
+		.mode = COMMAND_ANY,
+		.usage = "address ['enable'|'disable']",
+		.help = "a sample command",
+	},
+	{
+		.name = "flag",
+		.handler = &handle_flag_command,
+		.mode = COMMAND_ANY,
+		.usage = "[on|off]",
+		.help = "set a flag",
+	},
+	COMMAND_REGISTRATION_DONE
+};
 
 static COMMAND_HELPER(handle_hello_args, const char **sep, const char **name)
 {
@@ -99,12 +104,25 @@ COMMAND_HANDLER(handle_hello_command)
 	return retval;
 }
 
+const struct command_registration hello_command_handlers[] = {
+	{
+		.name = "hello",
+		.handler = handle_hello_command,
+		.mode = COMMAND_ANY,
+		.help = "prints a warm welcome",
+		.usage = "[name]",
+	},
+	{
+		.name = "foo",
+		.mode = COMMAND_ANY,
+		.help = "example command handler skeleton",
+
+		.chain = foo_command_handlers,
+	},
+	COMMAND_REGISTRATION_DONE
+};
+
 int hello_register_commands(struct command_context *cmd_ctx)
 {
-	foo_register_commands(cmd_ctx);
-
-	struct command *cmd = COMMAND_REGISTER(cmd_ctx, NULL, "hello",
-			&handle_hello_command, COMMAND_ANY,
-			"[<name>] - prints a warm welcome");
-	return cmd ? ERROR_OK : -ENOMEM;
+	return register_commands(cmd_ctx, NULL, hello_command_handlers);
 }