X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fhello.c;h=0cd06adc1e1be97ab8b10655beb7799ebcee8e57;hb=37cc6c495f0b5fd2257aecdbde111ddfb6d8b083;hp=6f0249487fd94ff5cffadeb831e48b08293d1727;hpb=e7fd1d3d5031a98e56503c46baa0c2f23ac7d88c;p=openocd.git

diff --git a/src/hello.c b/src/hello.c
index 6f0249487f..0cd06adc1e 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)
 {
@@ -58,33 +58,26 @@ static const struct command_registration foo_command_handlers[] = {
 		.name = "bar",
 		.handler = &handle_foo_command,
 		.mode = COMMAND_ANY,
-		.help = "<address> [enable|disable] - an example command",
+		.usage = "<address> [enable|disable]",
+		.help = "an example command",
 	},
 	{
 		.name = "baz",
 		.handler = &handle_foo_command,
 		.mode = COMMAND_ANY,
-		.help = "<address> [enable|disable] - a sample command",
+		.usage = "<address> [enable|disable]",
+		.help = "a sample command",
 	},
 	{
 		.name = "flag",
 		.handler = &handle_flag_command,
 		.mode = COMMAND_ANY,
-		.help = "[on|off] - set a flag",
+		.usage = "[on|off]",
+		.help = "set a flag",
 	},
 	COMMAND_REGISTRATION_DONE
 };
 
-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, "example command handler skeleton");
-
-
-	return register_commands(cmd_ctx, cmd, foo_command_handlers);
-}
-
 static COMMAND_HELPER(handle_hello_args, const char **sep, const char **name)
 {
 	if (CMD_ARGC > 1)
@@ -111,7 +104,7 @@ COMMAND_HANDLER(handle_hello_command)
 	return retval;
 }
 
-static const struct command_registration hello_command_handlers[] = {
+const struct command_registration hello_command_handlers[] = {
 	{
 		.name = "hello",
 		.handler = &handle_hello_command,
@@ -119,12 +112,17 @@ static const struct command_registration hello_command_handlers[] = {
 		.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);
-
 	return register_commands(cmd_ctx, NULL, hello_command_handlers);
 }