X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Farm920t.c;h=658315b261cb742d9c405c15c1e6f73efbe45845;hb=8ffdefcc59ee0a8d305ac5a9f28b38ad89dea7c5;hp=2e7c72db1a90740db69d480e01cce13e8b6534c5;hpb=c09035ea2cb24dee300476a3502919d23d90d1f5;p=openocd.git

diff --git a/src/target/arm920t.c b/src/target/arm920t.c
index 2e7c72db1a..658315b261 100644
--- a/src/target/arm920t.c
+++ b/src/target/arm920t.c
@@ -91,7 +91,6 @@ static int arm920t_read_cp15_physical(struct target *target,
 
 	jtag_info = &arm920t->arm7_9_common.jtag_info;
 
-	jtag_set_end_state(TAP_IDLE);
 	arm_jtag_scann(jtag_info, 0xf, TAP_IDLE);
 	arm_jtag_set_instr(jtag_info, jtag_info->intest_instr, NULL, TAP_IDLE);
 
@@ -142,7 +141,6 @@ static int arm920t_write_cp15_physical(struct target *target,
 
 	buf_set_u32(value_buf, 0, 32, value);
 
-	jtag_set_end_state(TAP_IDLE);
 	arm_jtag_scann(jtag_info, 0xf, TAP_IDLE);
 	arm_jtag_set_instr(jtag_info, jtag_info->intest_instr, NULL, TAP_IDLE);
 
@@ -192,7 +190,6 @@ static int arm920t_execute_cp15(struct target *target, uint32_t cp15_opcode,
 
 	jtag_info = &arm920t->arm7_9_common.jtag_info;
 
-	jtag_set_end_state(TAP_IDLE);
 	arm_jtag_scann(jtag_info, 0xf, TAP_IDLE);
 	arm_jtag_set_instr(jtag_info, jtag_info->intest_instr, NULL, TAP_IDLE);
 
@@ -570,7 +567,11 @@ int arm920t_write_memory(struct target *target, uint32_t address,
 
 	/* FIX!!!! this should be cleaned up and made much more general. The
 	 * plan is to write up and test on arm920t specifically and
-	 * then generalize and clean up afterwards. */
+	 * then generalize and clean up afterwards.
+	 *
+	 * Also it should be moved to the callbacks that handle breakpoints
+	 * specifically and not the generic memory write fn's. See XScale code.
+	 */
 	if (arm920t->armv4_5_mmu.mmu_enabled && (count == 1) &&
 			((size==2) || (size==4)))
 	{
@@ -787,7 +788,7 @@ static int arm920t_mcr(struct target *target, int cpnum,
 		uint32_t CRn, uint32_t CRm,
 		uint32_t value);
 
-int arm920t_init_arch_info(struct target *target,
+static int arm920t_init_arch_info(struct target *target,
 		struct arm920t_common *arm920t, struct jtag_tap *tap)
 {
 	struct arm7_9_common *arm7_9 = &arm920t->arm7_9_common;