Michael Bruck <mbruck@digenius.de> change 'ir_scan' from 'int' to 'bool' to document...

[openocd.git] / src / jtag / vsllink.c

diff --git a/src/jtag/vsllink.c b/src/jtag/vsllink.c
index ae5391ee15dc7730fdb4b2e5442b9eb9377774cf..57f69bcd6d4010f45b6df36c47e30051db542643 100644 (file)
--- a/src/jtag/vsllink.c
+++ b/src/jtag/vsllink.c
@@ -26,14 +26,10 @@
 #include "config.h"
 #endif
 
-#include "replacements.h"
-
 #include "jtag.h"
 
 #include <usb.h>
-#include <string.h>
 
-#include "log.h"
 
 //#define _VSLLINK_IN_DEBUG_MODE_
 
@@ -208,9 +204,9 @@ static void vsllink_runtest(int num_cycles);
 static void vsllink_stableclocks_dma(int num_cycles, int tms);
 static void vsllink_stableclocks_normal(int num_cycles, int tms);
 static void (*vsllink_stableclocks)(int num_cycles, int tms);
-static void vsllink_scan_dma(int ir_scan, enum scan_type type, u8 *buffer, int scan_size, scan_command_t *command);
-static void vsllink_scan_normal(int ir_scan, enum scan_type type, u8 *buffer, int scan_size, scan_command_t *command);
-static void (*vsllink_scan)(int ir_scan, enum scan_type type, u8 *buffer, int scan_size, scan_command_t *command);
+static void vsllink_scan_dma(bool ir_scan, enum scan_type type, u8 *buffer, int scan_size, scan_command_t *command);
+static void vsllink_scan_normal(bool ir_scan, enum scan_type type, u8 *buffer, int scan_size, scan_command_t *command);
+static void (*vsllink_scan)(bool ir_scan, enum scan_type type, u8 *buffer, int scan_size, scan_command_t *command);
 static void vsllink_reset(int trst, int srst);
 static void vsllink_simple_command(u8 command);
 static int vsllink_connect(void);
@@ -242,7 +238,7 @@ static int vsllink_usb_message(vsllink_jtag_t *vsllink_jtag, int out_length, int
 static int vsllink_usb_write(vsllink_jtag_t *vsllink_jtag, int out_length);
 static int vsllink_usb_read(vsllink_jtag_t *vsllink_jtag);
 
-#ifdef _DEBUG_USB_COMMS_
+#if defined _DEBUG_USB_COMMS_ || defined _DEBUG_JTAG_IO_
 static void vsllink_debug_buffer(u8 *buffer, int length);
 #endif
 
@@ -1193,7 +1189,7 @@ static void vsllink_runtest(int num_cycles)
        }
 }
 
-static void vsllink_scan_normal(int ir_scan, enum scan_type type, u8 *buffer, int scan_size, scan_command_t *command)
+static void vsllink_scan_normal(bool ir_scan, enum scan_type type, u8 *buffer, int scan_size, scan_command_t *command)
 {
        tap_state_t saved_end_state;
        u8 bits_left, tms_tmp, tdi_len;
@@ -1243,7 +1239,7 @@ static void vsllink_scan_normal(int ir_scan, enum scan_type type, u8 *buffer, in
                        // which is merged from the last tms shift command
                        vsllink_usb_out_buffer[vsllink_usb_out_buffer_idx++] = VSLLINK_CMDJTAGSEQ_SCAN | 1;
                        vsllink_usb_out_buffer[vsllink_usb_out_buffer_idx++] = ((tdi_len + 1) >> 0) & 0xff;
-                       vsllink_usb_out_buffer[vsllink_usb_out_buffer_idx++] = ((tdi_len + 1)>> 8) & 0xff;
+                       vsllink_usb_out_buffer[vsllink_usb_out_buffer_idx++] = ((tdi_len + 1) >> 8) & 0xff;
                        vsllink_usb_out_buffer[vsllink_usb_out_buffer_idx++] = tms_tmp;
                        vsllink_usb_out_buffer[vsllink_usb_out_buffer_idx++] = buffer[0] << (8 - vsllink_tms_data_len);
                        
@@ -1309,7 +1305,7 @@ static void vsllink_scan_normal(int ir_scan, enum scan_type type, u8 *buffer, in
        
        tap_set_state(tap_get_end_state());
 }
-static void vsllink_scan_dma(int ir_scan, enum scan_type type, u8 *buffer, int scan_size, scan_command_t *command)
+static void vsllink_scan_dma(bool ir_scan, enum scan_type type, u8 *buffer, int scan_size, scan_command_t *command)
 {
        tap_state_t saved_end_state;
        
@@ -1917,7 +1913,7 @@ static int vsllink_usb_read(vsllink_jtag_t *vsllink_jtag)
 
 #define BYTES_PER_LINE  16
 
-#ifdef _DEBUG_USB_COMMS_
+#if defined _DEBUG_USB_COMMS_ || defined _DEBUG_JTAG_IO_
 static void vsllink_debug_buffer(u8 *buffer, int length)
 {
        char line[81];
@@ -1936,4 +1932,4 @@ static void vsllink_debug_buffer(u8 *buffer, int length)
                LOG_DEBUG("%s", line);
        }
 }
-#endif // _DEBUG_USB_COMMS_
+#endif // _DEBUG_USB_COMMS_ || _DEBUG_JTAG_IO_