X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Ftarget%2Fetb.c;h=3113eca0651c70750436b71cb2a255b86586b511;hb=646ce814b4fb678b7d8d341afe0694c266112426;hp=df04e406ae76d4ffcb3cc5ab64e77c5a559cb0a1;hpb=2861877b32a7a2f4022a1c3d9b66c9b4879878ac;p=openocd

diff --git a/src/target/etb.c b/src/target/etb.c
index df04e406..3113eca0 100644
--- a/src/target/etb.c
+++ b/src/target/etb.c
@@ -21,7 +21,7 @@
 #include "config.h"
 #endif
 
-#include "armv4_5.h"
+#include "arm.h"
 #include "etm.h"
 #include "etb.h"
 #include "register.h"
@@ -402,17 +402,24 @@ COMMAND_HANDLER(handle_etb_config_command)
 	return ERROR_OK;
 }
 
-static int etb_register_commands(struct command_context *cmd_ctx)
-{
-	struct command *etb_cmd = register_command(cmd_ctx, NULL, "etb",
-			NULL, COMMAND_ANY, "Embedded Trace Buffer");
-
-	register_command(cmd_ctx, etb_cmd, "config",
-			handle_etb_config_command, COMMAND_CONFIG,
-			NULL);
-
-	return ERROR_OK;
-}
+static const struct command_registration etb_config_command_handlers[] = {
+	{
+		.name = "config",
+		.handler = &handle_etb_config_command,
+		.mode = COMMAND_CONFIG,
+		.usage = "<target> <tap>",
+	},
+	COMMAND_REGISTRATION_DONE
+};
+static const struct command_registration etb_command_handlers[] = {
+	{
+		.name = "etb",
+		.mode = COMMAND_ANY,
+		.help = "Emebdded Trace Buffer command group",
+		.chain = etb_config_command_handlers,
+	},
+	COMMAND_REGISTRATION_DONE
+};
 
 static int etb_init(struct etm_context *etm_ctx)
 {
@@ -684,7 +691,7 @@ static int etb_stop_capture(struct etm_context *etm_ctx)
 struct etm_capture_driver etb_capture_driver =
 {
 	.name = "etb",
-	.register_commands = etb_register_commands,
+	.commands = etb_command_handlers,
 	.init = etb_init,
 	.status = etb_status,
 	.start_capture = etb_start_capture,