remove flash.h from tree

[fw/openocd] / src / hello.c

diff --git a/src/hello.c b/src/hello.c
index 2ab7eb5079937d8c0e0626d7f485151ddb2728ac..0cd06adc1e1be97ab8b10655beb7799ebcee8e57 100644 (file)
--- 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 = register_command(cmd_ctx, NULL, "foo",
-                       NULL, COMMAND_ANY, "foo: command handler skeleton");
-
-       register_command(cmd_ctx, cmd, "bar",
-                       &handle_foo_command, COMMAND_ANY,
-                       "<address> [enable|disable] - an example command");
-       register_command(cmd_ctx, cmd, "baz",
-                       &handle_foo_command, COMMAND_ANY,
-                       "<address> [enable|disable] - a sample command");
-
-       register_command(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 = register_command(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);
 }