jtag: do not use jtag_get_error()

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

diff --git a/src/xsvf/xsvf.c b/src/xsvf/xsvf.c
index f2c1a4220a2a0eec8aa2110a7d0f5a50e09fbdef..f4d09ff9296ec01fadcf7ff6d7bb64bccbbd6632 100644 (file)
--- 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);
 
@@ -565,7 +564,6 @@ COMMAND_HANDLER(handle_xsvf_command)
                case XSTATE:
                        {
                                tap_state_t     mystate;
-                               uint8_t                 uc;
 
                                if (read(xsvf_fd, &uc, 1) < 0)
                                {
@@ -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);