X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fjtag%2Fhla%2Fhla_interface.c;h=919313300576e932e14debb749d027a03439c0ce;hp=f8b5c61b4fe0d65b0e1e76ffffa8fb140f2d18f3;hb=6adc1ced89ddcee92de2597229c7dbb654f53137;hpb=d998ea40f3a323cfbc7b80d9c9d5057fbc76c6a9

diff --git a/src/jtag/hla/hla_interface.c b/src/jtag/hla/hla_interface.c
index f8b5c61b4f..9193133005 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, NULL, 0}, 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)
 {
@@ -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;
 		}
@@ -118,6 +119,7 @@ static int hl_interface_quit(void)
 		fclose(hl_if.param.trace_f);
 		hl_if.param.trace_f = NULL;
 	}
+	hl_if.param.trace_source_hz = 0;
 
 	return ERROR_OK;
 }
@@ -136,6 +138,8 @@ int hl_interface_init_reset(void)
 	if (hl_if.param.connect_under_reset) {
 		jtag_add_reset(0, 1);
 		hl_if.layout->api->assert_srst(hl_if.fd, 0);
+	} else {
+		jtag_add_reset(0, 0);
 	}
 
 	return ERROR_OK;
@@ -227,22 +231,23 @@ COMMAND_HANDLER(stlink_interface_handle_api_command)
 
 COMMAND_HANDLER(interface_handle_trace_command)
 {
-	FILE *f;
+	FILE *f = NULL;
 	unsigned source_hz;
 
-	if (CMD_ARGC != 2)
-		return ERROR_COMMAND_SYNTAX_ERROR;
-
-	f = fopen(CMD_ARGV[0], "a");
-	if (!f)
+	if ((CMD_ARGC < 1) || (CMD_ARGC > 2))
 		return ERROR_COMMAND_SYNTAX_ERROR;
 
-	COMMAND_PARSE_NUMBER(uint, CMD_ARGV[1], source_hz);
+	COMMAND_PARSE_NUMBER(uint, CMD_ARGV[0], source_hz);
 	if (source_hz == 0) {
-		fclose(f);
 		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;
 
@@ -290,7 +295,7 @@ static const struct command_registration hl_interface_command_handlers[] = {
 	 .handler = &interface_handle_trace_command,
 	 .mode = COMMAND_CONFIG,
 	 .help = "configure trace reception",
-	 .usage = "destination_path source_lock_hz",
+	 .usage = "source_lock_hz [destination_path]",
 	 },
 	COMMAND_REGISTRATION_DONE
 };