X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Ftarget%2Farm966e.c;h=439b0f639fe57ae0608013682eaeb6f6fd34c3da;hb=0c2f8b6eb8f4b379aa0c78caba73ec1ebaae8414;hp=67678c14defa5151768b82316071f69f7f92f745;hpb=36df240cea04990e8c18aa0b90bd63374f22dbd3;p=fw%2Fopenocd

diff --git a/src/target/arm966e.c b/src/target/arm966e.c
index 67678c14d..439b0f639 100644
--- a/src/target/arm966e.c
+++ b/src/target/arm966e.c
@@ -84,12 +84,13 @@ static int arm966e_read_cp15(struct target *target, int reg_addr, uint32_t *valu
 	uint8_t reg_addr_buf = reg_addr & 0x3f;
 	uint8_t nr_w_buf = 0;
 
-	jtag_set_end_state(TAP_IDLE);
-	if ((retval = arm_jtag_scann(jtag_info, 0xf)) != ERROR_OK)
+	if ((retval = arm_jtag_scann(jtag_info, 0xf, TAP_IDLE)) != ERROR_OK)
 	{
 		return retval;
 	}
-	arm_jtag_set_instr(jtag_info, jtag_info->intest_instr, NULL);
+	retval = arm_jtag_set_instr(jtag_info, jtag_info->intest_instr, NULL, TAP_IDLE);
+	if (retval != ERROR_OK)
+		return retval;
 
 	fields[0].num_bits = 32;
 	/* REVISIT: table 7-2 shows that bits 31-31 need to be
@@ -139,12 +140,13 @@ int arm966e_write_cp15(struct target *target, int reg_addr, uint32_t value)
 
 	buf_set_u32(value_buf, 0, 32, value);
 
-	jtag_set_end_state(TAP_IDLE);
-	if ((retval = arm_jtag_scann(jtag_info, 0xf)) != ERROR_OK)
+	if ((retval = arm_jtag_scann(jtag_info, 0xf, TAP_IDLE)) != ERROR_OK)
 	{
 		return retval;
 	}
-	arm_jtag_set_instr(jtag_info, jtag_info->intest_instr, NULL);
+	retval = arm_jtag_set_instr(jtag_info, jtag_info->intest_instr, NULL, TAP_IDLE);
+	if (retval != ERROR_OK)
+		return retval;
 
 	fields[0].num_bits = 32;
 	fields[0].out_value = value_buf;
@@ -245,6 +247,7 @@ const struct command_registration arm966e_command_handlers[] = {
 		.name = "arm966e",
 		.mode = COMMAND_ANY,
 		.help = "arm966e command group",
+		.usage = "",
 		.chain = arm966e_exec_command_handlers,
 	},
 	COMMAND_REGISTRATION_DONE