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

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

Author: oharboe
Date: 2009-05-07 15:40:11 +0200 (Thu, 07 May 2009)
New Revision: 1643

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

Modified: trunk/src/target/arm9tdmi.c
===================================================================
--- trunk/src/target/arm9tdmi.c	2009-05-07 13:36:35 UTC (rev 1642)
+++ trunk/src/target/arm9tdmi.c	2009-05-07 13:40:11 UTC (rev 1643)
@@ -128,33 +128,33 @@
 		fields[0].tap = arm7_9->jtag_info.tap;
 		fields[0].num_bits = 32;
 		fields[0].out_value = NULL;
-		
+
 		fields[0].in_value = databus;
-		
-		
+
+
 		fields[0].in_handler = NULL;
-		
 
+
 		fields[1].tap = arm7_9->jtag_info.tap;
 		fields[1].num_bits = 3;
 		fields[1].out_value = NULL;
-		
+
 		fields[1].in_value = &debug_reason;
-		
-		
+
+
 		fields[1].in_handler = NULL;
-		
 
+
 		fields[2].tap = arm7_9->jtag_info.tap;
 		fields[2].num_bits = 32;
 		fields[2].out_value = NULL;
-		
+
 		fields[2].in_value = instructionbus;
-		
-		
+
+
 		fields[2].in_handler = NULL;
-		
 
+
 		if((retval = arm_jtag_scann(&arm7_9->jtag_info, 0x1)) != ERROR_OK)
 		{
 			return retval;
@@ -216,43 +216,35 @@
 	fields[0].tap = jtag_info->tap;
 	fields[0].num_bits = 32;
 	fields[0].out_value = out_buf;
-	
 	fields[0].in_value = NULL;
-	if (in)
-	{
-		fields[0].in_handler = arm_jtag_buf_to_u32; /* deprecated! invoke this from user code! */
-		fields[0].in_handler_priv = in;
-	}
-	else
-	{
-		fields[0].in_handler = NULL;
-		
-	}
-	
-	
+	fields[0].in_handler = NULL;
 
 	fields[1].tap = jtag_info->tap;
 	fields[1].num_bits = 3;
 	fields[1].out_value = &sysspeed_buf;
-	
 	fields[1].in_value = NULL;
-	
-	
 	fields[1].in_handler = NULL;
-	
 
+
 	fields[2].tap = jtag_info->tap;
 	fields[2].num_bits = 32;
 	fields[2].out_value = instr_buf;
-	
 	fields[2].in_value = NULL;
-	
-	
 	fields[2].in_handler = NULL;
-	
 
-	jtag_add_dr_scan(3, fields, TAP_INVALID);
+	if (in)
+	{
+		u8 tmp[4];
+		fields[0].in_value=tmp;
+		jtag_add_dr_scan_now(3, fields, TAP_INVALID);
 
+		*in=flip_u32(le_to_h_u32(tmp), 32);
+	}
+	else
+	{
+		jtag_add_dr_scan(3, fields, TAP_INVALID);
+	}
+
 	jtag_add_runtest(0, TAP_INVALID);
 
 #ifdef _DEBUG_INSTRUCTION_EXECUTION_
@@ -291,33 +283,33 @@
 	fields[0].tap = jtag_info->tap;
 	fields[0].num_bits = 32;
 	fields[0].out_value = NULL;
-	
+
 	fields[0].in_value = NULL;
 	fields[0].in_handler = arm_jtag_buf_to_u32; /* deprecated! invoke this from user code! */
 	fields[0].in_handler_priv = in;
-	
-	
 
+
+
 	fields[1].tap = jtag_info->tap;
 	fields[1].num_bits = 3;
 	fields[1].out_value = NULL;
-	
+
 	fields[1].in_value = NULL;
 	fields[1].in_handler = NULL;
-	
-	
-	
 
+
+
+
 	fields[2].tap = jtag_info->tap;
 	fields[2].num_bits = 32;
 	fields[2].out_value = NULL;
-	
+
 	fields[2].in_value = NULL;
-	
-	
+
+
 	fields[2].in_handler = NULL;
-	
 
+
 	jtag_add_dr_scan(3, fields, TAP_INVALID);
 
 	jtag_add_runtest(0, TAP_INVALID);
@@ -363,7 +355,7 @@
 	fields[0].tap = jtag_info->tap;
 	fields[0].num_bits = 32;
 	fields[0].out_value = NULL;
-	
+
 	fields[0].in_value = NULL;
 	switch (size)
 	{
@@ -378,29 +370,29 @@
 			break;
 	}
 	fields[0].in_handler_priv = in;
-	
-	
 
+
+
 	fields[1].tap = jtag_info->tap;
 	fields[1].num_bits = 3;
 	fields[1].out_value = NULL;
-	
+
 	fields[1].in_value = NULL;
 	fields[1].in_handler = NULL;
-	
-	
-	
 
+
+
+
 	fields[2].tap = jtag_info->tap;
 	fields[2].num_bits = 32;
 	fields[2].out_value = NULL;
-	
+
 	fields[2].in_value = NULL;
-	
-	
+
+
 	fields[2].in_handler = NULL;
-	
 
+
 	jtag_add_dr_scan(3, fields, TAP_INVALID);
 
 	jtag_add_runtest(0, TAP_INVALID);
@@ -1032,11 +1024,11 @@
 {
 	int retval;
 	command_t *arm9tdmi_cmd;
-	
+
 	retval = arm7_9_register_commands(cmd_ctx);
 	arm9tdmi_cmd = register_command(cmd_ctx, NULL, "arm9tdmi", NULL, COMMAND_ANY, "arm9tdmi specific commands");
 	register_command(cmd_ctx, arm9tdmi_cmd, "vector_catch", handle_arm9tdmi_catch_vectors_command, COMMAND_EXEC, "catch arm920t vectors ['all'|'none'|'<vec1 vec2 ...>']");
-	
+
 	return retval;
 }