- added starting point for development on a ngw100 eval board

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

diff --git a/src/xsvf/xsvf.c b/src/xsvf/xsvf.c
index 3a15e2b7d21c483df7e21e59c5280f2300bffa4d..16012887a88e7e760dfb669af46083bb4215f87d 100644 (file)
--- a/src/xsvf/xsvf.c
+++ b/src/xsvf/xsvf.c
@@ -188,9 +188,9 @@ int handle_xsvf_command(struct command_context_s *cmd_ctx, char *cmd, char **arg
                                                field.in_handler = NULL;
                                                field.in_handler_priv = NULL;
                                                if (device == -1)
-                                                       jtag_add_plain_ir_scan(1, &field, TAP_PI);
+                                                       jtag_add_plain_ir_scan(1, &field, TAP_PI, NULL);
                                                else
-                                                       jtag_add_ir_scan(1, &field, TAP_PI);
+                                                       jtag_add_ir_scan(1, &field, TAP_PI, NULL);
                                                if (jtag_execute_queue() != ERROR_OK)
                                                {
                                                        tdo_mismatch = 1;
@@ -226,14 +226,11 @@ 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);
+                                               jtag_add_plain_dr_scan(1, &field, TAP_PD, NULL);
                                        else
-                                               jtag_add_dr_scan(1, &field, TAP_PD);
+                                               jtag_add_dr_scan(1, &field, TAP_PD, NULL);
                                        if (jtag_execute_queue() != ERROR_OK)
                                        {
                                                tdo_mismatch = 1;
@@ -303,14 +300,11 @@ 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);
+                                                       jtag_add_plain_dr_scan(1, &field, TAP_PD, NULL);
                                                else
-                                                       jtag_add_dr_scan(1, &field, TAP_PD);
+                                                       jtag_add_dr_scan(1, &field, TAP_PD, NULL);
                                                if (jtag_execute_queue() != ERROR_OK)
                                                {
                                                        tdo_mismatch = 1;
@@ -434,9 +428,9 @@ int handle_xsvf_command(struct command_context_s *cmd_ctx, char *cmd, char **arg
                                                field.in_handler = NULL;
                                                field.in_handler_priv = NULL;
                                                if (device == -1)
-                                                       jtag_add_plain_ir_scan(1, &field, xsvf_to_tap[xendir]);
+                                                       jtag_add_plain_ir_scan(1, &field, xsvf_to_tap[xendir], NULL);
                                                else
-                                                       jtag_add_ir_scan(1, &field, xsvf_to_tap[xendir]);
+                                                       jtag_add_ir_scan(1, &field, xsvf_to_tap[xendir], NULL);
                                        }
                                        free(ir_buf);
                                }