X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fjtag%2Fhla%2Fhla_interface.c;h=81cac4886d26181b631f8602a970d9e893c429b5;hp=8faf9221da6d3be08acf4eea1f77724f88083f42;hb=1e6970dafdccfec388d1a816c2019f9c6b26e338;hpb=08d4411b59dd8bd0e7d8009003b71d23acbf6eee

diff --git a/src/jtag/hla/hla_interface.c b/src/jtag/hla/hla_interface.c
index 8faf9221da..81cac4886d 100644
--- a/src/jtag/hla/hla_interface.c
+++ b/src/jtag/hla/hla_interface.c
@@ -37,7 +37,7 @@
 
 #include <target/target.h>
 
-static struct hl_interface_s hl_if = { {0, 0, 0, 0, 0, HL_TRANSPORT_UNKNOWN, 0, false}, 0, 0 };
+static struct hl_interface_s hl_if = { {0, 0, 0, 0, 0, HL_TRANSPORT_UNKNOWN, false, NULL, 0}, 0, 0 };
 
 int hl_interface_open(enum hl_transports tr)
 {
@@ -72,7 +72,7 @@ int hl_interface_init_target(struct target *t)
 	 * can setup the private pointer in the tap structure
 	 * if the interface match the tap idcode
 	 */
-	res = hl_if.layout->api->idcode(hl_if.fd, &t->tap->idcode);
+	res = hl_if.layout->api->idcode(hl_if.handle, &t->tap->idcode);
 
 	if (res != ERROR_OK)
 		return res;
@@ -84,7 +84,8 @@ int hl_interface_init_target(struct target *t)
 		uint32_t expected = t->tap->expected_ids[ii];
 
 		/* treat "-expected-id 0" as a "don't-warn" wildcard */
-		if (!expected || (t->tap->idcode == expected)) {
+		if (!expected || !t->tap->idcode ||
+		    (t->tap->idcode == expected)) {
 			found = 1;
 			break;
 		}
@@ -114,6 +115,12 @@ static int hl_interface_quit(void)
 {
 	LOG_DEBUG("hl_interface_quit");
 
+	if (hl_if.param.trace_f) {
+		fclose(hl_if.param.trace_f);
+		hl_if.param.trace_f = NULL;
+	}
+	hl_if.param.trace_source_hz = 0;
+
 	return ERROR_OK;
 }
 
@@ -130,7 +137,9 @@ int hl_interface_init_reset(void)
 	 * we will attempt it again */
 	if (hl_if.param.connect_under_reset) {
 		jtag_add_reset(0, 1);
-		hl_if.layout->api->assert_srst(hl_if.fd, 0);
+		hl_if.layout->api->assert_srst(hl_if.handle, 0);
+	} else {
+		jtag_add_reset(0, 0);
 	}
 
 	return ERROR_OK;
@@ -220,6 +229,31 @@ COMMAND_HANDLER(stlink_interface_handle_api_command)
 	return ERROR_OK;
 }
 
+COMMAND_HANDLER(interface_handle_trace_command)
+{
+	FILE *f = NULL;
+	unsigned source_hz;
+
+	if ((CMD_ARGC < 1) || (CMD_ARGC > 2))
+		return ERROR_COMMAND_SYNTAX_ERROR;
+
+	COMMAND_PARSE_NUMBER(uint, CMD_ARGV[0], source_hz);
+	if (source_hz == 0) {
+		return ERROR_COMMAND_SYNTAX_ERROR;
+	}
+
+	if (CMD_ARGC == 2) {
+		f = fopen(CMD_ARGV[1], "a");
+		if (!f)
+			return ERROR_COMMAND_SYNTAX_ERROR;
+	}
+
+	hl_if.param.trace_f = f;
+	hl_if.param.trace_source_hz = source_hz;
+
+	return ERROR_OK;
+}
+
 static const struct command_registration hl_interface_command_handlers[] = {
 	{
 	 .name = "hla_device_desc",
@@ -256,6 +290,13 @@ static const struct command_registration hl_interface_command_handlers[] = {
 	 .help = "set the desired stlink api level",
 	 .usage = "api version 1 or 2",
 	 },
+	 {
+	 .name = "trace",
+	 .handler = &interface_handle_trace_command,
+	 .mode = COMMAND_CONFIG,
+	 .help = "configure trace reception",
+	 .usage = "source_lock_hz [destination_path]",
+	 },
 	COMMAND_REGISTRATION_DONE
 };