X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Foocd_trace.c;h=ae3a5dff767ae93ff005c025d642ef57570ce937;hb=75c706cc043183d98592dbe3c6f170d627849d0f;hp=05df25819a5bb82383653bb7eadfab537a81c360;hpb=2861877b32a7a2f4022a1c3d9b66c9b4879878ac;p=openocd.git

diff --git a/src/target/oocd_trace.c b/src/target/oocd_trace.c
index 05df25819a..ae3a5dff76 100644
--- a/src/target/oocd_trace.c
+++ b/src/target/oocd_trace.c
@@ -21,7 +21,7 @@
 #include "config.h"
 #endif
 
-#include "armv4_5.h"
+#include "arm.h"
 #include "oocd_trace.h"
 
 /*
@@ -30,8 +30,6 @@
  */
 
 
-static int oocd_trace_register_commands(struct command_context *cmd_ctx);
-
 static int oocd_trace_read_reg(struct oocd_trace *oocd_trace, int reg, uint32_t *value)
 {
 	size_t bytes_written, bytes_read, bytes_to_read;
@@ -278,17 +276,6 @@ static int oocd_trace_stop_capture(struct etm_context *etm_ctx)
 	return ERROR_OK;
 }
 
-struct etm_capture_driver oocd_trace_capture_driver =
-{
-	.name = "oocd_trace",
-	.register_commands = oocd_trace_register_commands,
-	.init = oocd_trace_init,
-	.status = oocd_trace_status,
-	.start_capture = oocd_trace_start_capture,
-	.stop_capture = oocd_trace_stop_capture,
-	.read_trace = oocd_trace_read_trace,
-};
-
 COMMAND_HANDLER(handle_oocd_trace_config_command)
 {
 	struct target *target;
@@ -407,16 +394,46 @@ COMMAND_HANDLER(handle_oocd_trace_resync_command)
 	return ERROR_OK;
 }
 
-int oocd_trace_register_commands(struct command_context *cmd_ctx)
-{
-	struct command *oocd_trace_cmd;
-
-	oocd_trace_cmd = register_command(cmd_ctx, NULL, "oocd_trace", NULL, COMMAND_ANY, "OpenOCD + trace");
+static const struct command_registration oocd_trace_all_command_handlers[] = {
+	{
+		.name = "config",
+		.handler = &handle_oocd_trace_config_command,
+		.mode = COMMAND_CONFIG,
+		.usage = "<target>",
+	},
+	{
+		.name = "status",
+		.handler = &handle_oocd_trace_status_command,
+		.mode = COMMAND_EXEC,
+		.help = "display OpenOCD + trace status",
+	},
+	{
+		.name = "resync",
+		.handler = handle_oocd_trace_resync_command,
+		.mode = COMMAND_EXEC,
+		.help = "resync OpenOCD + trace capture clock",
+	},
+	COMMAND_REGISTRATION_DONE
+};
+static const struct command_registration oocd_trace_command_handlers[] = {
+	{
+		.name = "oocd_trace",
+		.mode = COMMAND_ANY,
+		.help = "OpenOCD trace capture driver command group",
+		.chain = oocd_trace_all_command_handlers,
+	},
+	COMMAND_REGISTRATION_DONE
+};
 
-	register_command(cmd_ctx, oocd_trace_cmd, "config", handle_oocd_trace_config_command, COMMAND_CONFIG, NULL);
+struct etm_capture_driver oocd_trace_capture_driver =
+{
+	.name = "oocd_trace",
+	.commands = oocd_trace_command_handlers,
+	.init = oocd_trace_init,
+	.status = oocd_trace_status,
+	.start_capture = oocd_trace_start_capture,
+	.stop_capture = oocd_trace_stop_capture,
+	.read_trace = oocd_trace_read_trace,
+};
 
-	register_command(cmd_ctx, oocd_trace_cmd, "status", handle_oocd_trace_status_command, COMMAND_EXEC, "display OpenOCD + trace status");
-	register_command(cmd_ctx, oocd_trace_cmd, "resync", handle_oocd_trace_resync_command, COMMAND_EXEC, "resync OpenOCD + trace capture clock");
 
-	return ERROR_OK;
-}