X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fhello.c;h=f103ed23c5224d4ce279783fa0cf34f0aeaba9af;hp=2ab7eb5079937d8c0e0626d7f485151ddb2728ac;hb=ef02b69b14d133b061217a91add5a028a77e86bc;hpb=20218b8de61dea545c7575f36e1b74b9599c9848

diff --git a/src/hello.c b/src/hello.c
index 2ab7eb5079..f103ed23c5 100644
--- a/src/hello.c
+++ b/src/hello.c
@@ -14,28 +14,24 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include "log.h"
+#include <helper/log.h>
 
 COMMAND_HANDLER(handle_foo_command)
 {
 	if (CMD_ARGC < 1 || CMD_ARGC > 2)
-	{
-		LOG_ERROR("%s: incorrect number of arguments", CMD_NAME);
 		return ERROR_COMMAND_SYNTAX_ERROR;
-	}
 
 	uint32_t address;
 	COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], address);
 
 	const char *msg = "<unchanged>";
-	if (CMD_ARGC == 2)
-	{
+	if (CMD_ARGC == 2) {
 		bool enable;
 		COMMAND_PARSE_ENABLE(CMD_ARGV[1], enable);
 		msg = enable ? "enable" : "disable";
@@ -50,42 +46,42 @@ static bool foo_flag;
 COMMAND_HANDLER(handle_flag_command)
 {
 	return CALL_COMMAND_HANDLER(handle_command_parse_bool,
-			&foo_flag, "foo flag");
+		&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)
 {
 	if (CMD_ARGC > 1)
-	{
-		LOG_ERROR("%s: too many arguments", CMD_NAME);
 		return ERROR_COMMAND_SYNTAX_ERROR;
-	}
-	if (1 == CMD_ARGC)
-	{
+	if (1 == CMD_ARGC) {
 		*sep = " ";
 		*name = CMD_ARGV[0];
-	}
-	else
+	} else
 		*sep = *name = "";
 
 	return ERROR_OK;
@@ -99,12 +95,20 @@ COMMAND_HANDLER(handle_hello_command)
 	return retval;
 }
 
-int hello_register_commands(struct command_context *cmd_ctx)
-{
-	foo_register_commands(cmd_ctx);
+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",
 
-	struct command *cmd = register_command(cmd_ctx, NULL, "hello",
-			&handle_hello_command, COMMAND_ANY,
-			"[<name>] - prints a warm welcome");
-	return cmd ? ERROR_OK : -ENOMEM;
-}
+		.chain = foo_command_handlers,
+	},
+	COMMAND_REGISTRATION_DONE
+};