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

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

Author: oharboe
Date: 2009-05-07 15:26:35 +0200 (Thu, 07 May 2009)
New Revision: 1640

Modified:
   trunk/src/target/arm720t.c
Log:
remove in_handler usage

Modified: trunk/src/target/arm720t.c
===================================================================
--- trunk/src/target/arm720t.c	2009-05-07 13:23:14 UTC (rev 1639)
+++ trunk/src/target/arm720t.c	2009-05-07 13:26:35 UTC (rev 1640)
@@ -112,32 +112,25 @@
 	fields[0].tap = jtag_info->tap;
 	fields[0].num_bits = 1;
 	fields[0].out_value = &instruction_buf;
-	
 	fields[0].in_value = NULL;
-	
-	
 	fields[0].in_handler = NULL;
-	
 
 	fields[1].tap = jtag_info->tap;
 	fields[1].num_bits = 32;
 	fields[1].out_value = out_buf;
-	
 	fields[1].in_value = NULL;
+	fields[1].in_handler = NULL;
 	if (in)
 	{
-		fields[1].in_handler = arm_jtag_buf_to_u32_flip; /* deprecated! invoke this from user code! */
-		fields[1].in_handler_priv = in;
+		u8 tmp[4];
+		fields[1].in_value = tmp;
+		jtag_add_dr_scan_now(2, fields, TAP_INVALID);
+		*in=flip_u32(le_to_h_u32(tmp), 32);
 	} else
 	{
-		fields[1].in_handler = NULL;
-		
+		jtag_add_dr_scan(2, fields, TAP_INVALID);
 	}
-	
-	
 
-	jtag_add_dr_scan(2, fields, TAP_INVALID);
-
 	if (clock)
 		jtag_add_runtest(0, TAP_INVALID);