1 files changed, 22 insertions, 11 deletions

diff --git a/src/jtag/core.c b/src/jtag/core.c
index 6177c1dc..07eec64f 100644
--- a/src/jtag/core.c
+++ b/src/jtag/core.c
@@ -61,8 +61,8 @@ static int jtag_error = ERROR_OK;
 static const char *jtag_event_strings[] =
 {
 	[JTAG_TRST_ASSERTED] = "TAP reset",
+	[JTAG_TAP_EVENT_SETUP] = "TAP setup",
 	[JTAG_TAP_EVENT_ENABLE] = "TAP enabled",
-	[JTAG_TAP_EVENT_POST_RESET] = "TAP post reset",
 	[JTAG_TAP_EVENT_DISABLE] = "TAP disabled",
 };
 
@@ -489,7 +489,7 @@ void jtag_add_tlr(void)
 
 	/* NOTE: order here matches TRST path in jtag_add_reset() */
 	jtag_call_event_callbacks(JTAG_TRST_ASSERTED);
-	jtag_notify_reset();
+	jtag_notify_event(JTAG_TRST_ASSERTED);
 }
 
 void jtag_add_pathmove(int num_states, const tap_state_t *path)
@@ -704,7 +704,7 @@ void jtag_add_reset(int req_tlr_or_trst, int req_srst)
 			 * sequence must match jtag_add_tlr().
 			 */
 			jtag_call_event_callbacks(JTAG_TRST_ASSERTED);
-			jtag_notify_reset();
+			jtag_notify_event(JTAG_TRST_ASSERTED);
 		}
 	}
 }
@@ -1068,6 +1068,7 @@ static int jtag_validate_ircapture(void)
 	int total_ir_length = 0;
 	uint8_t *ir_test = NULL;
 	scan_field_t field;
+	int val;
 	int chain_pos = 0;
 	int retval;
 
@@ -1100,7 +1101,7 @@ static int jtag_validate_ircapture(void)
 
 	tap = NULL;
 	chain_pos = 0;
-	int val;
+
 	for (;;) {
 		tap = jtag_tap_next_enabled(tap);
 		if (tap == NULL) {
@@ -1111,17 +1112,18 @@ static int jtag_validate_ircapture(void)
 		 * REVISIT we might be able to verify some MSBs too, using
 		 * ircapture/irmask attributes.
 		 */
-		val = buf_get_u32(ir_test, chain_pos, 2);
-		if (val != 1) {
-			char *cbuf = buf_to_str(ir_test, total_ir_length, 16);
-
-			LOG_ERROR("%s: IR capture error; saw 0x%s not 0x..1",
-					jtag_tap_name(tap), cbuf);
+		val = buf_get_u32(ir_test, chain_pos, tap->ir_length);
+		if ((val & 0x3) != 1) {
+			LOG_ERROR("%s: IR capture error; saw 0x%0*x not 0x..1",
+					jtag_tap_name(tap),
+					(tap->ir_length + 7) / tap->ir_length,
+					val);
 
-			free(cbuf);
 			retval = ERROR_JTAG_INIT_FAILED;
 			goto done;
 		}
+		LOG_DEBUG("%s: IR capture 0x%0*x", jtag_tap_name(tap),
+				(tap->ir_length + 7) / tap->ir_length, val);
 		chain_pos += tap->ir_length;
 	}
 
@@ -1232,6 +1234,7 @@ static int jtag_init_inner(struct command_context_s *cmd_ctx)
 {
 	jtag_tap_t *tap;
 	int retval;
+	bool issue_setup = true;
 
 	LOG_DEBUG("Init JTAG chain");
 
@@ -1249,13 +1252,21 @@ static int jtag_init_inner(struct command_context_s *cmd_ctx)
 	if (jtag_examine_chain() != ERROR_OK)
 	{
 		LOG_ERROR("Trying to use configured scan chain anyway...");
+		issue_setup = false;
 	}
 
 	if (jtag_validate_ircapture() != ERROR_OK)
 	{
 		LOG_WARNING("Errors during IR capture, continuing anyway...");
+		issue_setup = false;
 	}
 
+	if (issue_setup)
+		jtag_notify_event(JTAG_TAP_EVENT_SETUP);
+	else
+		LOG_WARNING("Bypassing JTAG setup events due to errors");
+
+
 	return ERROR_OK;
 }