target: don't implicitly include "breakpoint.h"

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

diff --git a/src/target/oocd_trace.c b/src/target/oocd_trace.c
index c5f8b808ad88958f29e93e85ceebf7417b4bf284..cad49779cd8ce380e94d88f1cab6d1d7414a33d2 100644 (file)
--- a/src/target/oocd_trace.c
+++ b/src/target/oocd_trace.c
@@ -30,7 +30,7 @@
  */
 
 
-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(struct oocd_trace *oocd_trace, int reg, uint32_t *value)
 {
@@ -96,7 +96,7 @@ static int oocd_trace_read_memory(struct oocd_trace *oocd_trace, uint8_t *data,
        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];
        struct oocd_trace *oocd_trace = etm_ctx->capture_driver_priv;
@@ -143,7 +143,7 @@ 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)
 {
        struct oocd_trace *oocd_trace = etm_ctx->capture_driver_priv;
        uint32_t status;
@@ -175,7 +175,7 @@ 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)
 {
        struct oocd_trace *oocd_trace = etm_ctx->capture_driver_priv;
        uint32_t status, address;
@@ -233,7 +233,7 @@ 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)
 {
        struct oocd_trace *oocd_trace = etm_ctx->capture_driver_priv;
        uint32_t control = 0x1; /* 0x1: enabled */
@@ -266,7 +266,7 @@ 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)
 {
        struct oocd_trace *oocd_trace = etm_ctx->capture_driver_priv;
 
@@ -291,7 +291,7 @@ struct etm_capture_driver oocd_trace_capture_driver =
 
 COMMAND_HANDLER(handle_oocd_trace_config_command)
 {
-       target_t *target;
+       struct target *target;
        struct arm *arm;
 
        if (argc != 2)
@@ -328,7 +328,7 @@ COMMAND_HANDLER(handle_oocd_trace_config_command)
 
 COMMAND_HANDLER(handle_oocd_trace_status_command)
 {
-       target_t *target;
+       struct target *target;
        struct arm *arm;
        struct oocd_trace *oocd_trace;
        uint32_t status;
@@ -368,7 +368,7 @@ COMMAND_HANDLER(handle_oocd_trace_status_command)
 
 COMMAND_HANDLER(handle_oocd_trace_resync_command)
 {
-       target_t *target;
+       struct target *target;
        struct arm *arm;
        struct oocd_trace *oocd_trace;
        size_t bytes_written;
@@ -407,9 +407,9 @@ COMMAND_HANDLER(handle_oocd_trace_resync_command)
        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");