X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Fferoceon.c;h=1d3cc5948194e1bb668e63ffb8eed60c39deb114;hb=1eb19b8de5bf2f6699766f2178d1ef04ce4579a6;hp=ee0bafd2466eefc77d9c6eef17537f257345e492;hpb=edfb677d3466a0d88fe9bd5ec1d8785a41b6bc4e;p=openocd.git

diff --git a/src/target/feroceon.c b/src/target/feroceon.c
index ee0bafd246..1d3cc59481 100644
--- a/src/target/feroceon.c
+++ b/src/target/feroceon.c
@@ -64,6 +64,13 @@ static int feroceon_assert_reset(struct target *target)
 	struct arm7_9_common *arm7_9 = arm->arch_info;
 	int ud = arm7_9->use_dbgrq;
 
+	/* TODO: apply hw reset signal in not examined state */
+	if (!(target_was_examined(target))) {
+		LOG_WARNING("Reset is not asserted because the target is not examined.");
+		LOG_WARNING("Use a reset button or power cycle the target.");
+		return ERROR_TARGET_NOT_EXAMINED;
+	}
+
 	arm7_9->use_dbgrq = 0;
 	if (target->reset_halt)
 		arm7_9_halt(target);
@@ -88,7 +95,7 @@ static int feroceon_dummy_clock_out(struct arm_jtag *jtag_info, uint32_t instr)
 	if (retval != ERROR_OK)
 		return retval;
 
-	retval = arm_jtag_set_instr(jtag_info, jtag_info->intest_instr, NULL, TAP_DRPAUSE);
+	retval = arm_jtag_set_instr(jtag_info->tap, jtag_info->intest_instr, NULL, TAP_DRPAUSE);
 	if (retval != ERROR_OK)
 		return retval;