X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Fetb.c;h=a789777baa64e8f6bce650f3e124b78746c7c160;hp=63dee18bc4ec1770fbd09773a296eea602439b6c;hb=9abad965ab358c1d598f1354842967cad637b284;hpb=8161fd3163142f828a0bd79e0b5ad339dc4aec6b

diff --git a/src/target/etb.c b/src/target/etb.c
index 63dee18bc4..a789777baa 100644
--- a/src/target/etb.c
+++ b/src/target/etb.c
@@ -21,7 +21,7 @@
 #include "config.h"
 #endif
 
-#include "armv4_5.h"
+#include "arm.h"
 #include "etm.h"
 #include "etb.h"
 #include "register.h"
@@ -402,12 +402,63 @@ COMMAND_HANDLER(handle_etb_config_command)
 	return ERROR_OK;
 }
 
+COMMAND_HANDLER(handle_etb_trigger_percent_command)
+{
+	struct target *target;
+	struct arm *arm;
+	struct etm_context *etm;
+	struct etb *etb;
+
+	target = get_current_target(CMD_CTX);
+	arm = target_to_arm(target);
+	if (!is_arm(arm))
+	{
+		command_print(CMD_CTX, "ETB: current target isn't an ARM");
+		return ERROR_FAIL;
+	}
+
+	etm = arm->etm;
+	if (!etm) {
+		command_print(CMD_CTX, "ETB: target has no ETM configured");
+		return ERROR_FAIL;
+	}
+	if (etm->capture_driver != &etb_capture_driver) {
+		command_print(CMD_CTX, "ETB: target not using ETB");
+		return ERROR_FAIL;
+	}
+	etb = arm->etm->capture_driver_priv;
+
+	if (CMD_ARGC > 0) {
+		uint32_t new_value;
+
+		COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], new_value);
+		if ((new_value < 2) || (new_value > 100))
+			command_print(CMD_CTX,
+				"valid percentages are 2%% to 100%%");
+		else
+			etb->trigger_percent = (unsigned) new_value;
+	}
+
+	command_print(CMD_CTX, "%d percent of tracebuffer fills after trigger",
+			etb->trigger_percent);
+
+	return ERROR_OK;
+}
+
 static const struct command_registration etb_config_command_handlers[] = {
 	{
 		.name = "config",
 		.handler = &handle_etb_config_command,
 		.mode = COMMAND_CONFIG,
-		.usage = "<target> <tap>",
+		.usage = "target tap",
+	},
+	{
+		.name = "trigger_percent",
+		.handler = &handle_etb_trigger_percent_command,
+		.mode = COMMAND_EXEC,
+		.help = "percent of trace buffer to be filled "
+			"after the trigger occurs",
+		.usage = "[percent]",
 	},
 	COMMAND_REGISTRATION_DONE
 };
@@ -421,11 +472,6 @@ static const struct command_registration etb_command_handlers[] = {
 	COMMAND_REGISTRATION_DONE
 };
 
-static int etb_register_commands(struct command_context *cmd_ctx)
-{
-	return register_commands(cmd_ctx, NULL, etb_command_handlers);
-}
-
 static int etb_init(struct etm_context *etm_ctx)
 {
 	struct etb *etb = etm_ctx->capture_driver_priv;
@@ -440,6 +486,8 @@ static int etb_init(struct etm_context *etm_ctx)
 	etb->ram_depth = buf_get_u32(etb->reg_cache->reg_list[ETB_RAM_DEPTH].value, 0, 32);
 	etb->ram_width = buf_get_u32(etb->reg_cache->reg_list[ETB_RAM_WIDTH].value, 0, 32);
 
+	etb->trigger_percent = 50;
+
 	return ERROR_OK;
 }
 
@@ -666,7 +714,7 @@ static int etb_start_capture(struct etm_context *etm_ctx)
 		return ERROR_ETM_PORTMODE_NOT_SUPPORTED;
 	}
 
-	trigger_count = (etb->ram_depth * etm_ctx->trigger_percent) / 100;
+	trigger_count = (etb->ram_depth * etb->trigger_percent) / 100;
 
 	etb_write_reg(&etb->reg_cache->reg_list[ETB_TRIGGER_COUNTER], trigger_count);
 	etb_write_reg(&etb->reg_cache->reg_list[ETB_RAM_WRITE_POINTER], 0x0);
@@ -696,7 +744,7 @@ static int etb_stop_capture(struct etm_context *etm_ctx)
 struct etm_capture_driver etb_capture_driver =
 {
 	.name = "etb",
-	.register_commands = etb_register_commands,
+	.commands = etb_command_handlers,
 	.init = etb_init,
 	.status = etb_status,
 	.start_capture = etb_start_capture,