X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fxsvf%2Fxsvf.c;h=31c39499380c494dbd71d6df9bbd9137abe43193;hp=f2c1a4220a2a0eec8aa2110a7d0f5a50e09fbdef;hb=f80ec2aa3723c59528198b275a348b6b8804929a;hpb=50dc56a488c6e4d5acdfd73f12e3502e1586c51e

diff --git a/src/xsvf/xsvf.c b/src/xsvf/xsvf.c
index f2c1a4220a..31c3949938 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);
@@ -482,9 +481,9 @@ COMMAND_HANDLER(handle_xsvf_command)
 
 					if (tap == NULL)
 						jtag_add_plain_dr_scan(field.num_bits, field.out_value, field.in_value,
-								jtag_set_end_state(TAP_DRPAUSE));
+								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);
 
@@ -523,49 +522,48 @@ COMMAND_HANDLER(handle_xsvf_command)
 			break;
 
 		case XSETSDRMASKS:
-			LOG_ERROR("unsupported XSETSDRMASKS\n");
+			LOG_ERROR("unsupported XSETSDRMASKS");
 			unsupported = 1;
 			break;
 
 		case XSDRINC:
-			LOG_ERROR("unsupported XSDRINC\n");
+			LOG_ERROR("unsupported XSDRINC");
 			unsupported = 1;
 			break;
 
 		case XSDRB:
-			LOG_ERROR("unsupported XSDRB\n");
+			LOG_ERROR("unsupported XSDRB");
 			unsupported = 1;
 			break;
 
 		case XSDRC:
-			LOG_ERROR("unsupported XSDRC\n");
+			LOG_ERROR("unsupported XSDRC");
 			unsupported = 1;
 			break;
 
 		case XSDRE:
-			LOG_ERROR("unsupported XSDRE\n");
+			LOG_ERROR("unsupported XSDRE");
 			unsupported = 1;
 			break;
 
 		case XSDRTDOB:
-			LOG_ERROR("unsupported XSDRTDOB\n");
+			LOG_ERROR("unsupported XSDRTDOB");
 			unsupported = 1;
 			break;
 
 		case XSDRTDOC:
-			LOG_ERROR("unsupported XSDRTDOC\n");
+			LOG_ERROR("unsupported XSDRTDOC");
 			unsupported = 1;
 			break;
 
 		case XSDRTDOE:
-			LOG_ERROR("unsupported XSDRTDOE\n");
+			LOG_ERROR("unsupported XSDRTDOE");
 			unsupported = 1;
 			break;
 
 		case XSTATE:
 			{
 				tap_state_t	mystate;
-				uint8_t			uc;
 
 				if (read(xsvf_fd, &uc, 1) < 0)
 				{
@@ -762,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];
 
@@ -770,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)
 				{
@@ -778,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);
 
@@ -806,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)
@@ -822,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);
@@ -939,9 +937,9 @@ COMMAND_HANDLER(handle_xsvf_command)
 
 					if (tap == NULL)
 						jtag_add_plain_dr_scan(field.num_bits, field.out_value, field.in_value,
-								jtag_set_end_state(TAP_DRPAUSE));
+								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);
 
@@ -995,7 +993,7 @@ COMMAND_HANDLER(handle_xsvf_command)
 			break;
 
 		default:
-			LOG_ERROR("unknown xsvf command (0x%02X)\n", uc);
+			LOG_ERROR("unknown xsvf command (0x%02X)", uc);
 			unsupported = 1;
 		}