X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Foocd_trace.c;h=ac79f18d980be3158ed3f66a4bb806a490799457;hb=070259cadbb0f142f6546c55f8044199c6aea9b9;hp=f4064f7872ea65035ac095d3b7af16a21169c77b;hpb=e2001ba2116fe5c0c75f7953b5fbe35da65fa29d;p=openocd.git

diff --git a/src/target/oocd_trace.c b/src/target/oocd_trace.c
index f4064f7872..ac79f18d98 100644
--- a/src/target/oocd_trace.c
+++ b/src/target/oocd_trace.c
@@ -30,9 +30,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 +50,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 +67,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 +94,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 +141,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 +173,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 +206,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 +231,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 +264,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,45 +276,34 @@ static int oocd_trace_stop_capture(etm_context_t *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)
 {
-	target_t *target;
+	struct target *target;
 	struct arm *arm;
 
-	if (argc != 2)
+	if (CMD_ARGC != 2)
 	{
 		LOG_ERROR("incomplete 'oocd_trace config <target> <tty>' 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;
 	}
 
 	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;
 
 		/* 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
 	{
@@ -328,95 +315,125 @@ 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);
+	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;
 	}
 
-	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);
 
 	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;
 }
 
 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];
 
-	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;
 	}
 
-	oocd_trace = (oocd_trace_t*)arm->etm->capture_driver_priv;
+	oocd_trace = (struct oocd_trace*)arm->etm->capture_driver_priv;
 
 	cmd_array[0] = 0xf0;
 
 	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 = "<target>",
+	},
+	{
+		.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;
-}