[Openocd-svn] r1664 - in trunk/src: jtag target

[oharboe at B. <oh...@ma...>]

Author: oharboe
Date: 2009-05-08 08:45:27 +0200 (Fri, 08 May 2009)
New Revision: 1664

Modified:
   trunk/src/jtag/jtag.c
   trunk/src/target/embeddedice.c
Log:
first jtag_check_value_mask usage. tested by using "arm7_9 fast_memory_access enable" & "mdw 0 0x10"

Modified: trunk/src/jtag/jtag.c
===================================================================
--- trunk/src/jtag/jtag.c	2009-05-08 06:14:08 UTC (rev 1663)
+++ trunk/src/jtag/jtag.c	2009-05-08 06:45:27 UTC (rev 1664)
@@ -1417,11 +1417,23 @@
 
 void jtag_check_value_mask(scan_field_t *field, u8 *value, u8 *mask)
 {
+	if (field->in_value==NULL)
+	{
+		LOG_ERROR("remember to fill in in_value for jtag_check_value_mask() to work!");
+		return;
+	}
+
+	if (value==NULL)
+	{
+		/* no checking to do */
+		return;
+	}
+
 	jtag_execute_queue_noclear();
-	
+
 	int retval=jtag_check_value_inner(field->in_value, field, value, mask);
 	jtag_set_error(retval);
-	
+
 }
 
 

Modified: trunk/src/target/embeddedice.c
===================================================================
--- trunk/src/target/embeddedice.c	2009-05-08 06:14:08 UTC (rev 1663)
+++ trunk/src/target/embeddedice.c	2009-05-08 06:45:27 UTC (rev 1664)
@@ -251,39 +251,26 @@
 	fields[0].tap = ice_reg->jtag_info->tap;
 	fields[0].num_bits = 32;
 	fields[0].out_value = reg->value;
-
 	fields[0].in_value = NULL;
-
-
 	fields[0].in_handler = NULL;
 
-
 	fields[1].tap = ice_reg->jtag_info->tap;
 	fields[1].num_bits = 5;
 	fields[1].out_value = field1_out;
 	buf_set_u32(fields[1].out_value, 0, 5, reg_addr);
-
 	fields[1].in_value = NULL;
-
-
 	fields[1].in_handler = NULL;
 
-
 	fields[2].tap = ice_reg->jtag_info->tap;
 	fields[2].num_bits = 1;
 	fields[2].out_value = field2_out;
 	buf_set_u32(fields[2].out_value, 0, 1, 0);
-
 	fields[2].in_value = NULL;
-
-
 	fields[2].in_handler = NULL;
 
-
 	jtag_add_dr_scan(3, fields, TAP_INVALID);
 
 	fields[0].in_value = reg->value;
-	jtag_set_check_value(fields+0, check_value, check_mask, NULL);
 
 	/* when reading the DCC data register, leaving the address field set to
 	 * EICE_COMMS_DATA would read the register twice
@@ -293,6 +280,8 @@
 
 	jtag_add_dr_scan(3, fields, TAP_INVALID);
 
+	jtag_check_value_mask(fields+0, check_value, check_mask);
+
 	return ERROR_OK;
 }