[Openocd-svn] r1742 - trunk/src/target

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

Author: oharboe
Date: 2009-05-11 11:43:50 +0200 (Mon, 11 May 2009)
New Revision: 1742

Modified:
   trunk/src/target/xscale.c
Log:
USB performance regression fix

Modified: trunk/src/target/xscale.c
===================================================================
--- trunk/src/target/xscale.c	2009-05-11 09:36:55 UTC (rev 1741)
+++ trunk/src/target/xscale.c	2009-05-11 09:43:50 UTC (rev 1742)
@@ -213,6 +213,7 @@
 
 		jtag_add_ir_scan(1, &field, TAP_INVALID);
 
+		/* FIX!!!! isn't this check superfluous? verify_ircapture handles this? */
 		jtag_check_value_mask(&field, tap->expected, tap->expected_mask);
 
 		free(field.out_value);
@@ -326,19 +327,22 @@
 	fields[0].tap = xscale->jtag_info.tap;
 	fields[0].num_bits = 3;
 	fields[0].out_value = NULL;
-	u8 tmp2;
-	fields[0].in_value = &tmp2;
+	fields[0].in_value = NULL;
+	fields[0].check_value = &field0_check_value;
+	fields[0].check_mask = &field0_check_mask;
 
 	fields[1].tap = xscale->jtag_info.tap;
 	fields[1].num_bits = 32;
 	fields[1].out_value = NULL;
+	fields[1].check_value = NULL;
+	fields[1].check_mask = NULL;
 
-
 	fields[2].tap = xscale->jtag_info.tap;
 	fields[2].num_bits = 1;
 	fields[2].out_value = NULL;
-	u8 tmp3;
-	fields[2].in_value = &tmp3;
+	fields[2].in_value = NULL;
+	fields[2].check_value = &field2_check_value;
+	fields[2].check_mask = &field2_check_mask;
 
 	jtag_add_end_state(TAP_IDLE);
 	xscale_jtag_set_instr(xscale->jtag_info.tap, xscale->jtag_info.dbgtx);
@@ -357,13 +361,11 @@
 			jtag_add_pathmove(3, path);
 
 			fields[1].in_value = (u8 *)(field1+i);
-			jtag_add_dr_scan(3, fields, TAP_IDLE);
 
+			jtag_add_dr_scan_check(3, fields, TAP_IDLE);
+
 			jtag_add_callback(xscale_getbuf, (u8 *)(field1+i));
 
-			jtag_check_value_mask(fields+0, &field0_check_value, &field0_check_mask);
-			jtag_check_value_mask(fields+2, &field2_check_value, &field2_check_mask);
-
 			words_scheduled++;
 		}