[Openocd-svn] r2045 - in trunk/src: pld target xsvf

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

Author: oharboe
Date: 2009-06-04 14:12:38 +0200 (Thu, 04 Jun 2009)
New Revision: 2045

Modified:
   trunk/src/pld/virtex2.c
   trunk/src/target/arm11_dbgtap.c
   trunk/src/target/arm7tdmi.c
   trunk/src/target/arm9tdmi.c
   trunk/src/xsvf/xsvf.c
Log:
no longer use jtag_add_xxx() to set end state to TAP_DRPAUSE

Modified: trunk/src/pld/virtex2.c
===================================================================
--- trunk/src/pld/virtex2.c	2009-06-04 12:06:31 UTC (rev 2044)
+++ trunk/src/pld/virtex2.c	2009-06-04 12:12:38 UTC (rev 2045)
@@ -85,7 +85,7 @@
 
 	virtex2_set_instr(virtex2_info->tap, 0x5); /* CFG_IN */
 
-	jtag_add_dr_scan(1, &scan_field, TAP_DRPAUSE);
+	jtag_add_dr_scan(1, &scan_field, jtag_add_end_state(TAP_DRPAUSE));
 
 	free(values);
 
@@ -113,7 +113,7 @@
 	{
 		scan_field.in_value = (u8 *)words;
 		
-		jtag_add_dr_scan(1, &scan_field, TAP_DRPAUSE);
+		jtag_add_dr_scan(1, &scan_field, jtag_add_end_state(TAP_DRPAUSE));
 
 		jtag_add_callback(virtexflip32, (u8 *)words);
 
@@ -179,7 +179,7 @@
 	field.num_bits = bit_file.length * 8;
 	field.out_value = bit_file.data;
 
-	jtag_add_dr_scan(1, &field, TAP_DRPAUSE);
+	jtag_add_dr_scan(1, &field, jtag_add_end_state(TAP_DRPAUSE));
 	jtag_execute_queue();
 
 	jtag_add_tlr();

Modified: trunk/src/target/arm11_dbgtap.c
===================================================================
--- trunk/src/target/arm11_dbgtap.c	2009-06-04 12:06:31 UTC (rev 2044)
+++ trunk/src/target/arm11_dbgtap.c	2009-06-04 12:12:38 UTC (rev 2045)
@@ -526,7 +526,7 @@
 
 		if (count)
 		{
-			jtag_add_dr_scan(asizeof(chain5_fields), chain5_fields, TAP_DRPAUSE);
+			jtag_add_dr_scan(asizeof(chain5_fields), chain5_fields, jtag_add_end_state(TAP_DRPAUSE));
 			jtag_add_pathmove(asizeof(arm11_MOVE_DRPAUSE_IDLE_DRPAUSE_with_delay),
 				arm11_MOVE_DRPAUSE_IDLE_DRPAUSE_with_delay);
 		}

Modified: trunk/src/target/arm7tdmi.c
===================================================================
--- trunk/src/target/arm7tdmi.c	2009-06-04 12:06:31 UTC (rev 2044)
+++ trunk/src/target/arm7tdmi.c	2009-06-04 12:12:38 UTC (rev 2045)
@@ -116,7 +116,7 @@
 		}
 		arm_jtag_set_instr(&arm7_9->jtag_info, arm7_9->jtag_info.intest_instr, NULL);
 
-		jtag_add_dr_scan(2, fields, TAP_DRPAUSE);
+		jtag_add_dr_scan(2, fields, jtag_add_end_state(TAP_DRPAUSE));
 		if((retval = jtag_execute_queue()) != ERROR_OK)
 		{
 			return retval;
@@ -127,7 +127,7 @@
 		fields[1].in_value = NULL;
 		fields[1].out_value = databus;
 
-		jtag_add_dr_scan(2, fields, TAP_DRPAUSE);
+		jtag_add_dr_scan(2, fields, jtag_add_end_state(TAP_DRPAUSE));
 
 		if (breakpoint & 1)
 			target->debug_reason = DBG_REASON_WATCHPOINT;

Modified: trunk/src/target/arm9tdmi.c
===================================================================
--- trunk/src/target/arm9tdmi.c	2009-06-04 12:06:31 UTC (rev 2044)
+++ trunk/src/target/arm9tdmi.c	2009-06-04 12:12:38 UTC (rev 2045)
@@ -134,7 +134,7 @@
 		}
 		arm_jtag_set_instr(&arm7_9->jtag_info, arm7_9->jtag_info.intest_instr, NULL);
 
-		jtag_add_dr_scan(3, fields, TAP_DRPAUSE);
+		jtag_add_dr_scan(3, fields, jtag_add_end_state(TAP_DRPAUSE));
 		if ((retval = jtag_execute_queue()) != ERROR_OK)
 		{
 			return retval;
@@ -147,7 +147,7 @@
 		fields[2].in_value = NULL;
 		fields[2].out_value = instructionbus;
 
-		jtag_add_dr_scan(3, fields, TAP_DRPAUSE);
+		jtag_add_dr_scan(3, fields, jtag_add_end_state(TAP_DRPAUSE));
 
 		if (debug_reason & 0x4)
 			if (debug_reason & 0x2)

Modified: trunk/src/xsvf/xsvf.c
===================================================================
--- trunk/src/xsvf/xsvf.c	2009-06-04 12:06:31 UTC (rev 2044)
+++ trunk/src/xsvf/xsvf.c	2009-06-04 12:12:38 UTC (rev 2045)
@@ -405,9 +405,9 @@
 					field.in_value = calloc(CEIL(field.num_bits, 8), 1);
 
 					if (tap == NULL)
-						jtag_add_plain_dr_scan(1, &field, TAP_DRPAUSE);
+						jtag_add_plain_dr_scan(1, &field, jtag_add_end_state(TAP_DRPAUSE));
 					else
-						jtag_add_dr_scan(1, &field, TAP_DRPAUSE);
+						jtag_add_dr_scan(1, &field, jtag_add_end_state(TAP_DRPAUSE));
 
 					jtag_check_value_mask(&field, dr_in_buf, dr_in_mask);
 
@@ -853,9 +853,9 @@
 						LOG_USER("LSDR retry %d", attempt);
 
 					if (tap == NULL)
-						jtag_add_plain_dr_scan(1, &field, TAP_DRPAUSE);
+						jtag_add_plain_dr_scan(1, &field, jtag_add_end_state(TAP_DRPAUSE));
 					else
-						jtag_add_dr_scan(1, &field, TAP_DRPAUSE);
+						jtag_add_dr_scan(1, &field, jtag_add_end_state(TAP_DRPAUSE));
 
 					jtag_check_value_mask(&field, dr_in_buf, dr_in_mask);