X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Foocd_trace.c;h=390c75d80c415eaa17d2102a458388bd65e9d9c9;hp=755e1b69d55734d8bc70f68f754a24e03ee38e5e;hb=0f1163e823c6ca3c2a81fa296157f5dde0635fea;hpb=cfc4d5c6b7b6f8f82dc5bbf3ee661c179814666e

diff --git a/src/target/oocd_trace.c b/src/target/oocd_trace.c
index 755e1b69d5..390c75d80c 100644
--- a/src/target/oocd_trace.c
+++ b/src/target/oocd_trace.c
@@ -32,7 +32,7 @@
 
 static int oocd_trace_register_commands(struct command_context_s *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,
@@ -291,7 +291,7 @@ etm_capture_driver_t oocd_trace_capture_driver =
 
 COMMAND_HANDLER(handle_oocd_trace_config_command)
 {
-	target_t *target;
+	struct target *target;
 	struct arm *arm;
 
 	if (argc != 2)
@@ -310,7 +310,7 @@ COMMAND_HANDLER(handle_oocd_trace_config_command)
 
 	if (arm->etm)
 	{
-		oocd_trace_t *oocd_trace = malloc(sizeof(oocd_trace_t));
+		struct oocd_trace *oocd_trace = malloc(sizeof(struct oocd_trace));
 
 		arm->etm->capture_driver_priv = oocd_trace;
 		oocd_trace->etm_ctx = arm->etm;
@@ -328,9 +328,9 @@ COMMAND_HANDLER(handle_oocd_trace_config_command)
 
 COMMAND_HANDLER(handle_oocd_trace_status_command)
 {
-	target_t *target;
+	struct target *target;
 	struct arm *arm;
-	oocd_trace_t *oocd_trace;
+	struct oocd_trace *oocd_trace;
 	uint32_t status;
 
 	target = get_current_target(cmd_ctx);
@@ -354,7 +354,7 @@ COMMAND_HANDLER(handle_oocd_trace_status_command)
 		return ERROR_FAIL;
 	}
 
-	oocd_trace = (oocd_trace_t*)arm->etm->capture_driver_priv;
+	oocd_trace = (struct oocd_trace*)arm->etm->capture_driver_priv;
 
 	oocd_trace_read_reg(oocd_trace, OOCD_TRACE_STATUS, &status);
 
@@ -368,9 +368,9 @@ COMMAND_HANDLER(handle_oocd_trace_status_command)
 
 COMMAND_HANDLER(handle_oocd_trace_resync_command)
 {
-	target_t *target;
+	struct target *target;
 	struct arm *arm;
-	oocd_trace_t *oocd_trace;
+	struct oocd_trace *oocd_trace;
 	size_t bytes_written;
 	uint8_t cmd_array[1];
 
@@ -395,7 +395,7 @@ COMMAND_HANDLER(handle_oocd_trace_resync_command)
 		return ERROR_FAIL;
 	}
 
-	oocd_trace = (oocd_trace_t*)arm->etm->capture_driver_priv;
+	oocd_trace = (struct oocd_trace*)arm->etm->capture_driver_priv;
 
 	cmd_array[0] = 0xf0;