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

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

Author: oharboe
Date: 2009-05-11 09:48:26 +0200 (Mon, 11 May 2009)
New Revision: 1733

Modified:
   trunk/src/target/xscale.c
Log:
switch to jtag_add_callback() - USB performance fix

Modified: trunk/src/target/xscale.c
===================================================================
--- trunk/src/target/xscale.c	2009-05-11 07:47:53 UTC (rev 1732)
+++ trunk/src/target/xscale.c	2009-05-11 07:48:26 UTC (rev 1733)
@@ -252,8 +252,8 @@
 	fields[1].num_bits = 32;
 	fields[1].out_value = NULL;
 	fields[1].in_value = xscale->reg_cache->reg_list[XSCALE_DCSR].value;
-	
 
+
 	fields[2].tap = xscale->jtag_info.tap;
 	fields[2].num_bits = 1;
 	fields[2].out_value = &field2;
@@ -290,6 +290,12 @@
 	return jtag_execute_queue();
 }
 
+
+static void xscale_getbuf(u8 *in)
+{
+	*((u32 *)in)=buf_get_u32(in, 0, 32);
+}
+
 int xscale_receive(target_t *target, u32 *buffer, int num_words)
 {
 	if (num_words==0)
@@ -326,10 +332,8 @@
 	fields[1].tap = xscale->jtag_info.tap;
 	fields[1].num_bits = 32;
 	fields[1].out_value = NULL;
-	u8 tmp[4];
-	fields[1].in_value = tmp;
-	
 
+
 	fields[2].tap = xscale->jtag_info.tap;
 	fields[2].num_bits = 1;
 	fields[2].out_value = NULL;
@@ -351,13 +355,15 @@
 			fields[0].in_value = &field0[i];
 
 			jtag_add_pathmove(3, path);
-			jtag_add_dr_scan_now(3, fields, TAP_IDLE);
 
+			fields[1].in_value = (u8 *)(field1+i);
+			jtag_add_dr_scan(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);
 
-			field1[i]=buf_get_u32(tmp, 0, 32);
-
 			words_scheduled++;
 		}
 
@@ -444,8 +450,8 @@
 	fields[1].num_bits = 32;
 	fields[1].out_value = NULL;
 	fields[1].in_value = xscale->reg_cache->reg_list[XSCALE_TX].value;
-	
 
+
 	fields[2].tap = xscale->jtag_info.tap;
 	fields[2].num_bits = 1;
 	fields[2].out_value = NULL;
@@ -536,8 +542,8 @@
 	fields[1].num_bits = 32;
 	fields[1].out_value = xscale->reg_cache->reg_list[XSCALE_RX].value;
 	fields[1].in_value = NULL;
-	
 
+
 	fields[2].tap = xscale->jtag_info.tap;
 	fields[2].num_bits = 1;
 	fields[2].out_value = &field2;
@@ -708,8 +714,8 @@
 	fields[1].num_bits = 32;
 	fields[1].out_value = xscale->reg_cache->reg_list[XSCALE_DCSR].value;
 	fields[1].in_value = NULL;
-	
 
+
 	fields[2].tap = xscale->jtag_info.tap;
 	fields[2].num_bits = 1;
 	fields[2].out_value = &field2;
@@ -778,9 +784,9 @@
 	fields[0].in_value = NULL;
 
 
-	
 
 
+
 	fields[1].tap = xscale->jtag_info.tap;
 	fields[1].num_bits = 27;
 	fields[1].out_value = packet;
@@ -788,9 +794,9 @@
 	fields[1].in_value = NULL;
 
 
-	
 
 
+
 	jtag_add_dr_scan(2, fields, TAP_INVALID);
 
 	fields[0].num_bits = 32;
@@ -840,9 +846,9 @@
 	fields[0].in_value = NULL;
 
 
-	
 
 
+
 	fields[1].tap = xscale->jtag_info.tap;
 	fields[1].num_bits = 27;
 	fields[1].out_value = packet;
@@ -850,9 +856,9 @@
 	fields[1].in_value = NULL;
 
 
-	
 
 
+
 	jtag_add_dr_scan(2, fields, TAP_INVALID);
 
 	return ERROR_OK;