jtag: cut down on usage of unintended modification of global end state

[openocd.git] / src / xsvf / xsvf.c

diff --git a/src/xsvf/xsvf.c b/src/xsvf/xsvf.c
index f5c89d441bf14edefae70e47838f30413563b0a5..dff1a1ec2ab0c862246ce913e880fce660b5835c 100644 (file)
--- a/src/xsvf/xsvf.c
+++ b/src/xsvf/xsvf.c
@@ -41,8 +41,8 @@
 #endif
 
 #include "xsvf.h"
-#include "jtag.h"
-#include "svf.h"
+#include <jtag/jtag.h>
+#include <svf/svf.h>
 
 
 /* XSVF commands, from appendix B of xapp503.pdf  */
@@ -476,15 +476,15 @@ COMMAND_HANDLER(handle_xsvf_command)
                                                        LOG_USER("%s mismatch, xsdrsize=%d retry=%d", op_name, xsdrsize, attempt);
                                        }
 
-                                       field.tap = tap;
                                        field.num_bits = xsdrsize;
                                        field.out_value = dr_out_buf;
                                        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(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);
 
@@ -694,7 +694,6 @@ COMMAND_HANDLER(handle_xsvf_command)
                                {
                                        struct scan_field field;
 
-                                       field.tap = tap;
                                        field.num_bits = bitcount;
                                        field.out_value = ir_buf;
 
@@ -704,9 +703,10 @@ 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(1, &field, my_end_state);
+                                               jtag_add_ir_scan(tap, &field, my_end_state);
 
                                        if (xruntest)
                                        {
@@ -930,7 +930,6 @@ COMMAND_HANDLER(handle_xsvf_command)
                                        jtag_add_clocks(loop_clocks);
                                        jtag_add_sleep(loop_usecs);
 
-                                       field.tap = tap;
                                        field.num_bits = xsdrsize;
                                        field.out_value = dr_out_buf;
                                        field.in_value = calloc(DIV_ROUND_UP(field.num_bits, 8), 1);
@@ -939,9 +938,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(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);
 
@@ -1053,13 +1053,13 @@ COMMAND_HANDLER(handle_xsvf_command)
 static const struct command_registration xsvf_command_handlers[] = {
        {
                .name = "xsvf",
-               .handler = &handle_xsvf_command,
+               .handler = handle_xsvf_command,
                .mode = COMMAND_EXEC,
                .help = "Runs a XSVF file.  If 'virt2' is given, xruntest "
                        "counts are interpreted as TCK cycles rather than "
                        "as microseconds.  Without the 'quiet' option, all "
                        "comments, retries, and mismatches will be reported.",
-               .usage = "<file> [virt2] [quiet]",
+               .usage = "(tapname|'plain') filename ['virt2'] ['quiet']",
        },
        COMMAND_REGISTRATION_DONE
 };