X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Farm7_9_common.c;h=af3b7b3213a155de7f421f84a7169bb55549bd4a;hp=b5434d68e7b7c014ae552dc004f3b94ed496dffd;hb=68b97e4b5c40a70b42dc2a970f1b90b9a3e9f13d;hpb=ba379aa80eb34949f6bf5011d6406547ee59961e

diff --git a/src/target/arm7_9_common.c b/src/target/arm7_9_common.c
index b5434d68e7..af3b7b3213 100644
--- a/src/target/arm7_9_common.c
+++ b/src/target/arm7_9_common.c
@@ -577,7 +577,8 @@ int arm7_9_execute_sys_speed(struct target_s *target)
 
 int arm7_9_execute_fast_sys_speed(struct target_s *target)
 {
-	u8 check_value[4], check_mask[4];
+	static int set=0;
+	static u8 check_value[4], check_mask[4];
 	
 	armv4_5_common_t *armv4_5 = target->arch_info;
 	arm7_9_common_t *arm7_9 = armv4_5->arch_info;
@@ -588,9 +589,18 @@ int arm7_9_execute_fast_sys_speed(struct target_s *target)
 	jtag_add_end_state(TAP_RTI);
 	arm_jtag_set_instr(jtag_info, 0x4, NULL);
 	
-	/* check for DBGACK and SYSCOMP set (others don't care) */
-	buf_set_u32(check_value, 0, 32, 0x9);
-	buf_set_u32(check_mask, 0, 32, 0x9);
+	if (!set)
+	{
+		/* check for DBGACK and SYSCOMP set (others don't care) */
+		
+		/* NB! These are constants that must be available until after next jtag_execute() and
+		   we evaluate the values upon first execution in lieu of setting up these constants
+		   during early setup.
+		*/
+		buf_set_u32(check_value, 0, 32, 0x9);
+		buf_set_u32(check_mask, 0, 32, 0x9);
+		set=1;
+	}
 	
 	/* read debug status register */
 	embeddedice_read_reg_w_check(dbg_stat, check_value, check_value);
@@ -628,6 +638,9 @@ int arm7_9_handle_target_request(void *priv)
 	arm_jtag_t *jtag_info = &arm7_9->jtag_info; 
 	reg_t *dcc_control = &arm7_9->eice_cache->reg_list[EICE_COMMS_CTRL];
 	
+	if (!target->dbg_msg_enabled)
+		return ERROR_OK;
+		
 	if (target->state == TARGET_RUNNING)
 	{
 		/* read DCC control register */