arm_adi_v5: mem_ap_write error propagation

[fw/openocd] / src / target / trace.c

diff --git a/src/target/trace.c b/src/target/trace.c
index c038a1521a558fb6c66a01e052a80b754efecc86..a8ec143ef0b67ca9c83a9ec3a88c386087369dcb 100644 (file)
--- a/src/target/trace.c
+++ b/src/target/trace.c
@@ -21,7 +21,7 @@
 #include "config.h"
 #endif
 
-#include "log.h"
+#include <helper/log.h>
 #include "trace.h"
 #include "target.h"
 
@@ -156,16 +156,35 @@ COMMAND_HANDLER(handle_trace_history_command)
        return ERROR_OK;
 }
 
+static const struct command_registration trace_exec_command_handlers[] = {
+       {
+               .name = "history",
+               .handler = handle_trace_history_command,
+               .mode = COMMAND_EXEC,
+               .help = "display trace history, clear history or set size",
+               .usage = "['clear'|size]",
+       },
+       {
+               .name = "point",
+               .handler = handle_trace_point_command,
+               .mode = COMMAND_EXEC,
+               .help = "display trace points, clear list of trace points, "
+                       "or add new tracepoint at address",
+               .usage = "['clear'|address]",
+       },
+       COMMAND_REGISTRATION_DONE
+};
+static const struct command_registration trace_command_handlers[] = {
+       {
+               .name = "trace",
+               .mode = COMMAND_EXEC,
+               .help = "trace command group",
+               .chain = trace_exec_command_handlers,
+       },
+       COMMAND_REGISTRATION_DONE
+};
+
 int trace_register_commands(struct command_context *cmd_ctx)
 {
-       struct command *trace_cmd =
-               register_command(cmd_ctx, NULL, "trace", NULL, COMMAND_ANY, "trace commands");
-
-       register_command(cmd_ctx, trace_cmd, "history", handle_trace_history_command,
-               COMMAND_EXEC, "display trace history, ['clear'] history or set [size]");
-
-       register_command(cmd_ctx, trace_cmd, "point", handle_trace_point_command,
-               COMMAND_EXEC, "display trace points, ['clear'] list of trace points, or add new tracepoint at [address]");
-
-       return ERROR_OK;
+       return register_commands(cmd_ctx, NULL, trace_command_handlers);
 }