X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fxsvf%2Fxsvf.c;h=157d7280417f712e793154bb1be72b85df618b9e;hp=14bed8efb44996f4aaa7fdd2921d08cfd7a6ed69;hb=f44eeba16f3e9bebfbc78fd0841124d8b2556246;hpb=57d7743639d5092770d79f7c4b12ae694c482750

diff --git a/src/xsvf/xsvf.c b/src/xsvf/xsvf.c
index 14bed8efb4..157d728041 100644
--- a/src/xsvf/xsvf.c
+++ b/src/xsvf/xsvf.c
@@ -269,7 +269,6 @@ COMMAND_HANDLER(handle_xsvf_command)
 		 */
 		if (collecting_path) {
 			tap_state_t	mystate;
-			uint8_t		uc;
 
 			switch (opcode) {
 			case XCOMMENT:
@@ -332,7 +331,7 @@ COMMAND_HANDLER(handle_xsvf_command)
 				else
 					jtag_add_pathmove(pathlen, path);
 
-				result = jtag_get_error();
+				result = jtag_execute_queue();
 				if (result != ERROR_OK) {
 					LOG_ERROR("XSVF: pathmove error %d",
 							result);
@@ -481,9 +480,10 @@ COMMAND_HANDLER(handle_xsvf_command)
 					field.in_value = calloc(DIV_ROUND_UP(field.num_bits, 8), 1);
 
 					if (tap == NULL)
-						jtag_add_plain_dr_scan(1, &field, jtag_set_end_state(TAP_DRPAUSE));
+						jtag_add_plain_dr_scan(field.num_bits, field.out_value, field.in_value,
+								TAP_DRPAUSE);
 					else
-						jtag_add_dr_scan(tap, 1, &field, jtag_set_end_state(TAP_DRPAUSE));
+						jtag_add_dr_scan(tap, 1, &field, TAP_DRPAUSE);
 
 					jtag_check_value_mask(&field, dr_in_buf, dr_in_mask);
 
@@ -564,7 +564,6 @@ COMMAND_HANDLER(handle_xsvf_command)
 		case XSTATE:
 			{
 				tap_state_t	mystate;
-				uint8_t			uc;
 
 				if (read(xsvf_fd, &uc, 1) < 0)
 				{
@@ -702,7 +701,8 @@ COMMAND_HANDLER(handle_xsvf_command)
 
 
 					if (tap == NULL)
-						jtag_add_plain_ir_scan(1, &field, my_end_state);
+						jtag_add_plain_ir_scan(field.num_bits,
+								field.out_value, field.in_value, my_end_state);
 					else
 						jtag_add_ir_scan(tap, &field, my_end_state);
 
@@ -760,7 +760,7 @@ COMMAND_HANDLER(handle_xsvf_command)
 				   XWAIT <uint8_t wait_state> <uint8_t end_state> <uint32_t usecs>
 				*/
 
-				uint8_t	wait;
+				uint8_t	wait_local;
 				uint8_t	end;
 				uint8_t	delay_buf[4];
 
@@ -768,7 +768,7 @@ COMMAND_HANDLER(handle_xsvf_command)
 				tap_state_t end_state;
 				int	delay;
 
-				if (read(xsvf_fd, &wait, 1) < 0
+				if (read(xsvf_fd, &wait_local, 1) < 0
 				  || read(xsvf_fd, &end, 1) < 0
 				  || read(xsvf_fd, delay_buf, 4) < 0)
 				{
@@ -776,7 +776,7 @@ COMMAND_HANDLER(handle_xsvf_command)
 					break;
 				}
 
-				wait_state = xsvf_to_tap(wait);
+				wait_state = xsvf_to_tap(wait_local);
 				end_state  = xsvf_to_tap(end);
 				delay      = be_to_h_u32(delay_buf);
 
@@ -804,14 +804,14 @@ COMMAND_HANDLER(handle_xsvf_command)
 
 				uint8_t  clock_buf[4];
 				uint8_t	usecs_buf[4];
-				uint8_t	wait;
+				uint8_t	wait_local;
 				uint8_t	end;
 				tap_state_t wait_state;
 				tap_state_t end_state;
 				int clock_count;
 				int usecs;
 
-				if (read(xsvf_fd, &wait, 1) < 0
+				if (read(xsvf_fd, &wait_local, 1) < 0
 				 ||  read(xsvf_fd, &end, 1) < 0
 				 ||  read(xsvf_fd, clock_buf, 4) < 0
 				 ||  read(xsvf_fd, usecs_buf, 4) < 0)
@@ -820,7 +820,7 @@ COMMAND_HANDLER(handle_xsvf_command)
 					break;
 				}
 
-				wait_state = xsvf_to_tap(wait);
+				wait_state = xsvf_to_tap(wait_local);
 				end_state  = xsvf_to_tap(end);
 
 				clock_count = be_to_h_u32(clock_buf);
@@ -936,9 +936,10 @@ COMMAND_HANDLER(handle_xsvf_command)
 						LOG_USER("LSDR retry %d", attempt);
 
 					if (tap == NULL)
-						jtag_add_plain_dr_scan(1, &field, jtag_set_end_state(TAP_DRPAUSE));
+						jtag_add_plain_dr_scan(field.num_bits, field.out_value, field.in_value,
+								TAP_DRPAUSE);
 					else
-						jtag_add_dr_scan(tap, 1, &field, jtag_set_end_state(TAP_DRPAUSE));
+						jtag_add_dr_scan(tap, 1, &field, TAP_DRPAUSE);
 
 					jtag_check_value_mask(&field, dr_in_buf, dr_in_mask);