X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fxsvf%2Fxsvf.c;h=d9b63163037c55a39675e40e82b27bf6c0501425;hp=3a15e2b7d21c483df7e21e59c5280f2300bffa4d;hb=d47e1b8f362379d8a2307f49e2b42115a3f40524;hpb=82d2633b5f550115e9e7c7d0520babb6680aa38f

diff --git a/src/xsvf/xsvf.c b/src/xsvf/xsvf.c
index 3a15e2b7d2..d9b6316303 100644
--- a/src/xsvf/xsvf.c
+++ b/src/xsvf/xsvf.c
@@ -96,7 +96,7 @@ int xsvf_read_xstates(int fd, enum tap_state *path, int max_path, int *path_len)
 	{
 		if (*path_len > max_path)
 		{
-			WARNING("XSTATE path longer than max_path");
+			LOG_WARNING("XSTATE path longer than max_path");
 			break;
 		}
 		if (read(fd, &uc, 1) < 0)
@@ -154,7 +154,7 @@ int handle_xsvf_command(struct command_context_s *cmd_ctx, char *cmd, char **arg
 		switch (c)
 		{
 			case 0x00:	/* XCOMPLETE */
-				DEBUG("XCOMPLETE");
+				LOG_DEBUG("XCOMPLETE");
 				if (jtag_execute_queue() != ERROR_OK)
 				{
 					tdo_mismatch = 1;
@@ -162,12 +162,12 @@ int handle_xsvf_command(struct command_context_s *cmd_ctx, char *cmd, char **arg
 				}
 				break;
 			case 0x01:	/* XTDOMASK */
-				DEBUG("XTDOMASK");
+				LOG_DEBUG("XTDOMASK");
 				if (dr_in_mask && (xsvf_read_buffer(xsdrsize, xsvf_fd, dr_in_mask) != ERROR_OK))
 					do_abort = 1;
 				break;
 			case 0x02:	/* XSIR */
-				DEBUG("XSIR");
+				LOG_DEBUG("XSIR");
 				if (read(xsvf_fd, &c, 1) < 0)
 					do_abort = 1;
 				else
@@ -215,7 +215,7 @@ int handle_xsvf_command(struct command_context_s *cmd_ctx, char *cmd, char **arg
 				}
 				break;
 			case 0x03:	/* XSDR */
-				DEBUG("XSDR");
+				LOG_DEBUG("XSDR");
 				if (xsvf_read_buffer(xsdrsize, xsvf_fd, dr_out_buf) != ERROR_OK)
 					do_abort = 1;
 				else
@@ -226,10 +226,7 @@ int handle_xsvf_command(struct command_context_s *cmd_ctx, char *cmd, char **arg
 					field.out_value = dr_out_buf;
 					field.out_mask = NULL;
 					field.in_value = NULL;
-					field.in_check_value = dr_in_buf;
-					field.in_check_mask = dr_in_mask;
-					field.in_handler = NULL;
-					field.in_handler_priv = NULL;
+					jtag_set_check_value(&field, dr_in_buf, dr_in_mask, NULL);
 					if (device == -1)
 						jtag_add_plain_dr_scan(1, &field, TAP_PD);
 					else
@@ -255,7 +252,7 @@ int handle_xsvf_command(struct command_context_s *cmd_ctx, char *cmd, char **arg
 				}
 				break;
 			case 0x04:	/* XRUNTEST */
-				DEBUG("XRUNTEST");
+				LOG_DEBUG("XRUNTEST");
 				if (read(xsvf_fd, buf4, 4) < 0)
 					do_abort = 1;
 				else
@@ -264,7 +261,7 @@ int handle_xsvf_command(struct command_context_s *cmd_ctx, char *cmd, char **arg
 				}
 				break;
 			case 0x07:	/* XREPEAT */
-				DEBUG("XREPEAT");
+				LOG_DEBUG("XREPEAT");
 				if (read(xsvf_fd, &c, 1) < 0)
 					do_abort = 1;
 				else
@@ -273,7 +270,7 @@ int handle_xsvf_command(struct command_context_s *cmd_ctx, char *cmd, char **arg
 				}
 				break;
 			case 0x08:	/* XSDRSIZE */
-				DEBUG("XSDRSIZE");
+				LOG_DEBUG("XSDRSIZE");
 				if (read(xsvf_fd, buf4, 4) < 0)
 					do_abort = 1;
 				else
@@ -288,7 +285,7 @@ int handle_xsvf_command(struct command_context_s *cmd_ctx, char *cmd, char **arg
 				}
 				break;
 			case 0x09:	/* XSDRTDO */
-				DEBUG("XSDRTDO");
+				LOG_DEBUG("XSDRTDO");
 				if (xsvf_read_buffer(xsdrsize, xsvf_fd, dr_out_buf) != ERROR_OK)
 					do_abort = 1;
 				else
@@ -303,10 +300,7 @@ int handle_xsvf_command(struct command_context_s *cmd_ctx, char *cmd, char **arg
 						field.out_value = dr_out_buf;
 						field.out_mask = NULL;
 						field.in_value = NULL;
-						field.in_check_value = dr_in_buf;
-						field.in_check_mask = dr_in_mask;
-						field.in_handler = NULL;
-						field.in_handler_priv = NULL;
+						jtag_set_check_value(&field, dr_in_buf, dr_in_mask, NULL);
 						if (device == -1)
 							jtag_add_plain_dr_scan(1, &field, TAP_PD);
 						else
@@ -333,11 +327,11 @@ int handle_xsvf_command(struct command_context_s *cmd_ctx, char *cmd, char **arg
 				}
 				break;
 			case 0x0a:	/* XSETDRMASKS */
-				printf("unsupported XSETSDRMASKS\n");
+				LOG_ERROR("unsupported XSETSDRMASKS\n");
 				unsupported = 1;
 				break;
 			case 0x0b:	/* XSDRINC */
-				printf("unsupported XSDRINC\n");
+				LOG_ERROR("unsupported XSDRINC\n");
 				unsupported = 1;
 				break;
 			case 0x0c:	/* XSDRB */
@@ -359,7 +353,7 @@ int handle_xsvf_command(struct command_context_s *cmd_ctx, char *cmd, char **arg
 				unsupported = 1;
 				break;
 			case 0x12:	/* XSTATE */
-				DEBUG("XSTATE");
+				LOG_DEBUG("XSTATE");
 				if (read(xsvf_fd, &uc, 1) < 0)
 					do_abort = 1;
 				else
@@ -377,7 +371,7 @@ int handle_xsvf_command(struct command_context_s *cmd_ctx, char *cmd, char **arg
 				}
 				break;
 			case 0x13:	/* XENDIR */
-				DEBUG("XENDIR");
+				LOG_DEBUG("XENDIR");
 				if (read(xsvf_fd, &c, 1) < 0)
 					do_abort = 1;
 				else
@@ -388,13 +382,13 @@ int handle_xsvf_command(struct command_context_s *cmd_ctx, char *cmd, char **arg
 						xendir = 0xd;
 					else
 					{
-						ERROR("unknown XENDIR endstate");
+						LOG_ERROR("unknown XENDIR endstate");
 						unsupported = 1;
 					}
 				}
 				break;
 			case 0x14:	/* XENDDR */
-				DEBUG("XENDDR");
+				LOG_DEBUG("XENDDR");
 				if (read(xsvf_fd, &c, 1) < 0)
 					do_abort = 1;
 				else
@@ -405,13 +399,13 @@ int handle_xsvf_command(struct command_context_s *cmd_ctx, char *cmd, char **arg
 						xenddr = 0x6;
 					else
 					{
-						ERROR("unknown XENDDR endstate");
+						LOG_ERROR("unknown XENDDR endstate");
 						unsupported = 1;
 					}
 				}
 				break;
 			case 0x15:	/* XSIR2 */
-				DEBUG("XSIR2");
+				LOG_DEBUG("XSIR2");
 				if (read(xsvf_fd, buf2, 2) < 0)
 					do_abort = 1;
 				else
@@ -452,7 +446,7 @@ int handle_xsvf_command(struct command_context_s *cmd_ctx, char *cmd, char **arg
 				} while (c != 0);
 				break;
 			case 0x17:	/* XWAIT */
-				DEBUG("XWAIT");
+				LOG_DEBUG("XWAIT");
 				if ((read(xsvf_fd, &uc, 1) < 0) || (read(xsvf_fd, &uc2, 1) < 0) || (read(xsvf_fd, buf4, 4) < 0))
 					do_abort = 1;
 				else
@@ -464,7 +458,7 @@ int handle_xsvf_command(struct command_context_s *cmd_ctx, char *cmd, char **arg
 				}
 				break;
 			default:
-				printf("unknown xsvf command (0x%2.2x)\n", c);
+				LOG_ERROR("unknown xsvf command (0x%2.2x)\n", c);
 				unsupported = 1;
 		}
 
@@ -475,21 +469,18 @@ int handle_xsvf_command(struct command_context_s *cmd_ctx, char *cmd, char **arg
 	if (tdo_mismatch)
 	{
 		command_print(cmd_ctx, "TDO mismatch, aborting");
-		jtag_cancel_queue();
 		return ERROR_OK;
 	}
 
 	if (unsupported)
 	{
 		command_print(cmd_ctx, "unsupported xsvf command encountered, aborting");
-		jtag_cancel_queue();
 		return ERROR_OK;
 	}
 
 	if (do_abort)
 	{
 		command_print(cmd_ctx, "premature end detected, aborting");
-		jtag_cancel_queue();
 		return ERROR_OK;
 	}