switch to jtag_add_dr_scan_check() - USB performance fix

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

diff --git a/src/svf/svf.c b/src/svf/svf.c
index 01e5631c0f66072a927e11902cb2d348096e402f..a68cfaec0418ae359840010dc1703dd28684392f 100644 (file)
--- a/src/svf/svf.c
+++ b/src/svf/svf.c
@@ -33,22 +33,9 @@
 #endif
 
 #include "svf.h"
-
 #include "jtag.h"
-#include "command.h"
-#include "log.h"
 #include "time_support.h"
 
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <string.h>
-
-#include <sys/time.h>
-#include <time.h>
 
 // SVF command
 typedef enum
@@ -653,11 +640,17 @@ static int svf_check_tdo(void)
                        {
                                if ((svf_tdi_buffer[index + j] & svf_mask_buffer[index + j]) != svf_tdo_buffer[index + j])
                                {
-                                       LOG_ERROR("tdo check error at line %d, read = 0x%X, want = 0x%X, mask = 0x%X",
+                                       unsigned bitmask = (1 << svf_check_tdo_para[i].bit_len) - 1;
+                                       unsigned received, expected, tapmask;
+                                       memcpy(&received, svf_tdi_buffer + index, sizeof(unsigned));
+                                       memcpy(&expected, svf_tdo_buffer + index, sizeof(unsigned));
+                                       memcpy(&tapmask, svf_mask_buffer + index, sizeof(unsigned));
+                                       LOG_ERROR("tdo check error at line %d, "
+                                               "read = 0x%X, want = 0x%X, mask = 0x%X",
                                                                svf_check_tdo_para[i].line_num,
-                                                               (*(int*)(svf_tdi_buffer + index)) & ((1 << svf_check_tdo_para[i].bit_len) - 1),
-                                                               (*(int*)(svf_tdo_buffer + index)) & ((1 << svf_check_tdo_para[i].bit_len) - 1),
-                                                               (*(int*)(svf_mask_buffer + index)) & ((1 << svf_check_tdo_para[i].bit_len) - 1));
+                                                               received & bitmask,
+                                                               expected & bitmask,
+                                                               tapmask & bitmask);
                                        return ERROR_FAIL;
                                }
                        }
@@ -975,12 +968,12 @@ static int svf_run_command(struct command_context_s *cmd_ctx, char *cmd_str)
                        field.tap = tap;
                        field.num_bits = i;
                        field.out_value = &svf_tdi_buffer[svf_buffer_index];
-                       field.out_mask = NULL;
+                       
                        field.in_value = &svf_tdi_buffer[svf_buffer_index];
-                       field.in_check_value = NULL;
-                       field.in_check_mask = NULL;
-                       field.in_handler = NULL;
-                       field.in_handler_priv = NULL;
+                       
+                       
+                       
+                       
                        jtag_add_plain_dr_scan(1, &field, svf_para.dr_end_state);
 
                        svf_buffer_index += (i + 7) >> 3;
@@ -1076,12 +1069,12 @@ static int svf_run_command(struct command_context_s *cmd_ctx, char *cmd_str)
                        field.tap = tap;
                        field.num_bits = i;
                        field.out_value = &svf_tdi_buffer[svf_buffer_index];
-                       field.out_mask = NULL;
+                       
                        field.in_value = &svf_tdi_buffer[svf_buffer_index];
-                       field.in_check_value = NULL;
-                       field.in_check_mask = NULL;
-                       field.in_handler = NULL;
-                       field.in_handler_priv = NULL;
+                       
+                       
+                       
+                       
                        jtag_add_plain_ir_scan(1, &field, svf_para.ir_end_state);
 
                        svf_buffer_index += (i + 7) >> 3;
@@ -1381,8 +1374,11 @@ static int svf_run_command(struct command_context_s *cmd_ctx, char *cmd_str)
                        // output debug info
                        if ((SIR == command) || (SDR == command))
                        {
+                               int read_value;
+                               memcpy(&read_value, svf_tdi_buffer, sizeof(int));
                                // in debug mode, data is from index 0
-                               LOG_DEBUG("\tTDO read = 0x%X", (*(int*)svf_tdi_buffer) & ((1 << (svf_check_tdo_para[0].bit_len)) - 1));
+                               int read_mask = (1 << (svf_check_tdo_para[0].bit_len)) - 1;
+                               LOG_DEBUG("\tTDO read = 0x%X", read_value & read_mask);
                        }
                }
        }