Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
command_t -> struct command
[openocd.git] / src / target / oocd_trace.c
diff --git a/src/target/oocd_trace.c b/src/target/oocd_trace.c
index f2fdaa39700c85fb5e1e8d6ecd83e46a7b6799a4..cad49779cd8ce380e94d88f1cab6d1d7414a33d2 100644 (file)
--- a/src/target/oocd_trace.c
+++ b/src/target/oocd_trace.c
@@ -21,8 +21,8 @@
 #include "config.h"
 #endif
 
+#include "armv4_5.h"
 #include "oocd_trace.h"
-#include "arm7_9_common.h"
 
 /*
  * This is "proof of concept" code, for prototype hardware:
@@ -30,9 +30,9 @@
  */
 
 
-static int oocd_trace_register_commands(struct command_context_s *cmd_ctx);
+static int oocd_trace_register_commands(struct command_context *cmd_ctx);
 
-static int oocd_trace_read_reg(oocd_trace_t *oocd_trace, int reg, uint32_t *value)
+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;
        uint8_t cmd;
@@ -52,7 +52,7 @@ static int oocd_trace_read_reg(oocd_trace_t *oocd_trace, int reg, uint32_t *valu
        return ERROR_OK;
 }
 
-static int oocd_trace_write_reg(oocd_trace_t *oocd_trace, int reg, uint32_t value)
+static int oocd_trace_write_reg(struct oocd_trace *oocd_trace, int reg, uint32_t value)
 {
        size_t bytes_written;
        uint8_t data[5];
@@ -69,7 +69,7 @@ static int oocd_trace_write_reg(oocd_trace_t *oocd_trace, int reg, uint32_t valu
        return ERROR_OK;
 }
 
-static int oocd_trace_read_memory(oocd_trace_t *oocd_trace, uint8_t *data, uint32_t address, uint32_t size)
+static int oocd_trace_read_memory(struct oocd_trace *oocd_trace, uint8_t *data, uint32_t address, uint32_t size)
 {
        size_t bytes_written, bytes_to_read;
        ssize_t bytes_read;
@@ -96,10 +96,10 @@ static int oocd_trace_read_memory(oocd_trace_t *oocd_trace, uint8_t *data, uint3
        return ERROR_OK;
 }
 
-static int oocd_trace_init(etm_context_t *etm_ctx)
+static int oocd_trace_init(struct etm_context *etm_ctx)
 {
        uint8_t trash[256];
-       oocd_trace_t *oocd_trace = etm_ctx->capture_driver_priv;
+       struct oocd_trace *oocd_trace = etm_ctx->capture_driver_priv;
        size_t bytes_read;
 
        oocd_trace->tty_fd = open(oocd_trace->tty, O_RDWR | O_NOCTTY | O_NONBLOCK);
@@ -143,9 +143,9 @@ static int oocd_trace_init(etm_context_t *etm_ctx)
        return ERROR_OK;
 }
 
-static trace_status_t oocd_trace_status(etm_context_t *etm_ctx)
+static trace_status_t oocd_trace_status(struct etm_context *etm_ctx)
 {
-       oocd_trace_t *oocd_trace = etm_ctx->capture_driver_priv;
+       struct oocd_trace *oocd_trace = etm_ctx->capture_driver_priv;
        uint32_t status;
 
        oocd_trace_read_reg(oocd_trace, OOCD_TRACE_STATUS, &status);
@@ -175,9 +175,9 @@ static trace_status_t oocd_trace_status(etm_context_t *etm_ctx)
        return etm_ctx->capture_status;
 }
 
-static int oocd_trace_read_trace(etm_context_t *etm_ctx)
+static int oocd_trace_read_trace(struct etm_context *etm_ctx)
 {
-       oocd_trace_t *oocd_trace = etm_ctx->capture_driver_priv;
+       struct oocd_trace *oocd_trace = etm_ctx->capture_driver_priv;
        uint32_t status, address;
        uint32_t first_frame = 0x0;
        uint32_t num_frames = 1048576;
@@ -208,7 +208,7 @@ static int oocd_trace_read_trace(etm_context_t *etm_ctx)
        }
 
        etm_ctx->trace_depth = num_frames * 16;
-       etm_ctx->trace_data = malloc(sizeof(etmv1_trace_data_t) * etm_ctx->trace_depth);
+       etm_ctx->trace_data = malloc(sizeof(struct etmv1_trace_data) * etm_ctx->trace_depth);
 
        for (i = 0; i < num_frames * 16; i++)
        {
@@ -233,9 +233,9 @@ static int oocd_trace_read_trace(etm_context_t *etm_ctx)
        return ERROR_OK;
 }
 
-static int oocd_trace_start_capture(etm_context_t *etm_ctx)
+static int oocd_trace_start_capture(struct etm_context *etm_ctx)
 {
-       oocd_trace_t *oocd_trace = etm_ctx->capture_driver_priv;
+       struct oocd_trace *oocd_trace = etm_ctx->capture_driver_priv;
        uint32_t control = 0x1; /* 0x1: enabled */
        uint32_t trigger_count;
 
@@ -266,9 +266,9 @@ static int oocd_trace_start_capture(etm_context_t *etm_ctx)
        return ERROR_OK;
 }
 
-static int oocd_trace_stop_capture(etm_context_t *etm_ctx)
+static int oocd_trace_stop_capture(struct etm_context *etm_ctx)
 {
-       oocd_trace_t *oocd_trace = etm_ctx->capture_driver_priv;
+       struct oocd_trace *oocd_trace = etm_ctx->capture_driver_priv;
 
        /* trace stopped, just clear running flag, but preserve others */
        etm_ctx->capture_status &= ~TRACE_RUNNING;
@@ -278,7 +278,7 @@ static int oocd_trace_stop_capture(etm_context_t *etm_ctx)
        return ERROR_OK;
 }
 
-etm_capture_driver_t oocd_trace_capture_driver =
+struct etm_capture_driver oocd_trace_capture_driver =
 {
        .name = "oocd_trace",
        .register_commands = oocd_trace_register_commands,
@@ -289,32 +289,31 @@ etm_capture_driver_t oocd_trace_capture_driver =
        .read_trace = oocd_trace_read_trace,
 };
 
-static int handle_oocd_trace_config_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(handle_oocd_trace_config_command)
 {
-       target_t *target;
-       armv4_5_common_t *armv4_5;
-       arm7_9_common_t *arm7_9;
+       struct target *target;
+       struct arm *arm;
 
        if (argc != 2)
        {
                LOG_ERROR("incomplete 'oocd_trace config <target> <tty>' command");
-               exit(-1);
+               return ERROR_FAIL;
        }
 
        target = get_current_target(cmd_ctx);
-
-       if (arm7_9_get_arch_pointers(target, &armv4_5, &arm7_9) != ERROR_OK)
+       arm = target_to_arm(target);
+       if (!is_arm(arm))
        {
-               command_print(cmd_ctx, "current target isn't an ARM7/ARM9 target");
-               return ERROR_OK;
+               command_print(cmd_ctx, "current target isn't an ARM");
+               return ERROR_FAIL;
        }
 
-       if (arm7_9->etm_ctx)
+       if (arm->etm)
        {
-               oocd_trace_t *oocd_trace = malloc(sizeof(oocd_trace_t));
+               struct oocd_trace *oocd_trace = malloc(sizeof(struct oocd_trace));
 
-               arm7_9->etm_ctx->capture_driver_priv = oocd_trace;
-               oocd_trace->etm_ctx = arm7_9->etm_ctx;
+               arm->etm->capture_driver_priv = oocd_trace;
+               oocd_trace->etm_ctx = arm->etm;
 
                /* copy name of TTY device used to communicate with OpenOCD + trace */
                oocd_trace->tty = strndup(args[1], 256);
@@ -327,35 +326,35 @@ static int handle_oocd_trace_config_command(struct command_context_s *cmd_ctx, c
        return ERROR_OK;
 }
 
-static int handle_oocd_trace_status_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(handle_oocd_trace_status_command)
 {
-       target_t *target;
-       armv4_5_common_t *armv4_5;
-       arm7_9_common_t *arm7_9;
-       oocd_trace_t *oocd_trace;
+       struct target *target;
+       struct arm *arm;
+       struct oocd_trace *oocd_trace;
        uint32_t status;
 
        target = get_current_target(cmd_ctx);
 
-       if (arm7_9_get_arch_pointers(target, &armv4_5, &arm7_9) != ERROR_OK)
+       arm = target_to_arm(target);
+       if (!is_arm(arm))
        {
-               command_print(cmd_ctx, "current target isn't an ARM7/ARM9 target");
-               return ERROR_OK;
+               command_print(cmd_ctx, "current target isn't an ARM");
+               return ERROR_FAIL;
        }
 
-       if (!arm7_9->etm_ctx)
+       if (!arm->etm)
        {
                command_print(cmd_ctx, "current target doesn't have an ETM configured");
-               return ERROR_OK;
+               return ERROR_FAIL;
        }
 
-       if (strcmp(arm7_9->etm_ctx->capture_driver->name, "oocd_trace") != 0)
+       if (strcmp(arm->etm->capture_driver->name, "oocd_trace") != 0)
        {
                command_print(cmd_ctx, "current target's ETM capture driver isn't 'oocd_trace'");
-               return ERROR_OK;
+               return ERROR_FAIL;
        }
 
-       oocd_trace = (oocd_trace_t*)arm7_9->etm_ctx->capture_driver_priv;
+       oocd_trace = (struct oocd_trace*)arm->etm->capture_driver_priv;
 
        oocd_trace_read_reg(oocd_trace, OOCD_TRACE_STATUS, &status);
 
@@ -367,36 +366,36 @@ static int handle_oocd_trace_status_command(struct command_context_s *cmd_ctx, c
        return ERROR_OK;
 }
 
-static int handle_oocd_trace_resync_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(handle_oocd_trace_resync_command)
 {
-       target_t *target;
-       armv4_5_common_t *armv4_5;
-       arm7_9_common_t *arm7_9;
-       oocd_trace_t *oocd_trace;
+       struct target *target;
+       struct arm *arm;
+       struct oocd_trace *oocd_trace;
        size_t bytes_written;
        uint8_t cmd_array[1];
 
        target = get_current_target(cmd_ctx);
 
-       if (arm7_9_get_arch_pointers(target, &armv4_5, &arm7_9) != ERROR_OK)
+       arm = target_to_arm(target);
+       if (!is_arm(arm))
        {
-               command_print(cmd_ctx, "current target isn't an ARM7/ARM9 target");
-               return ERROR_OK;
+               command_print(cmd_ctx, "current target isn't an ARM");
+               return ERROR_FAIL;
        }
 
-       if (!arm7_9->etm_ctx)
+       if (!arm->etm)
        {
                command_print(cmd_ctx, "current target doesn't have an ETM configured");
-               return ERROR_OK;
+               return ERROR_FAIL;
        }
 
-       if (strcmp(arm7_9->etm_ctx->capture_driver->name, "oocd_trace") != 0)
+       if (strcmp(arm->etm->capture_driver->name, "oocd_trace") != 0)
        {
                command_print(cmd_ctx, "current target's ETM capture driver isn't 'oocd_trace'");
-               return ERROR_OK;
+               return ERROR_FAIL;
        }
 
-       oocd_trace = (oocd_trace_t*)arm7_9->etm_ctx->capture_driver_priv;
+       oocd_trace = (struct oocd_trace*)arm->etm->capture_driver_priv;
 
        cmd_array[0] = 0xf0;
 
@@ -408,9 +407,9 @@ static int handle_oocd_trace_resync_command(struct command_context_s *cmd_ctx, c
        return ERROR_OK;
 }
 
-int oocd_trace_register_commands(struct command_context_s *cmd_ctx)
+int oocd_trace_register_commands(struct command_context *cmd_ctx)
 {
-       command_t *oocd_trace_cmd;
+       struct command *oocd_trace_cmd;
 
        oocd_trace_cmd = register_command(cmd_ctx, NULL, "oocd_trace", NULL, COMMAND_ANY, "OpenOCD + trace");
 
Open On-Chip Debugger

Linking to existing account procedure

If you already have an account and want to add another login method you MUST first sign in with your existing account and then change URL to read https://review.openocd.org/login/?link to get to this page again but this time it'll work for linking. Thank you.

SSH host keys fingerprints

1024 SHA256:YKx8b7u5ZWdcbp7/4AeXNaqElP49m6QrwfXaqQGJAOk gerrit-code-review@openocd.zylin.com (DSA)
384 SHA256:jHIbSQa4REvwCFG4cq5LBlBLxmxSqelQPem/EXIrxjk gerrit-code-review@openocd.org (ECDSA)
521 SHA256:UAOPYkU9Fjtcao0Ul/Rrlnj/OsQvt+pgdYSZ4jOYdgs gerrit-code-review@openocd.org (ECDSA)
256 SHA256:A13M5QlnozFOvTllybRZH6vm7iSt0XLxbA48yfc2yfY gerrit-code-review@openocd.org (ECDSA)
256 SHA256:spYMBqEYoAOtK7yZBrcwE8ZpYt6b68Cfh9yEVetvbXg gerrit-code-review@openocd.org (ED25519)
+--[ED25519 256]--+
|=..              |
|+o..   .         |
|*.o   . .        |
|+B . . .         |
|Bo. = o S        |
|Oo.+ + =         |
|oB=.* = . o      |
| =+=.+   + E     |
|. .=o   . o      |
+----[SHA256]-----+
2048 SHA256:0Onrb7/PHjpo6iVZ7xQX2riKN83FJ3KGU0TvI0TaFG4 gerrit-code-review@openocd.zylin.com (RSA)