interesting
/
riscv-openocd
mirror of https://github.com/riscv/riscv-openocd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Jonas Horberg [jhorberg@sauer-danfoss.com] 

https://lists.berlios.de/pipermail/openocd-development/2009-August/009939.html

1. It can only be built with the FTD2XX driver. libftdi supports FT2232H/FT4232H 
since version 0.16 

2. A speed value of 0 is used as a RTCK request indicator. This clashes with the 
valid clock division value 0 that provide the highest fixed clock frequency. 

3. The ft2232_speed_div function return the maximum selectable frequency (30MHz) 
when RTCK is activated. It should return 0. 

4. The ft2232_khz function return ERROR_OK when RTCK is requested even for 
devices lacking RTCK support. It should return ERROR_FAIL so the upper driver layers 
can detect this and try to fallback to a fixed frequency. 

5. FT2232H/FT4232H have a backward compatibility function that divide the clock 
by 5 to get the same frequency range as FT2232D. There is no code that disable 
this functionality. I can not find anything about if this is enabled or disabled by default. 
I think it is safest to actively disable it. 


git-svn-id: svn://svn.berlios.de/openocd/trunk@2591 b42882b7-edfa-0310-969c-e2dbd0fdcd60
This commit is contained in:
ntfreak 2009-08-18 14:41:58 +00:00
parent bb5086b83e
commit a634b5d52e
3 changed files with 229 additions and 217 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
README
View File

@ -215,9 +215,10 @@ options may be available there:
FTD2XX FTD2XX
--enable-ft2232_ftd2xx Enable building support for FT2232 based devices --enable-ft2232_ftd2xx Enable building support for FT2232 based devices
using the FTD2XX driver from ftdichip.com using the FTD2XX driver from ftdichip.com
--enable-ftd2xx-highspeed --enable-ft2232-highspeed
Enable building support for FT2232H and Enable building support for FT2232H and
FT4232H-based devices (requires >=libftd2xx-0.4.16) FT4232H-based devices (requires >=libftd2xx-0.4.16
or >=libftdi-0.16)
--enable-gw16012 Enable building support for the Gateworks GW16012 --enable-gw16012 Enable building support for the Gateworks GW16012
JTAG Programmer JTAG Programmer

44
configure.in
View File

@ -323,9 +323,9 @@ AC_ARG_ENABLE(ft2232_ftd2xx,
AS_HELP_STRING([--enable-ft2232_ftd2xx], [Enable building support for FT2232 based devices using the FTD2XX driver from ftdichip.com]), AS_HELP_STRING([--enable-ft2232_ftd2xx], [Enable building support for FT2232 based devices using the FTD2XX driver from ftdichip.com]),
[build_ft2232_ftd2xx=$enableval], [build_ft2232_ftd2xx=no]) [build_ft2232_ftd2xx=$enableval], [build_ft2232_ftd2xx=no])
AC_ARG_ENABLE(ftd2xx_highspeed, AC_ARG_ENABLE(ft2232_highspeed,
AS_HELP_STRING([--enable-ftd2xx-highspeed], [Enable building support for FT2232H and FT4232H-based devices (requires >=libftd2xx-0.4.16)]), AS_HELP_STRING([--enable-ft2232-highspeed], [Enable building support for FT2232H and FT4232H-based devices (requires >=libftd2xx-0.4.16 or >=libftdi-0.16)]),
[want_ftd2xx_highspeed=$enableval], [want_ftd2xx_highspeed=no]) [want_ft2232_highspeed=$enableval], [want_ft2232_highspeed=no])
AC_ARG_ENABLE(amtjtagaccel, AC_ARG_ENABLE(amtjtagaccel,
AS_HELP_STRING([--enable-amtjtagaccel], [Enable building the Amontec JTAG-Accelerator driver]), AS_HELP_STRING([--enable-amtjtagaccel], [Enable building the Amontec JTAG-Accelerator driver]),
@ -835,8 +835,8 @@ main( int argc, char **argv )
]) ])
AC_MSG_CHECKING([whether to build ftd2xx highspeed device support]) AC_MSG_CHECKING([whether to build ftd2xx highspeed device support])
AC_MSG_RESULT([$want_ftd2xx_highspeed]) AC_MSG_RESULT([$want_ft2232_highspeed])
if test $want_ftd2xx_highspeed != no; then if test $want_ft2232_highspeed != no; then
AC_MSG_CHECKING([for ftd2xx highspeed device support]) AC_MSG_CHECKING([for ftd2xx highspeed device support])
AC_COMPILE_IFELSE([ AC_COMPILE_IFELSE([
#include "confdefs.h" #include "confdefs.h"
@ -847,15 +847,15 @@ if test $want_ftd2xx_highspeed != no; then
#include <ftd2xx.h> #include <ftd2xx.h>
DWORD x = FT_DEVICE_4232H; DWORD x = FT_DEVICE_4232H;
], [ ], [
AC_DEFINE(BUILD_FTD2XX_HIGHSPEED, [1], AC_DEFINE(BUILD_FT2232_HIGHSPEED, [1],
[Support FT2232H/FT4232HS with FTD2XX.]) [Support FT2232H/FT4232HS with FTD2XX or libftdi.])
build_ftd2xx_highspeed=yes build_ft2232_highspeed=yes
], [ ], [
build_ftd2xx_highspeed=no build_ft2232_highspeed=no
]) ])
AC_MSG_RESULT([$build_ftd2xx_highspeed]) AC_MSG_RESULT([$build_ft2232_highspeed])
if test $want_ftd2xx_highspeed = yes -a $build_ftd2xx_highspeed = no; then if test $want_ft2232_highspeed = yes -a $build_ft2232_highspeed = no; then
AC_MSG_ERROR([You need a newer FTD2XX driver (version 0.4.16 or later).]) AC_MSG_ERROR([You need a newer FTD2XX driver (version 0.4.16 or later).])
fi fi
fi fi
@ -903,6 +903,28 @@ main( int argc, char **argv )
AC_MSG_RESULT([Skipping as we are cross-compiling]) AC_MSG_RESULT([Skipping as we are cross-compiling])
]) ])
AC_MSG_CHECKING([whether to build libftdi highspeed device support])
AC_MSG_RESULT([$want_ft2232_highspeed])
if test $want_ft2232_highspeed != no; then
AC_MSG_CHECKING([for libftdi highspeed device support])
AC_COMPILE_IFELSE([
#include <stdio.h>
#include <ftdi.h>
enum ftdi_chip_type x = TYPE_2232H;
], [
AC_DEFINE(BUILD_FT2232_HIGHSPEED, [1],
[Support FT2232H/FT4232HS with FTD2XX or libftdi.])
build_ft2232_highspeed=yes
], [
build_ft2232_highspeed=no
])
AC_MSG_RESULT([$build_ft2232_highspeed])
if test $want_ft2232_highspeed = yes -a $build_ft2232_highspeed = no; then
AC_MSG_ERROR([You need a newer libftdi version (0.16 or later).])
fi
fi
# Restore the 'unexpanded ldflags' # Restore the 'unexpanded ldflags'
LDFLAGS=$LDFLAGS_SAVE LDFLAGS=$LDFLAGS_SAVE
CFLAGS=$CFLAGS_SAVE CFLAGS=$CFLAGS_SAVE

307
src/jtag/ft2232.c
View File

@ -24,7 +24,6 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/ ***************************************************************************/
/* This code uses information contained in the MPSSE specification which was /* This code uses information contained in the MPSSE specification which was
* found here: * found here:
* http://www.ftdichip.com/Documents/AppNotes/AN2232C-01_MPSSE_Cmnd.pdf * http://www.ftdichip.com/Documents/AppNotes/AN2232C-01_MPSSE_Cmnd.pdf
@ -34,7 +33,6 @@
* http://www.ftdichip.com/Documents/DataSheets/DS_FT2232D.pdf * http://www.ftdichip.com/Documents/DataSheets/DS_FT2232D.pdf
*/ */
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "config.h" #include "config.h"
#endif #endif
@ -65,6 +63,10 @@
/* max TCK for the high speed devices 30000 kHz */ /* max TCK for the high speed devices 30000 kHz */
#define FTDI_2232H_4232H_MAX_TCK 30000 #define FTDI_2232H_4232H_MAX_TCK 30000
/* max TCK for the full speed devices 6000 kHz */
#define FTDI_2232C_MAX_TCK 6000
/* this speed value tells that RTCK is requested */
#define RTCK_SPEED -1
static int ft2232_execute_queue(void); static int ft2232_execute_queue(void);
@ -81,7 +83,6 @@ static int ft2232_handle_layout_command(struct command_context_s* cmd_ctx, char*
static int ft2232_handle_vid_pid_command(struct command_context_s* cmd_ctx, char* cmd, char** args, int argc); static int ft2232_handle_vid_pid_command(struct command_context_s* cmd_ctx, char* cmd, char** args, int argc);
static int ft2232_handle_latency_command(struct command_context_s* cmd_ctx, char* cmd, char** args, int argc); static int ft2232_handle_latency_command(struct command_context_s* cmd_ctx, char* cmd, char** args, int argc);
/** /**
* Send out \a num_cycles on the TCK line while the TAP(s) are in a * Send out \a num_cycles on the TCK line while the TAP(s) are in a
* stable state. Calling code must ensure that current state is stable, * stable state. Calling code must ensure that current state is stable,
@ -94,16 +95,12 @@ static int ft2232_handle_latency_command(struct command_context_s* cmd_ctx, char
*/ */
static int ft2232_stableclocks(int num_cycles, jtag_command_t* cmd); static int ft2232_stableclocks(int num_cycles, jtag_command_t* cmd);
/* max TCK for the high speed devices 30000 kHz */
#define FTDI_2232H_4232H_MAX_TCK 30000
static char * ft2232_device_desc_A = NULL; static char * ft2232_device_desc_A = NULL;
static char* ft2232_device_desc = NULL; static char* ft2232_device_desc = NULL;
static char* ft2232_serial = NULL; static char* ft2232_serial = NULL;
static char* ft2232_layout = NULL; static char* ft2232_layout = NULL;
static uint8_t ft2232_latency = 2; static uint8_t ft2232_latency = 2;
static unsigned ft2232_max_tck = 6000; static unsigned ft2232_max_tck = FTDI_2232C_MAX_TCK;
#define MAX_USB_IDS 8 #define MAX_USB_IDS 8
/* vid = pid = 0 marks the end of the list */ /* vid = pid = 0 marks the end of the list */
@ -182,13 +179,12 @@ static FT_HANDLE ftdih = NULL;
static FT_DEVICE ftdi_device = 0; static FT_DEVICE ftdi_device = 0;
#elif BUILD_FT2232_LIBFTDI == 1 #elif BUILD_FT2232_LIBFTDI == 1
static struct ftdi_context ftdic; static struct ftdi_context ftdic;
static enum ftdi_chip_type ftdi_device;
#endif #endif
static jtag_command_t* first_unsent; /* next command that has to be sent */ static jtag_command_t* first_unsent; /* next command that has to be sent */
static int require_send; static int require_send;
/* http://urjtag.wiki.sourceforge.net/Cable + FT2232 says: /* http://urjtag.wiki.sourceforge.net/Cable + FT2232 says:
"There is a significant difference between libftdi and libftd2xx. The latter "There is a significant difference between libftdi and libftd2xx. The latter
@ -232,7 +228,6 @@ static inline uint8_t buffer_read(void)
return ft2232_buffer[ft2232_read_pointer++]; return ft2232_buffer[ft2232_read_pointer++];
} }
/** /**
* Clocks out \a bit_count bits on the TMS line, starting with the least * Clocks out \a bit_count bits on the TMS line, starting with the least
* significant bit of tms_bits and progressing to more significant bits. * significant bit of tms_bits and progressing to more significant bits.
@ -258,7 +253,9 @@ static void clock_tms(uint8_t mpsse_cmd, int tms_bits, int tms_count, bool tdi_b
assert(tms_count > 0); assert(tms_count > 0);
// LOG_DEBUG("mpsse cmd=%02x, tms_bits = 0x%08x, bit_count=%d", mpsse_cmd, tms_bits, tms_count); #if 0
LOG_DEBUG("mpsse cmd=%02x, tms_bits = 0x%08x, bit_count=%d", mpsse_cmd, tms_bits, tms_count);
#endif
for (tms_byte = tms_ndx = i = 0; i < tms_count; ++i, tms_bits>>=1) for (tms_byte = tms_ndx = i = 0; i < tms_count; ++i, tms_bits>>=1)
{ {
@ -288,7 +285,6 @@ static void clock_tms(uint8_t mpsse_cmd, int tms_bits, int tms_count, bool tdi_b
} }
} }
/** /**
* Function get_tms_buffer_requirements * Function get_tms_buffer_requirements
* returns what clock_tms() will consume if called with * returns what clock_tms() will consume if called with
@ -299,7 +295,6 @@ static inline int get_tms_buffer_requirements(int bit_count)
return ((bit_count + 6)/7) * 3; return ((bit_count + 6)/7) * 3;
} }
/** /**
* Function move_to_state * Function move_to_state
* moves the TAP controller from the current state to a * moves the TAP controller from the current state to a
@ -326,7 +321,6 @@ static void move_to_state(tap_state_t goal_state)
clock_tms(0x4b, tms_bits, tms_count, 0); clock_tms(0x4b, tms_bits, tms_count, 0);
} }
jtag_interface_t ft2232_interface = jtag_interface_t ft2232_interface =
{ {
.name = "ft2232", .name = "ft2232",
@ -343,7 +337,7 @@ static int ft2232_write(uint8_t* buf, int size, uint32_t* bytes_written)
{ {
#if BUILD_FT2232_FTD2XX == 1 #if BUILD_FT2232_FTD2XX == 1
FT_STATUS status; FT_STATUS status;
DWORD dw_bytes_written; DWORD dw_bytes_written;
if ((status = FT_Write(ftdih, buf, size, &dw_bytes_written)) != FT_OK) if ((status = FT_Write(ftdih, buf, size, &dw_bytes_written)) != FT_OK)
{ {
*bytes_written = dw_bytes_written; *bytes_written = dw_bytes_written;
@ -371,13 +365,12 @@ static int ft2232_write(uint8_t* buf, int size, uint32_t* bytes_written)
#endif #endif
} }
static int ft2232_read(uint8_t* buf, uint32_t size, uint32_t* bytes_read) static int ft2232_read(uint8_t* buf, uint32_t size, uint32_t* bytes_read)
{ {
#if BUILD_FT2232_FTD2XX == 1 #if BUILD_FT2232_FTD2XX == 1
DWORD dw_bytes_read; DWORD dw_bytes_read;
FT_STATUS status; FT_STATUS status;
int timeout = 5; int timeout = 5;
*bytes_read = 0; *bytes_read = 0;
while ((*bytes_read < size) && timeout--) while ((*bytes_read < size) && timeout--)
@ -421,58 +414,87 @@ static int ft2232_read(uint8_t* buf, uint32_t size, uint32_t* bytes_read)
return ERROR_OK; return ERROR_OK;
} }
#ifdef BUILD_FTD2XX_HIGHSPEED
static bool ft2232_device_is_highspeed(void) static bool ft2232_device_is_highspeed(void)
{ {
#ifdef BUILD_FT2232_HIGHSPEED
#if BUILD_FT2232_FTD2XX == 1
return (ftdi_device == FT_DEVICE_2232H) || (ftdi_device == FT_DEVICE_4232H); return (ftdi_device == FT_DEVICE_2232H) || (ftdi_device == FT_DEVICE_4232H);
#elif BUILD_FT2232_LIBFTDI == 1
return (ftdi_device == TYPE_2232H || ftdi_device == TYPE_4232H);
#endif
#else
return false;
#endif
} }
static int ft2232_adaptive_clocking(int speed) /*
{ * Commands that only apply to the FT2232H and FT4232H devices.
bool use_adaptive_clocking = FALSE; * See chapter 6 in http://www.ftdichip.com/Documents/AppNotes/
if (0 == speed) * AN_108_Command_Processor_for_MPSSE_and_MCU_Host_Bus_Emulation_Modes.pdf
{ */
if (ft2232_device_is_highspeed())
use_adaptive_clocking = TRUE;
else
{
LOG_ERROR("ft2232 device %lu does not support RTCK", ftdi_device);
return ERROR_OK;
}
}
uint8_t buf = use_adaptive_clocking ? 0x96 : 0x97; static int ft2232h_ft4232h_adaptive_clocking(bool enable)
{
uint8_t buf = enable ? 0x96 : 0x97;
LOG_DEBUG("%2.2x", buf); LOG_DEBUG("%2.2x", buf);
uint32_t bytes_written; uint32_t bytes_written;
int retval = ft2232_write(&buf, 1, &bytes_written); int retval = ft2232_write(&buf, 1, &bytes_written);
if (ERROR_OK != retval || bytes_written != 1) if ((ERROR_OK != retval) || (bytes_written != 1))
{ {
LOG_ERROR("unable to set adative clocking: %d", retval); LOG_ERROR("couldn't write command to %s adaptive clocking"
, enable ? "enable" : "disable");
return retval; return retval;
} }
return ERROR_OK; return ERROR_OK;
} }
#else
static int ft2232_adaptive_clocking(int speed) /**
* Enable/disable the clk divide by 5 of the 60MHz master clock.
* This result in a JTAG clock speed range of 91.553Hz-6MHz
* respective 457.763Hz-30MHz.
*/
static int ft2232h_ft4232h_clk_divide_by_5(bool enable)
{ {
// not implemented on low-speed devices uint32_t bytes_written;
return speed ? ERROR_OK : -1234; uint8_t buf = enable ? 0x8b : 0x8a;
int retval = ft2232_write(&buf, 1, &bytes_written);
if ((ERROR_OK != retval) || (bytes_written != 1))
{
LOG_ERROR("couldn't write command to %s clk divide by 5"
, enable ? "enable" : "disable");
return ERROR_JTAG_INIT_FAILED;
}
ft2232_max_tck = enable ? FTDI_2232C_MAX_TCK : FTDI_2232H_4232H_MAX_TCK;
LOG_INFO("max TCK change to: %u kHz", ft2232_max_tck);
return ERROR_OK;
} }
#endif
static int ft2232_speed(int speed) static int ft2232_speed(int speed)
{ {
uint8_t buf[3]; uint8_t buf[3];
int retval; int retval;
uint32_t bytes_written; uint32_t bytes_written;
ft2232_adaptive_clocking(speed); retval = ERROR_OK;
bool enable_adaptive_clocking = (RTCK_SPEED == speed);
if (ft2232_device_is_highspeed())
retval = ft2232h_ft4232h_adaptive_clocking(enable_adaptive_clocking);
else if (enable_adaptive_clocking)
{
LOG_ERROR("ft2232 device %lu does not support RTCK"
, (long unsigned int)ftdi_device);
return ERROR_FAIL;
}
buf[0] = 0x86; /* command "set divisor" */ if ((enable_adaptive_clocking) || (ERROR_OK != retval))
buf[1] = speed & 0xff; /* valueL (0 = 6MHz, 1 = 3MHz, 2 = 2.0MHz, ...*/ return retval;
buf[2] = (speed >> 8) & 0xff; /* valueH */
buf[0] = 0x86; /* command "set divisor" */
buf[1] = speed & 0xff; /* valueL (0 = 6MHz, 1 = 3MHz, 2 = 2.0MHz, ...*/
buf[2] = (speed >> 8) & 0xff; /* valueH */
LOG_DEBUG("%2.2x %2.2x %2.2x", buf[0], buf[1], buf[2]); LOG_DEBUG("%2.2x %2.2x %2.2x", buf[0], buf[1], buf[2]);
if (((retval = ft2232_write(buf, 3, &bytes_written)) != ERROR_OK) || (bytes_written != 3)) if (((retval = ft2232_write(buf, 3, &bytes_written)) != ERROR_OK) || (bytes_written != 3))
@ -484,32 +506,35 @@ static int ft2232_speed(int speed)
return ERROR_OK; return ERROR_OK;
} }
static int ft2232_speed_div(int speed, int* khz) static int ft2232_speed_div(int speed, int* khz)
{ {
/* Take a look in the FT2232 manual, /* Take a look in the FT2232 manual,
* AN2232C-01 Command Processor for * AN2232C-01 Command Processor for
* MPSSE and MCU Host Bus. Chapter 3.8 */ * MPSSE and MCU Host Bus. Chapter 3.8 */
*khz = ft2232_max_tck / (1 + speed); *khz = (RTCK_SPEED == speed) ? 0 : ft2232_max_tck / (1 + speed);
return ERROR_OK; return ERROR_OK;
} }
static int ft2232_khz(int khz, int* jtag_speed) static int ft2232_khz(int khz, int* jtag_speed)
{ {
if (khz == 0) if (khz == 0)
{ {
#ifdef BUILD_FTD2XX_HIGHSPEED if (ft2232_device_is_highspeed())
*jtag_speed = 0; {
return ERROR_OK; *jtag_speed = RTCK_SPEED;
#else return ERROR_OK;
LOG_DEBUG("RCLK not supported"); }
LOG_DEBUG("If you have a high-speed FTDI device, then " else
"OpenOCD may be built with --enable-ftd2xx-highspeed."); {
return ERROR_FAIL; LOG_DEBUG("RCLK not supported");
#ifndef BUILD_FT2232_HIGHSPEED
LOG_DEBUG("If you have a high-speed FTDI device, then "
"OpenOCD may be built with --enable-ft2232-highspeed.");
#endif #endif
return ERROR_FAIL;
}
} }
/* Take a look in the FT2232 manual, /* Take a look in the FT2232 manual,
@ -544,7 +569,6 @@ static int ft2232_khz(int khz, int* jtag_speed)
return ERROR_OK; return ERROR_OK;
} }
static int ft2232_register_commands(struct command_context_s* cmd_ctx) static int ft2232_register_commands(struct command_context_s* cmd_ctx)
{ {
register_command(cmd_ctx, NULL, "ft2232_device_desc", ft2232_handle_device_desc_command, register_command(cmd_ctx, NULL, "ft2232_device_desc", ft2232_handle_device_desc_command,
@ -560,7 +584,6 @@ static int ft2232_register_commands(struct command_context_s* cmd_ctx)
return ERROR_OK; return ERROR_OK;
} }
static void ft2232_end_state(tap_state_t state) static void ft2232_end_state(tap_state_t state)
{ {
if (tap_is_state_stable(state)) if (tap_is_state_stable(state))
@ -595,11 +618,10 @@ static void ft2232_read_scan(enum scan_type type, uint8_t* buffer, int scan_size
buffer[cur_byte] = (buffer[cur_byte] | (((buffer_read()) << 1) & 0x80)) >> (8 - bits_left); buffer[cur_byte] = (buffer[cur_byte] | (((buffer_read()) << 1) & 0x80)) >> (8 - bits_left);
} }
static void ft2232_debug_dump_buffer(void) static void ft2232_debug_dump_buffer(void)
{ {
int i; int i;
char line[256]; char line[256];
char* line_p = line; char* line_p = line;
for (i = 0; i < ft2232_buffer_size; i++) for (i = 0; i < ft2232_buffer_size; i++)
@ -616,16 +638,15 @@ static void ft2232_debug_dump_buffer(void)
LOG_DEBUG("%s", line); LOG_DEBUG("%s", line);
} }
static int ft2232_send_and_recv(jtag_command_t* first, jtag_command_t* last) static int ft2232_send_and_recv(jtag_command_t* first, jtag_command_t* last)
{ {
jtag_command_t* cmd; jtag_command_t* cmd;
uint8_t* buffer; uint8_t* buffer;
int scan_size; int scan_size;
enum scan_type type; enum scan_type type;
int retval; int retval;
uint32_t bytes_written = 0; uint32_t bytes_written = 0;
uint32_t bytes_read = 0; uint32_t bytes_read = 0;
#ifdef _DEBUG_USB_IO_ #ifdef _DEBUG_USB_IO_
struct timeval start, inter, inter2, end; struct timeval start, inter, inter2, end;
@ -735,7 +756,6 @@ static int ft2232_send_and_recv(jtag_command_t* first, jtag_command_t* last)
return retval; return retval;
} }
/** /**
* Function ft2232_add_pathmove * Function ft2232_add_pathmove
* moves the TAP controller from the current state to a new state through the * moves the TAP controller from the current state to a new state through the
@ -777,7 +797,6 @@ static void ft2232_add_pathmove(tap_state_t* path, int num_states)
tap_set_end_state(tap_get_state()); tap_set_end_state(tap_get_state());
} }
static void ft2232_add_scan(bool ir_scan, enum scan_type type, uint8_t* buffer, int scan_size) static void ft2232_add_scan(bool ir_scan, enum scan_type type, uint8_t* buffer, int scan_size)
{ {
int num_bytes = (scan_size + 7) / 8; int num_bytes = (scan_size + 7) / 8;
@ -936,7 +955,6 @@ static void ft2232_add_scan(bool ir_scan, enum scan_type type, uint8_t* buffer,
} }
} }
static int ft2232_large_scan(scan_command_t* cmd, enum scan_type type, uint8_t* buffer, int scan_size) static int ft2232_large_scan(scan_command_t* cmd, enum scan_type type, uint8_t* buffer, int scan_size)
{ {
int num_bytes = (scan_size + 7) / 8; int num_bytes = (scan_size + 7) / 8;
@ -1151,7 +1169,6 @@ static int ft2232_large_scan(scan_command_t* cmd, enum scan_type type, uint8_t*
return ERROR_OK; return ERROR_OK;
} }
static int ft2232_predict_scan_out(int scan_size, enum scan_type type) static int ft2232_predict_scan_out(int scan_size, enum scan_type type)
{ {
int predicted_size = 3; int predicted_size = 3;
@ -1160,7 +1177,7 @@ static int ft2232_predict_scan_out(int scan_size, enum scan_type type)
if (tap_get_state() != TAP_DRSHIFT) if (tap_get_state() != TAP_DRSHIFT)
predicted_size += get_tms_buffer_requirements(tap_get_tms_path_len(tap_get_state(), TAP_DRSHIFT)); predicted_size += get_tms_buffer_requirements(tap_get_tms_path_len(tap_get_state(), TAP_DRSHIFT));
if (type == SCAN_IN) /* only from device to host */ if (type == SCAN_IN) /* only from device to host */
{ {
/* complete bytes */ /* complete bytes */
predicted_size += CEIL(num_bytes, 65536) * 3; predicted_size += CEIL(num_bytes, 65536) * 3;
@ -1168,7 +1185,7 @@ static int ft2232_predict_scan_out(int scan_size, enum scan_type type)
/* remaining bits - 1 (up to 7) */ /* remaining bits - 1 (up to 7) */
predicted_size += ((scan_size - 1) % 8) ? 2 : 0; predicted_size += ((scan_size - 1) % 8) ? 2 : 0;
} }
else /* host to device, or bidirectional */ else /* host to device, or bidirectional */
{ {
/* complete bytes */ /* complete bytes */
predicted_size += num_bytes + CEIL(num_bytes, 65536) * 3; predicted_size += num_bytes + CEIL(num_bytes, 65536) * 3;
@ -1180,7 +1197,6 @@ static int ft2232_predict_scan_out(int scan_size, enum scan_type type)
return predicted_size; return predicted_size;
} }
static int ft2232_predict_scan_in(int scan_size, enum scan_type type) static int ft2232_predict_scan_in(int scan_size, enum scan_type type)
{ {
int predicted_size = 0; int predicted_size = 0;
@ -1202,38 +1218,37 @@ static int ft2232_predict_scan_in(int scan_size, enum scan_type type)
return predicted_size; return predicted_size;
} }
static void usbjtag_reset(int trst, int srst) static void usbjtag_reset(int trst, int srst)
{ {
enum reset_types jtag_reset_config = jtag_get_reset_config(); enum reset_types jtag_reset_config = jtag_get_reset_config();
if (trst == 1) if (trst == 1)
{ {
if (jtag_reset_config & RESET_TRST_OPEN_DRAIN) if (jtag_reset_config & RESET_TRST_OPEN_DRAIN)
low_direction |= nTRSTnOE; /* switch to output pin (output is low) */ low_direction |= nTRSTnOE; /* switch to output pin (output is low) */
else else
low_output &= ~nTRST; /* switch output low */ low_output &= ~nTRST; /* switch output low */
} }
else if (trst == 0) else if (trst == 0)
{ {
if (jtag_reset_config & RESET_TRST_OPEN_DRAIN) if (jtag_reset_config & RESET_TRST_OPEN_DRAIN)
low_direction &= ~nTRSTnOE; /* switch to input pin (high-Z + internal and external pullup) */ low_direction &= ~nTRSTnOE; /* switch to input pin (high-Z + internal and external pullup) */
else else
low_output |= nTRST; /* switch output high */ low_output |= nTRST; /* switch output high */
} }
if (srst == 1) if (srst == 1)
{ {
if (jtag_reset_config & RESET_SRST_PUSH_PULL) if (jtag_reset_config & RESET_SRST_PUSH_PULL)
low_output &= ~nSRST; /* switch output low */ low_output &= ~nSRST; /* switch output low */
else else
low_direction |= nSRSTnOE; /* switch to output pin (output is low) */ low_direction |= nSRSTnOE; /* switch to output pin (output is low) */
} }
else if (srst == 0) else if (srst == 0)
{ {
if (jtag_reset_config & RESET_SRST_PUSH_PULL) if (jtag_reset_config & RESET_SRST_PUSH_PULL)
low_output |= nSRST; /* switch output high */ low_output |= nSRST; /* switch output high */
else else
low_direction &= ~nSRSTnOE; /* switch to input pin (high-Z) */ low_direction &= ~nSRSTnOE; /* switch to input pin (high-Z) */
} }
/* command "set data bits low byte" */ /* command "set data bits low byte" */
@ -1242,7 +1257,6 @@ static void usbjtag_reset(int trst, int srst)
buffer_write(low_direction); buffer_write(low_direction);
} }
static void jtagkey_reset(int trst, int srst) static void jtagkey_reset(int trst, int srst)
{ {
enum reset_types jtag_reset_config = jtag_get_reset_config(); enum reset_types jtag_reset_config = jtag_get_reset_config();
@ -1284,7 +1298,6 @@ static void jtagkey_reset(int trst, int srst)
high_direction); high_direction);
} }
static void olimex_jtag_reset(int trst, int srst) static void olimex_jtag_reset(int trst, int srst)
{ {
enum reset_types jtag_reset_config = jtag_get_reset_config(); enum reset_types jtag_reset_config = jtag_get_reset_config();
@ -1320,7 +1333,6 @@ static void olimex_jtag_reset(int trst, int srst)
high_direction); high_direction);
} }
static void axm0432_jtag_reset(int trst, int srst) static void axm0432_jtag_reset(int trst, int srst)
{ {
if (trst == 1) if (trst == 1)
@ -1350,7 +1362,6 @@ static void axm0432_jtag_reset(int trst, int srst)
high_direction); high_direction);
} }
static void flyswatter_reset(int trst, int srst) static void flyswatter_reset(int trst, int srst)
{ {
if (trst == 1) if (trst == 1)
@ -1378,7 +1389,6 @@ static void flyswatter_reset(int trst, int srst)
LOG_DEBUG("trst: %i, srst: %i, low_output: 0x%2.2x, low_direction: 0x%2.2x", trst, srst, low_output, low_direction); LOG_DEBUG("trst: %i, srst: %i, low_output: 0x%2.2x, low_direction: 0x%2.2x", trst, srst, low_output, low_direction);
} }
static void turtle_reset(int trst, int srst) static void turtle_reset(int trst, int srst)
{ {
trst = trst; trst = trst;
@ -1399,7 +1409,6 @@ static void turtle_reset(int trst, int srst)
LOG_DEBUG("srst: %i, low_output: 0x%2.2x, low_direction: 0x%2.2x", srst, low_output, low_direction); LOG_DEBUG("srst: %i, low_output: 0x%2.2x, low_direction: 0x%2.2x", srst, low_output, low_direction);
} }
static void comstick_reset(int trst, int srst) static void comstick_reset(int trst, int srst)
{ {
if (trst == 1) if (trst == 1)
@ -1428,7 +1437,6 @@ static void comstick_reset(int trst, int srst)
high_direction); high_direction);
} }
static void stm32stick_reset(int trst, int srst) static void stm32stick_reset(int trst, int srst)
{ {
if (trst == 1) if (trst == 1)
@ -1462,8 +1470,6 @@ static void stm32stick_reset(int trst, int srst)
high_direction); high_direction);
} }
static void sheevaplug_reset(int trst, int srst) static void sheevaplug_reset(int trst, int srst)
{ {
if (trst == 1) if (trst == 1)
@ -1485,8 +1491,8 @@ static void sheevaplug_reset(int trst, int srst)
static int ft2232_execute_runtest(jtag_command_t *cmd) static int ft2232_execute_runtest(jtag_command_t *cmd)
{ {
int retval; int retval;
int i; int i;
int predicted_size = 0; int predicted_size = 0;
retval = ERROR_OK; retval = ERROR_OK;
@ -1549,7 +1555,6 @@ static int ft2232_execute_runtest(jtag_command_t *cmd)
return retval; return retval;
} }
static int ft2232_execute_statemove(jtag_command_t *cmd) static int ft2232_execute_statemove(jtag_command_t *cmd)
{ {
int predicted_size = 0; int predicted_size = 0;
@ -1588,8 +1593,7 @@ static int ft2232_execute_pathmove(jtag_command_t *cmd)
DEBUG_JTAG_IO("pathmove: %i states, current: %s end: %s", num_states, DEBUG_JTAG_IO("pathmove: %i states, current: %s end: %s", num_states,
tap_state_name(tap_get_state()), tap_state_name(tap_get_state()),
tap_state_name(path[num_states-1]) tap_state_name(path[num_states-1]));
);
/* only send the maximum buffer size that FT2232C can handle */ /* only send the maximum buffer size that FT2232C can handle */
predicted_size = 3 * CEIL(num_states, 7); predicted_size = 3 * CEIL(num_states, 7);
@ -1608,13 +1612,12 @@ static int ft2232_execute_pathmove(jtag_command_t *cmd)
return retval; return retval;
} }
static int ft2232_execute_scan(jtag_command_t *cmd) static int ft2232_execute_scan(jtag_command_t *cmd)
{ {
uint8_t* buffer; uint8_t* buffer;
int scan_size; /* size of IR or DR scan */ int scan_size; /* size of IR or DR scan */
int predicted_size = 0; int predicted_size = 0;
int retval = ERROR_OK; int retval = ERROR_OK;
enum scan_type type = jtag_scan_type(cmd->cmd.scan); enum scan_type type = jtag_scan_type(cmd->cmd.scan);
@ -1667,8 +1670,8 @@ static int ft2232_execute_scan(jtag_command_t *cmd)
static int ft2232_execute_reset(jtag_command_t *cmd) static int ft2232_execute_reset(jtag_command_t *cmd)
{ {
int retval; int retval;
int predicted_size = 0; int predicted_size = 0;
retval = ERROR_OK; retval = ERROR_OK;
DEBUG_JTAG_IO("reset trst: %i srst %i", DEBUG_JTAG_IO("reset trst: %i srst %i",
@ -1695,7 +1698,7 @@ static int ft2232_execute_reset(jtag_command_t *cmd)
static int ft2232_execute_sleep(jtag_command_t *cmd) static int ft2232_execute_sleep(jtag_command_t *cmd)
{ {
int retval; int retval;
retval = ERROR_OK; retval = ERROR_OK;
DEBUG_JTAG_IO("sleep %i", cmd->cmd.sleep->us); DEBUG_JTAG_IO("sleep %i", cmd->cmd.sleep->us);
@ -1713,7 +1716,7 @@ static int ft2232_execute_sleep(jtag_command_t *cmd)
static int ft2232_execute_stableclocks(jtag_command_t *cmd) static int ft2232_execute_stableclocks(jtag_command_t *cmd)
{ {
int retval; int retval;
retval = ERROR_OK; retval = ERROR_OK;
/* this is only allowed while in a stable state. A check for a stable /* this is only allowed while in a stable state. A check for a stable
@ -1730,7 +1733,7 @@ static int ft2232_execute_stableclocks(jtag_command_t *cmd)
static int ft2232_execute_command(jtag_command_t *cmd) static int ft2232_execute_command(jtag_command_t *cmd)
{ {
int retval; int retval;
retval = ERROR_OK; retval = ERROR_OK;
switch (cmd->type) switch (cmd->type)
@ -1751,10 +1754,10 @@ static int ft2232_execute_command(jtag_command_t *cmd)
static int ft2232_execute_queue() static int ft2232_execute_queue()
{ {
jtag_command_t* cmd = jtag_command_queue; /* currently processed command */ jtag_command_t* cmd = jtag_command_queue; /* currently processed command */
int retval; int retval;
first_unsent = cmd; /* next command that has to be sent */ first_unsent = cmd; /* next command that has to be sent */
require_send = 0; require_send = 0;
/* return ERROR_OK, unless ft2232_send_and_recv reports a failed check /* return ERROR_OK, unless ft2232_send_and_recv reports a failed check
@ -1790,7 +1793,6 @@ static int ft2232_execute_queue()
return retval; return retval;
} }
#if BUILD_FT2232_FTD2XX == 1 #if BUILD_FT2232_FTD2XX == 1
static int ft2232_init_ftd2xx(uint16_t vid, uint16_t pid, int more, int* try_more) static int ft2232_init_ftd2xx(uint16_t vid, uint16_t pid, int more, int* try_more)
{ {
@ -1838,18 +1840,18 @@ static int ft2232_init_ftd2xx(uint16_t vid, uint16_t pid, int more, int* try_mor
status = FT_OpenEx(openex_string, openex_flags, &ftdih); status = FT_OpenEx(openex_string, openex_flags, &ftdih);
if (status != FT_OK) { if (status != FT_OK) {
// under Win32, the FTD2XX driver appends an "A" to the end /* under Win32, the FTD2XX driver appends an "A" to the end
// of the description, if we tried by the desc, then * of the description, if we tried by the desc, then
// try by the alternate "A" description. * try by the alternate "A" description. */
if (openex_string == ft2232_device_desc) { if (openex_string == ft2232_device_desc) {
// Try the alternate method. /* Try the alternate method. */
openex_string = ft2232_device_desc_A; openex_string = ft2232_device_desc_A;
status = FT_OpenEx(openex_string, openex_flags, &ftdih); status = FT_OpenEx(openex_string, openex_flags, &ftdih);
if (status == FT_OK) { if (status == FT_OK) {
// yea, the "alternate" method worked! /* yea, the "alternate" method worked! */
} else { } else {
// drat, give the user a meaningfull message. /* drat, give the user a meaningfull message.
// telling the use we tried *BOTH* methods. * telling the use we tried *BOTH* methods. */
LOG_WARNING("Unable to open FTDI Device tried: '%s' and '%s'\n", LOG_WARNING("Unable to open FTDI Device tried: '%s' and '%s'\n",
ft2232_device_desc, ft2232_device_desc,
ft2232_device_desc_A); ft2232_device_desc_A);
@ -1935,24 +1937,20 @@ static int ft2232_init_ftd2xx(uint16_t vid, uint16_t pid, int more, int* try_mor
} }
else else
{ {
LOG_INFO("device: %lu", ftdi_device); static const char* type_str[] =
{"BM", "AM", "100AX", "UNKNOWN", "2232C", "232R", "2232H", "4232H"};
unsigned no_of_known_types = sizeof(type_str) / sizeof(type_str[0]) - 1;
unsigned type_index = ((unsigned)ftdi_device < no_of_known_types)
? ftdi_device : 3;
LOG_INFO("device: %lu \"%s\"", ftdi_device, type_str[type_index]);
LOG_INFO("deviceID: %lu", deviceID); LOG_INFO("deviceID: %lu", deviceID);
LOG_INFO("SerialNumber: %s", SerialNumber); LOG_INFO("SerialNumber: %s", SerialNumber);
LOG_INFO("Description: %s", Description); LOG_INFO("Description: %s", Description);
#ifdef BUILD_FTD2XX_HIGHSPEED
if (ft2232_device_is_highspeed())
{
ft2232_max_tck = FTDI_2232H_4232H_MAX_TCK;
LOG_INFO("max TCK change to: %u kHz", ft2232_max_tck);
}
#endif
} }
return ERROR_OK; return ERROR_OK;
} }
static int ft2232_purge_ftd2xx(void) static int ft2232_purge_ftd2xx(void)
{ {
FT_STATUS status; FT_STATUS status;
@ -1966,7 +1964,6 @@ static int ft2232_purge_ftd2xx(void)
return ERROR_OK; return ERROR_OK;
} }
#endif /* BUILD_FT2232_FTD2XX == 1 */ #endif /* BUILD_FT2232_FTD2XX == 1 */
#if BUILD_FT2232_LIBFTDI == 1 #if BUILD_FT2232_LIBFTDI == 1
@ -2024,10 +2021,16 @@ static int ft2232_init_libftdi(uint16_t vid, uint16_t pid, int more, int* try_mo
ftdi_set_bitmode(&ftdic, 0x0b, 2); /* ctx, JTAG I/O mask */ ftdi_set_bitmode(&ftdic, 0x0b, 2); /* ctx, JTAG I/O mask */
ftdi_device = ftdic.type;
static const char* type_str[] =
{"AM", "BM", "2232C", "R", "2232H", "4232H", "Unknown"};
unsigned no_of_known_types = sizeof(type_str) / sizeof(type_str[0]) - 1;
unsigned type_index = ((unsigned)ftdi_device < no_of_known_types)
? ftdi_device : no_of_known_types;
LOG_DEBUG("FTDI chip type: %i \"%s\"", (int)ftdi_device, type_str[type_index]);
return ERROR_OK; return ERROR_OK;
} }
static int ft2232_purge_libftdi(void) static int ft2232_purge_libftdi(void)
{ {
if (ftdi_usb_purge_buffers(&ftdic) < 0) if (ftdi_usb_purge_buffers(&ftdic) < 0)
@ -2039,7 +2042,6 @@ static int ft2232_purge_libftdi(void)
return ERROR_OK; return ERROR_OK;
} }
#endif /* BUILD_FT2232_LIBFTDI == 1 */ #endif /* BUILD_FT2232_LIBFTDI == 1 */
static int ft2232_init(void) static int ft2232_init(void)
@ -2114,6 +2116,12 @@ static int ft2232_init(void)
if (layout->init() != ERROR_OK) if (layout->init() != ERROR_OK)
return ERROR_JTAG_INIT_FAILED; return ERROR_JTAG_INIT_FAILED;
if (ft2232_device_is_highspeed())
{
if (ft2232h_ft4232h_clk_divide_by_5(false) != ERROR_OK)
return ERROR_JTAG_INIT_FAILED;
}
ft2232_speed(jtag_get_speed()); ft2232_speed(jtag_get_speed());
buf[0] = 0x85; /* Disconnect TDI/DO to TDO/DI for Loopback */ buf[0] = 0x85; /* Disconnect TDI/DO to TDO/DI for Loopback */
@ -2132,7 +2140,6 @@ static int ft2232_init(void)
return ERROR_OK; return ERROR_OK;
} }
static int usbjtag_init(void) static int usbjtag_init(void)
{ {
uint8_t buf[3]; uint8_t buf[3];
@ -2217,7 +2224,6 @@ static int usbjtag_init(void)
return ERROR_OK; return ERROR_OK;
} }
static int axm0432_jtag_init(void) static int axm0432_jtag_init(void)
{ {
uint8_t buf[3]; uint8_t buf[3];
@ -2288,7 +2294,6 @@ static int axm0432_jtag_init(void)
return ERROR_OK; return ERROR_OK;
} }
static int jtagkey_init(void) static int jtagkey_init(void)
{ {
uint8_t buf[3]; uint8_t buf[3];
@ -2371,7 +2376,6 @@ static int jtagkey_init(void)
return ERROR_OK; return ERROR_OK;
} }
static int olimex_jtag_init(void) static int olimex_jtag_init(void)
{ {
uint8_t buf[3]; uint8_t buf[3];
@ -2439,7 +2443,6 @@ static int olimex_jtag_init(void)
return ERROR_OK; return ERROR_OK;
} }
static int flyswatter_init(void) static int flyswatter_init(void)
{ {
uint8_t buf[3]; uint8_t buf[3];
@ -2486,7 +2489,6 @@ static int flyswatter_init(void)
return ERROR_OK; return ERROR_OK;
} }
static int turtle_init(void) static int turtle_init(void)
{ {
uint8_t buf[3]; uint8_t buf[3];
@ -2527,7 +2529,6 @@ static int turtle_init(void)
return ERROR_OK; return ERROR_OK;
} }
static int comstick_init(void) static int comstick_init(void)
{ {
uint8_t buf[3]; uint8_t buf[3];
@ -2571,7 +2572,6 @@ static int comstick_init(void)
return ERROR_OK; return ERROR_OK;
} }
static int stm32stick_init(void) static int stm32stick_init(void)
{ {
uint8_t buf[3]; uint8_t buf[3];
@ -2615,7 +2615,6 @@ static int stm32stick_init(void)
return ERROR_OK; return ERROR_OK;
} }
static int sheevaplug_init(void) static int sheevaplug_init(void)
{ {
uint8_t buf[3]; uint8_t buf[3];
@ -2731,7 +2730,6 @@ static void olimex_jtag_blink(void)
buffer_write(high_direction); buffer_write(high_direction);
} }
static void flyswatter_jtag_blink(void) static void flyswatter_jtag_blink(void)
{ {
/* /*
@ -2744,7 +2742,6 @@ static void flyswatter_jtag_blink(void)
buffer_write(high_direction); buffer_write(high_direction);
} }
static void turtle_jtag_blink(void) static void turtle_jtag_blink(void)
{ {
/* /*
@ -2764,7 +2761,6 @@ static void turtle_jtag_blink(void)
buffer_write(high_direction); buffer_write(high_direction);
} }
static int ft2232_quit(void) static int ft2232_quit(void)
{ {
#if BUILD_FT2232_FTD2XX == 1 #if BUILD_FT2232_FTD2XX == 1
@ -2783,7 +2779,6 @@ static int ft2232_quit(void)
return ERROR_OK; return ERROR_OK;
} }
static int ft2232_handle_device_desc_command(struct command_context_s* cmd_ctx, char* cmd, char** args, int argc) static int ft2232_handle_device_desc_command(struct command_context_s* cmd_ctx, char* cmd, char** args, int argc)
{ {
char *cp; char *cp;
@ -2792,20 +2787,20 @@ static int ft2232_handle_device_desc_command(struct command_context_s* cmd_ctx,
{ {
ft2232_device_desc = strdup(args[0]); ft2232_device_desc = strdup(args[0]);
cp = strchr(ft2232_device_desc, 0); cp = strchr(ft2232_device_desc, 0);
// under Win32, the FTD2XX driver appends an "A" to the end /* under Win32, the FTD2XX driver appends an "A" to the end
// of the description, this examines the given desc * of the description, this examines the given desc
// and creates the 'missing' _A or non_A variable. * and creates the 'missing' _A or non_A variable. */
if ((cp[-1] == 'A') && (cp[-2]==' ')) { if ((cp[-1] == 'A') && (cp[-2]==' ')) {
// it was, so make this the "A" version. /* it was, so make this the "A" version. */
ft2232_device_desc_A = ft2232_device_desc; ft2232_device_desc_A = ft2232_device_desc;
// and *CREATE* the non-A version. /* and *CREATE* the non-A version. */
strcpy(buf, ft2232_device_desc); strcpy(buf, ft2232_device_desc);
cp = strchr(buf, 0); cp = strchr(buf, 0);
cp[-2] = 0; cp[-2] = 0;
ft2232_device_desc = strdup(buf); ft2232_device_desc = strdup(buf);
} else { } else {
// <space > A not defined /* <space > A not defined
// so create it * so create it */
sprintf(buf, "%s A", ft2232_device_desc); sprintf(buf, "%s A", ft2232_device_desc);
ft2232_device_desc_A = strdup(buf); ft2232_device_desc_A = strdup(buf);
} }
@ -2818,7 +2813,6 @@ static int ft2232_handle_device_desc_command(struct command_context_s* cmd_ctx,
return ERROR_OK; return ERROR_OK;
} }
static int ft2232_handle_serial_command(struct command_context_s* cmd_ctx, char* cmd, char** args, int argc) static int ft2232_handle_serial_command(struct command_context_s* cmd_ctx, char* cmd, char** args, int argc)
{ {
if (argc == 1) if (argc == 1)
@ -2833,7 +2827,6 @@ static int ft2232_handle_serial_command(struct command_context_s* cmd_ctx, char*
return ERROR_OK; return ERROR_OK;
} }
static int ft2232_handle_layout_command(struct command_context_s* cmd_ctx, char* cmd, char** args, int argc) static int ft2232_handle_layout_command(struct command_context_s* cmd_ctx, char* cmd, char** args, int argc)
{ {
if (argc == 0) if (argc == 0)
@ -2845,7 +2838,6 @@ static int ft2232_handle_layout_command(struct command_context_s* cmd_ctx, char*
return ERROR_OK; return ERROR_OK;
} }
static int ft2232_handle_vid_pid_command(struct command_context_s* cmd_ctx, char* cmd, char** args, int argc) static int ft2232_handle_vid_pid_command(struct command_context_s* cmd_ctx, char* cmd, char** args, int argc)
{ {
if (argc > MAX_USB_IDS * 2) if (argc > MAX_USB_IDS * 2)
@ -2859,7 +2851,7 @@ static int ft2232_handle_vid_pid_command(struct command_context_s* cmd_ctx, char
LOG_WARNING("incomplete ft2232_vid_pid configuration directive"); LOG_WARNING("incomplete ft2232_vid_pid configuration directive");
if (argc < 2) if (argc < 2)
return ERROR_COMMAND_SYNTAX_ERROR; return ERROR_COMMAND_SYNTAX_ERROR;
// remove the incomplete trailing id /* remove the incomplete trailing id */
argc -= 1; argc -= 1;
} }
@ -2884,7 +2876,6 @@ static int ft2232_handle_vid_pid_command(struct command_context_s* cmd_ctx, char
return retval; return retval;
} }
static int ft2232_handle_latency_command(struct command_context_s* cmd_ctx, char* cmd, char** args, int argc) static int ft2232_handle_latency_command(struct command_context_s* cmd_ctx, char* cmd, char** args, int argc)
{ {
if (argc == 1) if (argc == 1)
@ -2899,7 +2890,6 @@ static int ft2232_handle_latency_command(struct command_context_s* cmd_ctx, char
return ERROR_OK; return ERROR_OK;
} }
static int ft2232_stableclocks(int num_cycles, jtag_command_t* cmd) static int ft2232_stableclocks(int num_cycles, jtag_command_t* cmd)
{ {
int retval = 0; int retval = 0;
@ -2942,7 +2932,6 @@ static int ft2232_stableclocks(int num_cycles, jtag_command_t* cmd)
return retval; return retval;
} }
/* --------------------------------------------------------------------- /* ---------------------------------------------------------------------
* Support for IceBear JTAG adapter from Section5: * Support for IceBear JTAG adapter from Section5:
* http://section5.ch/icebear * http://section5.ch/icebear