X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Foocd_trace.c;h=ae3a5dff767ae93ff005c025d642ef57570ce937;hp=390c75d80c415eaa17d2102a458388bd65e9d9c9;hb=0a1b7dcfc40385f09b5eb088cd97d6ff25a5816d;hpb=0f1163e823c6ca3c2a81fa296157f5dde0635fea diff --git a/src/target/oocd_trace.c b/src/target/oocd_trace.c index 390c75d80c..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_s *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,33 +276,22 @@ 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; struct arm *arm; - if (argc != 2) + if (CMD_ARGC != 2) { LOG_ERROR("incomplete 'oocd_trace config ' command"); return ERROR_FAIL; } - target = get_current_target(cmd_ctx); + target = get_current_target(CMD_CTX); arm = target_to_arm(target); if (!is_arm(arm)) { - command_print(cmd_ctx, "current target isn't an ARM"); + command_print(CMD_CTX, "current target isn't an ARM"); return ERROR_FAIL; } @@ -316,7 +303,7 @@ COMMAND_HANDLER(handle_oocd_trace_config_command) oocd_trace->etm_ctx = arm->etm; /* copy name of TTY device used to communicate with OpenOCD + trace */ - oocd_trace->tty = strndup(args[1], 256); + oocd_trace->tty = strndup(CMD_ARGV[1], 256); } else { @@ -333,24 +320,24 @@ COMMAND_HANDLER(handle_oocd_trace_status_command) struct oocd_trace *oocd_trace; uint32_t status; - target = get_current_target(cmd_ctx); + target = get_current_target(CMD_CTX); arm = target_to_arm(target); if (!is_arm(arm)) { - command_print(cmd_ctx, "current target isn't an ARM"); + command_print(CMD_CTX, "current target isn't an ARM"); return ERROR_FAIL; } if (!arm->etm) { - command_print(cmd_ctx, "current target doesn't have an ETM configured"); + command_print(CMD_CTX, "current target doesn't have an ETM configured"); return ERROR_FAIL; } if (strcmp(arm->etm->capture_driver->name, "oocd_trace") != 0) { - command_print(cmd_ctx, "current target's ETM capture driver isn't 'oocd_trace'"); + command_print(CMD_CTX, "current target's ETM capture driver isn't 'oocd_trace'"); return ERROR_FAIL; } @@ -359,9 +346,9 @@ COMMAND_HANDLER(handle_oocd_trace_status_command) oocd_trace_read_reg(oocd_trace, OOCD_TRACE_STATUS, &status); if (status & 0x8) - command_print(cmd_ctx, "trace clock locked"); + command_print(CMD_CTX, "trace clock locked"); else - command_print(cmd_ctx, "no trace clock"); + command_print(CMD_CTX, "no trace clock"); return ERROR_OK; } @@ -374,24 +361,24 @@ COMMAND_HANDLER(handle_oocd_trace_resync_command) size_t bytes_written; uint8_t cmd_array[1]; - target = get_current_target(cmd_ctx); + target = get_current_target(CMD_CTX); arm = target_to_arm(target); if (!is_arm(arm)) { - command_print(cmd_ctx, "current target isn't an ARM"); + command_print(CMD_CTX, "current target isn't an ARM"); return ERROR_FAIL; } if (!arm->etm) { - command_print(cmd_ctx, "current target doesn't have an ETM configured"); + command_print(CMD_CTX, "current target doesn't have an ETM configured"); return ERROR_FAIL; } if (strcmp(arm->etm->capture_driver->name, "oocd_trace") != 0) { - command_print(cmd_ctx, "current target's ETM capture driver isn't 'oocd_trace'"); + command_print(CMD_CTX, "current target's ETM capture driver isn't 'oocd_trace'"); return ERROR_FAIL; } @@ -401,22 +388,52 @@ COMMAND_HANDLER(handle_oocd_trace_resync_command) bytes_written = write(oocd_trace->tty_fd, cmd_array, 1); - command_print(cmd_ctx, "requesting traceclock resync"); + command_print(CMD_CTX, "requesting traceclock resync"); LOG_DEBUG("resyncing traceclk pll"); return ERROR_OK; } -int oocd_trace_register_commands(struct command_context_s *cmd_ctx) -{ - command_t *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 = "", + }, + { + .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; -}