cmd: add missing usage vars

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

diff --git a/src/target/oocd_trace.c b/src/target/oocd_trace.c
index a34c63c699108bbb3f5049d54968f73a800a8ff1..09beba95bd6e4353af612ad5101d706fe154b8d6 100644 (file)
--- a/src/target/oocd_trace.c
+++ b/src/target/oocd_trace.c
@@ -21,7 +21,8 @@
 #include "config.h"
 #endif
 
-#include "armv4_5.h"
+#include "arm.h"
+#include "etm.h"
 #include "oocd_trace.h"
 
 /*
@@ -30,8 +31,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;
@@ -47,7 +46,7 @@ static int oocd_trace_read_reg(struct oocd_trace *oocd_trace, int reg, uint32_t
                bytes_to_read -= bytes_read;
        }
 
-       LOG_DEBUG("reg #%i: 0x%8.8x\n", reg, *value);
+       LOG_DEBUG("reg #%i: 0x%8.8x", reg, *value);
 
        return ERROR_OK;
 }
@@ -64,7 +63,7 @@ static int oocd_trace_write_reg(struct oocd_trace *oocd_trace, int reg, uint32_t
        data[4] = (value & 0xff000000) >> 24;
 
        bytes_written = write(oocd_trace->tty_fd, data, 5);
-       LOG_DEBUG("reg #%i: 0x%8.8x\n", reg, value);
+       LOG_DEBUG("reg #%i: 0x%8.8x", reg, value);
 
        return ERROR_OK;
 }
@@ -137,7 +136,7 @@ static int oocd_trace_init(struct etm_context *etm_ctx)
         * read up any leftover characters to ensure communication is in sync */
        while ((bytes_read = read(oocd_trace->tty_fd, trash, sizeof(trash))) > 0)
        {
-               LOG_DEBUG("%zi bytes read\n", bytes_read);
+               LOG_DEBUG("%zi bytes read", bytes_read);
        };
 
        return ERROR_OK;
@@ -239,21 +238,21 @@ static int oocd_trace_start_capture(struct etm_context *etm_ctx)
        uint32_t control = 0x1; /* 0x1: enabled */
        uint32_t trigger_count;
 
-       if (((etm_ctx->portmode & ETM_PORT_MODE_MASK) != ETM_PORT_NORMAL)
-               || ((etm_ctx->portmode & ETM_PORT_WIDTH_MASK) != ETM_PORT_4BIT))
+       if (((etm_ctx->control & ETM_PORT_MODE_MASK) != ETM_PORT_NORMAL)
+               || ((etm_ctx->control & ETM_PORT_WIDTH_MASK) != ETM_PORT_4BIT))
        {
                LOG_DEBUG("OpenOCD + trace only supports normal 4-bit ETM mode");
                return ERROR_ETM_PORTMODE_NOT_SUPPORTED;
        }
 
-       if ((etm_ctx->portmode & ETM_PORT_CLOCK_MASK) == ETM_PORT_HALF_CLOCK)
+       if ((etm_ctx->control & ETM_PORT_CLOCK_MASK) == ETM_PORT_HALF_CLOCK)
        {
                control |= 0x2; /* half rate clock, capture at twice the clock rate */
        }
 
        /* OpenOCD + trace holds up to 16 million samples,
         * but trigger counts is set in multiples of 16 */
-       trigger_count = (1048576 * etm_ctx->trigger_percent) / 100;
+       trigger_count = (1048576 * /* trigger_percent */ 50) / 100;
 
        /* capturing always starts at address zero */
        oocd_trace_write_reg(oocd_trace, OOCD_TRACE_ADDRESS, 0x0);
@@ -278,17 +277,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;
@@ -296,8 +284,7 @@ COMMAND_HANDLER(handle_oocd_trace_config_command)
 
        if (CMD_ARGC != 2)
        {
-               LOG_ERROR("incomplete 'oocd_trace config <target> <tty>' command");
-               return ERROR_FAIL;
+               return ERROR_COMMAND_SYNTAX_ERROR;
        }
 
        target = get_current_target(CMD_CTX);
@@ -410,20 +397,22 @@ COMMAND_HANDLER(handle_oocd_trace_resync_command)
 static const struct command_registration oocd_trace_all_command_handlers[] = {
        {
                .name = "config",
-               .handler = &handle_oocd_trace_config_command,
+               .handler = handle_oocd_trace_config_command,
                .mode = COMMAND_CONFIG,
-               .usage = "<target>",
+               .usage = "<target> <tty>",
        },
        {
                .name = "status",
-               .handler = &handle_oocd_trace_status_command,
+               .handler = handle_oocd_trace_status_command,
                .mode = COMMAND_EXEC,
+               .usage = "",
                .help = "display OpenOCD + trace status",
        },
        {
                .name = "resync",
                .handler = handle_oocd_trace_resync_command,
                .mode = COMMAND_EXEC,
+               .usage = "",
                .help = "resync OpenOCD + trace capture clock",
        },
        COMMAND_REGISTRATION_DONE
@@ -433,12 +422,21 @@ static const struct command_registration oocd_trace_command_handlers[] = {
                .name = "oocd_trace",
                .mode = COMMAND_ANY,
                .help = "OpenOCD trace capture driver command group",
+               .usage = "",
                .chain = oocd_trace_all_command_handlers,
        },
        COMMAND_REGISTRATION_DONE
 };
 
-int oocd_trace_register_commands(struct command_context *cmd_ctx)
+struct etm_capture_driver oocd_trace_capture_driver =
 {
-       return register_commands(cmd_ctx, NULL, oocd_trace_command_handlers);
-}
+       .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,
+};
+
+