From d79176e1bc4699a52663b87dc52f02fb7afa3d54 Mon Sep 17 00:00:00 2001
From: Zachary T Welch <zw@superlucidity.net>
Date: Mon, 23 Nov 2009 07:43:05 -0800
Subject: [PATCH] armv7a: use register_commands()
---
src/target/armv7a.c | 75 +++++++++++++++++++++++++++++----------------
1 file changed, 48 insertions(+), 27 deletions(-)
diff --git a/src/target/armv7a.c b/src/target/armv7a.c
index 67638636c..7cc22736e 100644
--- a/src/target/armv7a.c
+++ b/src/target/armv7a.c
@@ -144,33 +144,54 @@ COMMAND_HANDLER(handle_dap_info_command)
return dap_info_command(CMD_CTX, swjdp, apsel);
}
+static const struct command_registration armv7a_exec_command_handlers[] = {
+ {
+ .name = "info",
+ .handler = &handle_dap_info_command,
+ .mode = COMMAND_EXEC,
+ .help = "dap info for ap [num], "
+ "default currently selected AP",
+ },
+ {
+ .name = "apsel",
+ .handler = &handle_dap_apsel_command,
+ .mode = COMMAND_EXEC,
+ .help = "select a different AP [num] (default 0)",
+ },
+ {
+ .name = "apid",
+ .handler = &handle_dap_apid_command,
+ .mode = COMMAND_EXEC,
+ .help = "return id reg from AP [num], "
+ "default currently selected AP",
+ },
+ {
+ .name = "baseaddr",
+ .handler = &handle_dap_baseaddr_command,
+ .mode = COMMAND_EXEC,
+ .help = "return debug base address from AP [num], "
+ "default currently selected AP",
+ },
+ {
+ .name = "memaccess",
+ .handler = &handle_dap_memaccess_command,
+ .mode = COMMAND_EXEC,
+ .help = "set/get number of extra tck for mem-ap memory "
+ "bus access [0-255]",
+ },
+ COMMAND_REGISTRATION_DONE
+};
+static const struct command_registration armv7a_command_handlers[] = {
+ {
+ .name = "dap",
+ .mode = COMMAND_ANY,
+ .help = "Cortex DAP command group",
+ .chain = armv7a_exec_command_handlers,
+ },
+ COMMAND_REGISTRATION_DONE
+};
+
int armv7a_register_commands(struct command_context *cmd_ctx)
{
- struct command *arm_adi_v5_dap_cmd;
-
- arm_adi_v5_dap_cmd = COMMAND_REGISTER(cmd_ctx, NULL, "dap",
- NULL, COMMAND_ANY,
- "cortex dap specific commands");
-
- COMMAND_REGISTER(cmd_ctx, arm_adi_v5_dap_cmd, "info",
- handle_dap_info_command, COMMAND_EXEC,
- "dap info for ap [num], "
- "default currently selected AP");
- COMMAND_REGISTER(cmd_ctx, arm_adi_v5_dap_cmd, "apsel",
- handle_dap_apsel_command, COMMAND_EXEC,
- "select a different AP [num] (default 0)");
- COMMAND_REGISTER(cmd_ctx, arm_adi_v5_dap_cmd, "apid",
- handle_dap_apid_command, COMMAND_EXEC,
- "return id reg from AP [num], "
- "default currently selected AP");
- COMMAND_REGISTER(cmd_ctx, arm_adi_v5_dap_cmd, "baseaddr",
- handle_dap_baseaddr_command, COMMAND_EXEC,
- "return debug base address from AP [num], "
- "default currently selected AP");
- COMMAND_REGISTER(cmd_ctx, arm_adi_v5_dap_cmd, "memaccess",
- handle_dap_memaccess_command, COMMAND_EXEC,
- "set/get number of extra tck for mem-ap memory "
- "bus access [0-255]");
-
- return ERROR_OK;
+ return register_commands(cmd_ctx, NULL, armv7a_command_handlers);
}
--
GitLab