X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Foocd_trace.c;h=3b4357194372f71a215b954a08a56f63811626da;hp=ae3a5dff767ae93ff005c025d642ef57570ce937;hb=559d08c19ed838f7bb2a77ce56a5a274641111f8;hpb=0a1b7dcfc40385f09b5eb088cd97d6ff25a5816d

diff --git a/src/target/oocd_trace.c b/src/target/oocd_trace.c
index ae3a5dff76..3b43571943 100644
--- a/src/target/oocd_trace.c
+++ b/src/target/oocd_trace.c
@@ -22,6 +22,7 @@
 #endif
 
 #include "arm.h"
+#include "etm.h"
 #include "oocd_trace.h"
 
 /*
@@ -237,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);
@@ -397,13 +398,13 @@ 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",
 	},
 	{
 		.name = "status",
-		.handler = &handle_oocd_trace_status_command,
+		.handler = handle_oocd_trace_status_command,
 		.mode = COMMAND_EXEC,
 		.help = "display OpenOCD + trace status",
 	},