use ARRAY_SIZE macro
[fw/openocd] / src / jtag / ft2232.c
index d4e0fbcbf3261852b1772e3d90b121047930aeff..29b6389ced29d94a6fe7962f0feafb374a2b608a 100644 (file)
@@ -1,13 +1,16 @@
 /***************************************************************************
+*   Copyright (C) 2009 by Øyvind Harboe                                   *
+*      Øyvind Harboe <oyvind.harboe@zylin.com>                               *
+*                                                                         *
+*   Copyright (C) 2009 by SoftPLC Corporation.  http://softplc.com        *
+*      Dick Hollenbeck <dick@softplc.com>                                    *
+*                                                                         *
 *   Copyright (C) 2004, 2006 by Dominic Rath                              *
 *   Dominic.Rath@gmx.de                                                   *
 *                                                                         *
 *   Copyright (C) 2008 by Spencer Oliver                                  *
 *   spen@spen-soft.co.uk                                                  *
 *                                                                         *
-*   Copyright (C) 2009 by SoftPLC Corporation.  http://softplc.com        *
-*      Dick Hollenbeck <dick@softplc.com>                                    *
-*                                                                         *
 *   This program is free software; you can redistribute it and/or modify  *
 *   it under the terms of the GNU General Public License as published by  *
 *   the Free Software Foundation; either version 2 of the License, or     *
@@ -24,7 +27,6 @@
 *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
 ***************************************************************************/
 
-
 /* This code uses information contained in the MPSSE specification which was
  * found here:
  * http://www.ftdichip.com/Documents/AppNotes/AN2232C-01_MPSSE_Cmnd.pdf
@@ -34,7 +36,6 @@
  * http://www.ftdichip.com/Documents/DataSheets/DS_FT2232D.pdf
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -50,7 +51,7 @@
 
 #include <assert.h>
 
-#if (BUILD_FT2232_FTD2XX==1 && BUILD_FT2232_LIBFTDI==1)
+#if (BUILD_FT2232_FTD2XX == 1 && BUILD_FT2232_LIBFTDI == 1)
 #error "BUILD_FT2232_FTD2XX && BUILD_FT2232_LIBFTDI are mutually exclusive"
 #elif (BUILD_FT2232_FTD2XX != 1 && BUILD_FT2232_LIBFTDI != 1)
 #error "BUILD_FT2232_FTD2XX || BUILD_FT2232_LIBFTDI must be chosen"
 
 /* max TCK for the high speed devices 30000 kHz */
 #define        FTDI_2232H_4232H_MAX_TCK        30000
-
-static int ft2232_execute_queue(void);
-
-static int ft2232_speed(int speed);
-static int ft2232_speed_div(int speed, int* khz);
-static int ft2232_khz(int khz, int* jtag_speed);
-static int ft2232_register_commands(struct command_context_s* cmd_ctx);
-static int ft2232_init(void);
-static int ft2232_quit(void);
-
-static int ft2232_handle_device_desc_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);
-static int ft2232_handle_layout_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);
-
+/* 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
+
+/*
+ * On my Athlon XP 1900+ EHCI host with FT2232H JTAG dongle I get read timeout
+ * errors with a retry count of 100. Increasing it solves the problem for me.
+ *     - Dimitar
+ *
+ * FIXME There's likely an issue with the usb_read_timeout from libftdi.
+ * Fix that (libusb? kernel? libftdi? here?) and restore the retry count
+ * to something sane.
+ */
+#define LIBFTDI_READ_RETRY_COUNT               2000
+
+#ifndef BUILD_FT2232_HIGHSPEED
+ #if BUILD_FT2232_FTD2XX == 1
+       enum { FT_DEVICE_2232H = 6, FT_DEVICE_4232H };
+ #elif BUILD_FT2232_LIBFTDI == 1
+       enum { TYPE_2232H = 4, TYPE_4232H = 5 };
+ #endif
+#endif
 
 /**
  * Send out \a num_cycles on the TCK line while the TAP(s) are in a
@@ -92,31 +100,26 @@ static int ft2232_handle_latency_command(struct command_context_s* cmd_ctx, char
  *
  * @returns ERROR_OK on success, or ERROR_JTAG_QUEUE_FAILED on failure.
  */
-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 int ft2232_stableclocks(int num_cycles, struct jtag_command* cmd);
 
 static char *       ft2232_device_desc_A = NULL;
 static char*        ft2232_device_desc = NULL;
 static char*        ft2232_serial  = NULL;
 static char*        ft2232_layout  = NULL;
 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
 /* vid = pid = 0 marks the end of the list */
 static uint16_t ft2232_vid[MAX_USB_IDS + 1] = { 0x0403, 0 };
 static uint16_t ft2232_pid[MAX_USB_IDS + 1] = { 0x6010, 0 };
 
-typedef struct ft2232_layout_s
-{
+struct ft2232_layout {
        char* name;
        int (*init)(void);
        void (*reset)(int trst, int srst);
        void (*blink)(void);
-} ft2232_layout_t;
+};
 
 /* init procedures for supported layouts */
 static int usbjtag_init(void);
@@ -130,6 +133,8 @@ static int axm0432_jtag_init(void);
 static int sheevaplug_init(void);
 static int icebear_jtag_init(void);
 static int cortino_jtag_init(void);
+static int signalyzer_h_init(void);
+static int ktlink_init(void);
 
 /* reset procedures for supported layouts */
 static void usbjtag_reset(int trst, int srst);
@@ -142,13 +147,17 @@ static void stm32stick_reset(int trst, int srst);
 static void axm0432_jtag_reset(int trst, int srst);
 static void sheevaplug_reset(int trst, int srst);
 static void icebear_jtag_reset(int trst, int srst);
+static void signalyzer_h_reset(int trst, int srst);
+static void ktlink_reset(int trst, int srst);
 
 /* blink procedures for layouts that support a blinking led */
 static void olimex_jtag_blink(void);
 static void flyswatter_jtag_blink(void);
 static void turtle_jtag_blink(void);
+static void signalyzer_h_blink(void);
+static void ktlink_blink(void);
 
-static const ft2232_layout_t  ft2232_layouts[] =
+static const struct ft2232_layout  ft2232_layouts[] =
 {
        { "usbjtag",              usbjtag_init,              usbjtag_reset,      NULL                    },
        { "jtagkey",              jtagkey_init,              jtagkey_reset,      NULL                    },
@@ -156,6 +165,7 @@ static const ft2232_layout_t  ft2232_layouts[] =
        { "oocdlink",             jtagkey_init,              jtagkey_reset,      NULL                    },
        { "signalyzer",           usbjtag_init,              usbjtag_reset,      NULL                    },
        { "evb_lm3s811",          usbjtag_init,              usbjtag_reset,      NULL                    },
+       { "luminary_icdi",        usbjtag_init,              usbjtag_reset,      NULL                    },
        { "olimex-jtag",          olimex_jtag_init,          olimex_jtag_reset,  olimex_jtag_blink       },
        { "flyswatter",           flyswatter_init,           flyswatter_reset,   flyswatter_jtag_blink   },
        { "turtelizer2",          turtle_init,               turtle_reset,       turtle_jtag_blink       },
@@ -165,12 +175,14 @@ static const ft2232_layout_t  ft2232_layouts[] =
        { "sheevaplug",           sheevaplug_init,           sheevaplug_reset,   NULL                    },
        { "icebear",              icebear_jtag_init,         icebear_jtag_reset, NULL                    },
        { "cortino",              cortino_jtag_init,         comstick_reset, NULL                        },
+       { "signalyzer-h",         signalyzer_h_init,         signalyzer_h_reset, signalyzer_h_blink      },
+       { "ktlink",               ktlink_init,               ktlink_reset,       ktlink_blink            },
        { NULL,                   NULL,                      NULL,               NULL                    },
 };
 
 static uint8_t                  nTRST, nTRSTnOE, nSRST, nSRSTnOE;
 
-static const ft2232_layout_t *layout;
+static const struct ft2232_layout *layout;
 static uint8_t                  low_output     = 0x0;
 static uint8_t                  low_direction  = 0x0;
 static uint8_t                  high_output    = 0x0;
@@ -181,14 +193,13 @@ static FT_HANDLE  ftdih = NULL;
 static FT_DEVICE       ftdi_device = 0;
 #elif BUILD_FT2232_LIBFTDI == 1
 static struct ftdi_context ftdic;
+static enum ftdi_chip_type ftdi_device;
 #endif
 
-
-static jtag_command_t* first_unsent;        /* next command that has to be sent */
+static struct jtag_command* first_unsent;        /* next command that has to be sent */
 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
        one allows to schedule up to 64*64 bytes of result data while libftdi fails
@@ -231,7 +242,6 @@ static inline uint8_t buffer_read(void)
        return ft2232_buffer[ft2232_read_pointer++];
 }
 
-
 /**
  * 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.
@@ -257,7 +267,8 @@ static void clock_tms(uint8_t mpsse_cmd, int tms_bits, int tms_count, bool tdi_b
 
        assert(tms_count > 0);
 
-//     LOG_DEBUG("mpsse cmd=%02x, tms_bits=0x%08x, bit_count=%d", mpsse_cmd, tms_bits, tms_count);
+       DEBUG_JTAG_IO("mpsse cmd=%02x, tms_bits = 0x%08x, bit_count=%d",
+                       mpsse_cmd, tms_bits, tms_count);
 
        for (tms_byte = tms_ndx = i = 0;   i < tms_count;   ++i, tms_bits>>=1)
        {
@@ -274,7 +285,7 @@ static void clock_tms(uint8_t mpsse_cmd, int tms_bits, int tms_count, bool tdi_b
                */
                ++tms_ndx;
 
-               if (tms_ndx==7  || i==tms_count-1)
+               if (tms_ndx == 7  || i == tms_count-1)
                {
                        buffer_write(mpsse_cmd);
                        buffer_write(tms_ndx - 1);
@@ -287,7 +298,6 @@ static void clock_tms(uint8_t mpsse_cmd, int tms_bits, int tms_count, bool tdi_b
        }
 }
 
-
 /**
  * Function get_tms_buffer_requirements
  * returns what clock_tms() will consume if called with
@@ -298,7 +308,6 @@ static inline int get_tms_buffer_requirements(int bit_count)
        return ((bit_count + 6)/7) * 3;
 }
 
-
 /**
  * Function move_to_state
  * moves the TAP controller from the current state to a
@@ -325,24 +334,11 @@ static void move_to_state(tap_state_t goal_state)
        clock_tms(0x4b,  tms_bits, tms_count, 0);
 }
 
-
-jtag_interface_t ft2232_interface =
-{
-       .name                   = "ft2232",
-       .execute_queue          = ft2232_execute_queue,
-       .speed                  = ft2232_speed,
-       .speed_div              = ft2232_speed_div,
-       .khz                    = ft2232_khz,
-       .register_commands      = ft2232_register_commands,
-       .init                   = ft2232_init,
-       .quit                   = ft2232_quit,
-};
-
 static int ft2232_write(uint8_t* buf, int size, uint32_t* bytes_written)
 {
 #if BUILD_FT2232_FTD2XX == 1
        FT_STATUS status;
-       DWORD   dw_bytes_written;
+       DWORD dw_bytes_written;
        if ((status = FT_Write(ftdih, buf, size, &dw_bytes_written)) != FT_OK)
        {
                *bytes_written = dw_bytes_written;
@@ -370,13 +366,12 @@ static int ft2232_write(uint8_t* buf, int size, uint32_t* bytes_written)
 #endif
 }
 
-
 static int ft2232_read(uint8_t* buf, uint32_t size, uint32_t* bytes_read)
 {
 #if BUILD_FT2232_FTD2XX == 1
-       DWORD     dw_bytes_read;
+       DWORD dw_bytes_read;
        FT_STATUS status;
-       int       timeout = 5;
+       int timeout = 5;
        *bytes_read = 0;
 
        while ((*bytes_read < size) && timeout--)
@@ -393,7 +388,7 @@ static int ft2232_read(uint8_t* buf, uint32_t size, uint32_t* bytes_read)
 
 #elif BUILD_FT2232_LIBFTDI == 1
        int retval;
-       int timeout = 100;
+       int timeout = LIBFTDI_READ_RETRY_COUNT;
        *bytes_read = 0;
 
        while ((*bytes_read < size) && timeout--)
@@ -411,67 +406,93 @@ static int ft2232_read(uint8_t* buf, uint32_t size, uint32_t* bytes_read)
 
        if (*bytes_read < size)
        {
-               LOG_ERROR("couldn't read the requested number of bytes from FT2232 device (%i < %i)", 
-                         (unsigned int)(*bytes_read), 
-                         (unsigned int)size);
+               LOG_ERROR("couldn't read enough bytes from "
+                               "FT2232 device (%i < %i)",
+                               (unsigned)*bytes_read,
+                               (unsigned)size);
                return ERROR_JTAG_DEVICE_ERROR;
        }
 
        return ERROR_OK;
 }
 
-#ifdef BUILD_FTD2XX_HIGHSPEED
 static bool ft2232_device_is_highspeed(void)
 {
+#if BUILD_FT2232_FTD2XX == 1
        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
 }
 
-static int ft2232_adaptive_clocking(int speed)
-{
-       bool use_adaptive_clocking = FALSE;
-       if (0 == speed)
-       {
-               if (ft2232_device_is_highspeed())
-                       use_adaptive_clocking = TRUE;
-               else
-               {
-                       LOG_ERROR("ft2232 device %lu does not support RTCK", ftdi_device);
-                       return ERROR_OK;
-               }
-       }
+/*
+ * Commands that only apply to the FT2232H and FT4232H devices.
+ * See chapter 6 in http://www.ftdichip.com/Documents/AppNotes/
+ * AN_108_Command_Processor_for_MPSSE_and_MCU_Host_Bus_Emulation_Modes.pdf
+ */
 
-       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);
 
        uint32_t 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 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
-       return speed ? ERROR_OK : -1234;
+       uint32_t bytes_written;
+       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)
 {
-       uint8_t  buf[3];
+       uint8_t buf[3];
        int retval;
        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;
+       }
+
+       if ((enable_adaptive_clocking) || (ERROR_OK != retval))
+               return retval;
 
-       buf[0] = 0x86;                  /* command "set divisor" */
-       buf[1] = speed & 0xff;          /* valueL (0=6MHz, 1=3MHz, 2=2.0MHz, ...*/
-       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]);
        if (((retval = ft2232_write(buf, 3, &bytes_written)) != ERROR_OK) || (bytes_written != 3))
@@ -483,32 +504,31 @@ static int ft2232_speed(int speed)
        return ERROR_OK;
 }
 
-
 static int ft2232_speed_div(int speed, int* khz)
 {
        /* Take a look in the FT2232 manual,
         * AN2232C-01 Command Processor for
         * 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;
 }
 
-
 static int ft2232_khz(int khz, int* jtag_speed)
 {
-       if (khz==0)
+       if (khz == 0)
        {
-#ifdef BUILD_FTD2XX_HIGHSPEED
-               *jtag_speed = 0;
-               return ERROR_OK;
-#else
-               LOG_DEBUG("RCLK not supported");
-               LOG_DEBUG("If you have a high-speed FTDI device, then "
-                       "OpenOCD may be built with --enable-ftd2xx-highspeed.");
-               return ERROR_FAIL;
-#endif
+               if (ft2232_device_is_highspeed())
+               {
+                       *jtag_speed = RTCK_SPEED;
+                       return ERROR_OK;
+               }
+               else
+               {
+                       LOG_DEBUG("RCLK not supported");
+                       return ERROR_FAIL;
+               }
        }
 
        /* Take a look in the FT2232 manual,
@@ -543,23 +563,6 @@ static int ft2232_khz(int khz, int* jtag_speed)
        return ERROR_OK;
 }
 
-
-static int ft2232_register_commands(struct command_context_s* cmd_ctx)
-{
-       register_command(cmd_ctx, NULL, "ft2232_device_desc", ft2232_handle_device_desc_command,
-                       COMMAND_CONFIG, "the USB device description of the FTDI FT2232 device");
-       register_command(cmd_ctx, NULL, "ft2232_serial", ft2232_handle_serial_command,
-                       COMMAND_CONFIG, "the serial number of the FTDI FT2232 device");
-       register_command(cmd_ctx, NULL, "ft2232_layout", ft2232_handle_layout_command,
-                       COMMAND_CONFIG, "the layout of the FT2232 GPIO signals used to control output-enables and reset signals");
-       register_command(cmd_ctx, NULL, "ft2232_vid_pid", ft2232_handle_vid_pid_command,
-                       COMMAND_CONFIG, "the vendor ID and product ID of the FTDI FT2232 device");
-       register_command(cmd_ctx, NULL, "ft2232_latency", ft2232_handle_latency_command,
-                       COMMAND_CONFIG, "set the FT2232 latency timer to a new value");
-       return ERROR_OK;
-}
-
-
 static void ft2232_end_state(tap_state_t state)
 {
        if (tap_is_state_stable(state))
@@ -594,11 +597,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);
 }
 
-
 static void ft2232_debug_dump_buffer(void)
 {
-       int   i;
-       char  line[256];
+       int i;
+       char line[256];
        char* line_p = line;
 
        for (i = 0; i < ft2232_buffer_size; i++)
@@ -615,16 +617,15 @@ static void ft2232_debug_dump_buffer(void)
                LOG_DEBUG("%s", line);
 }
 
-
-static int ft2232_send_and_recv(jtag_command_t* first, jtag_command_t* last)
+static int ft2232_send_and_recv(struct jtag_command* first, struct jtag_command* last)
 {
-       jtag_command_t* cmd;
-       uint8_t*             buffer;
-       int             scan_size;
+       struct jtag_command* cmd;
+       uint8_t* buffer;
+       int scan_size;
        enum scan_type  type;
-       int             retval;
-       uint32_t             bytes_written=0;
-       uint32_t             bytes_read=0;
+       int retval;
+       uint32_t bytes_written = 0;
+       uint32_t bytes_read = 0;
 
 #ifdef _DEBUG_USB_IO_
        struct timeval  start, inter, inter2, end;
@@ -652,7 +653,8 @@ static int ft2232_send_and_recv(jtag_command_t* first, jtag_command_t* last)
 
        if (ft2232_expect_read)
        {
-               int timeout = 100;
+               /* FIXME this "timeout" is never changed ... */
+               int timeout = LIBFTDI_READ_RETRY_COUNT;
                ft2232_buffer_size = 0;
 
 #ifdef _DEBUG_USB_IO_
@@ -682,16 +684,21 @@ static int ft2232_send_and_recv(jtag_command_t* first, jtag_command_t* last)
 
                if (ft2232_expect_read != ft2232_buffer_size)
                {
-                       LOG_ERROR("ft2232_expect_read (%i) != ft2232_buffer_size (%i) (%i retries)", ft2232_expect_read,
+                       LOG_ERROR("ft2232_expect_read (%i) != "
+                                       "ft2232_buffer_size (%i) "
+                                       "(%i retries)",
+                                       ft2232_expect_read,
                                        ft2232_buffer_size,
-                                       100 - timeout);
+                                       LIBFTDI_READ_RETRY_COUNT - timeout);
                        ft2232_debug_dump_buffer();
 
                        exit(-1);
                }
 
 #ifdef _DEBUG_USB_COMMS_
-               LOG_DEBUG("read buffer (%i retries): %i bytes", 100 - timeout, ft2232_buffer_size);
+               LOG_DEBUG("read buffer (%i retries): %i bytes",
+                               LIBFTDI_READ_RETRY_COUNT - timeout,
+                               ft2232_buffer_size);
                ft2232_debug_dump_buffer();
 #endif
        }
@@ -714,7 +721,7 @@ static int ft2232_send_and_recv(jtag_command_t* first, jtag_command_t* last)
                        if (type != SCAN_OUT)
                        {
                                scan_size = jtag_scan_size(cmd->cmd.scan);
-                               buffer    = calloc(CEIL(scan_size, 8), 1);
+                               buffer    = calloc(DIV_ROUND_UP(scan_size, 8), 1);
                                ft2232_read_scan(type, buffer, scan_size);
                                if (jtag_read_buffer(buffer, cmd->cmd.scan) != ERROR_OK)
                                        retval = ERROR_JTAG_QUEUE_FAILED;
@@ -734,7 +741,6 @@ static int ft2232_send_and_recv(jtag_command_t* first, jtag_command_t* last)
        return retval;
 }
 
-
 /**
  * Function ft2232_add_pathmove
  * moves the TAP controller from the current state to a new state through the
@@ -746,37 +752,53 @@ static int ft2232_send_and_recv(jtag_command_t* first, jtag_command_t* last)
  */
 static void ft2232_add_pathmove(tap_state_t* path, int num_states)
 {
-       int                     tms_bits = 0;
-       int                     state_ndx;
-       tap_state_t     walker = tap_get_state();
+       int state_count = 0;
 
        assert((unsigned) num_states <= 32u);           /* tms_bits only holds 32 bits */
 
+       DEBUG_JTAG_IO("-");
+
        /* this loop verifies that the path is legal and logs each state in the path */
-       for (state_ndx = 0; state_ndx < num_states;  ++state_ndx)
+       while (num_states)
        {
-               tap_state_t     desired_next_state = path[state_ndx];
+               unsigned char   tms_byte = 0;       /* zero this on each MPSSE batch */
+               int             bit_count = 0;
+               int             num_states_batch = num_states > 7 ? 7 : num_states;
 
-               if (tap_state_transition(walker, false) == desired_next_state)
-                       ;       /* bit within tms_bits at index state_ndx is already zero */
-               else if (tap_state_transition(walker, true) == desired_next_state)
-                       tms_bits |= (1 << state_ndx);
-               else
-               {
-                       LOG_ERROR("BUG: %s -> %s isn't a valid TAP transition",
-                                       tap_state_name(walker), tap_state_name(desired_next_state));
-                       exit(-1);
-               }
+               /* command "Clock Data to TMS/CS Pin (no Read)" */
+               buffer_write(0x4b);
 
-               walker = desired_next_state;
-       }
+               /* number of states remaining */
+               buffer_write(num_states_batch - 1);
+
+               while (num_states_batch--) {
+                       /* either TMS=0 or TMS=1 must work ... */
+                       if (tap_state_transition(tap_get_state(), false)
+                                               == path[state_count])
+                               buf_set_u32(&tms_byte, bit_count++, 1, 0x0);
+                       else if (tap_state_transition(tap_get_state(), true)
+                                               == path[state_count])
+                               buf_set_u32(&tms_byte, bit_count++, 1, 0x1);
+
+                       /* ... or else the caller goofed BADLY */
+                       else {
+                               LOG_ERROR("BUG: %s -> %s isn't a valid "
+                                               "TAP state transition",
+                                       tap_state_name(tap_get_state()),
+                                       tap_state_name(path[state_count]));
+                               exit(-1);
+                       }
 
-       clock_tms(0x4b,  tms_bits, num_states, 0);
+                       tap_set_state(path[state_count]);
+                       state_count++;
+                       num_states--;
+               }
 
+               buffer_write(tms_byte);
+       }
        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)
 {
        int num_bytes = (scan_size + 7) / 8;
@@ -876,7 +898,7 @@ static void ft2232_add_scan(bool ir_scan, enum scan_type type, uint8_t* buffer,
                        buffer_write(buffer[cur_byte]);
        }
 
-       if (( ir_scan && (tap_get_end_state() == TAP_IRSHIFT))
+       if ((ir_scan && (tap_get_end_state() == TAP_IRSHIFT))
          || (!ir_scan && (tap_get_end_state() == TAP_DRSHIFT)))
        {
                if (type == SCAN_IO)
@@ -915,7 +937,6 @@ static void ft2232_add_scan(bool ir_scan, enum scan_type type, uint8_t* buffer,
                        tms_count = 2;
                        /* Clock Data to TMS/CS Pin with Read */
                        mpsse_cmd = 0x6b;
-                       /* LOG_DEBUG("added TMS scan (read)"); */
                }
                else
                {
@@ -923,9 +944,9 @@ static void ft2232_add_scan(bool ir_scan, enum scan_type type, uint8_t* buffer,
                        tms_count = tap_get_tms_path_len(tap_get_state(), tap_get_end_state());
                        /* Clock Data to TMS/CS Pin (no Read) */
                        mpsse_cmd = 0x4b;
-                       /* LOG_DEBUG("added TMS scan (no read)"); */
                }
 
+               DEBUG_JTAG_IO("finish %s", (type == SCAN_OUT) ? "without read" : "via PAUSE");
                clock_tms(mpsse_cmd, tms_bits, tms_count, last_bit);
        }
 
@@ -935,14 +956,13 @@ 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(struct scan_command* cmd, enum scan_type type, uint8_t* buffer, int scan_size)
 {
        int num_bytes = (scan_size + 7) / 8;
        int bits_left = scan_size;
        int cur_byte  = 0;
        int last_bit;
-       uint8_t* receive_buffer  = malloc(CEIL(scan_size, 8));
+       uint8_t* receive_buffer  = malloc(DIV_ROUND_UP(scan_size, 8));
        uint8_t* receive_pointer = receive_buffer;
        uint32_t bytes_written;
        uint32_t bytes_read;
@@ -965,7 +985,7 @@ static int ft2232_large_scan(scan_command_t* cmd, enum scan_type type, uint8_t*
                LOG_ERROR("couldn't write MPSSE commands to FT2232");
                exit(-1);
        }
-       LOG_DEBUG("ft2232_buffer_size: %i, bytes_written: %i", 
+       LOG_DEBUG("ft2232_buffer_size: %i, bytes_written: %i",
                  ft2232_buffer_size, (int)bytes_written);
        ft2232_buffer_size = 0;
 
@@ -1019,8 +1039,8 @@ static int ft2232_large_scan(scan_command_t* cmd, enum scan_type type, uint8_t*
                        LOG_ERROR("couldn't write MPSSE commands to FT2232");
                        exit(-1);
                }
-               LOG_DEBUG("ft2232_buffer_size: %i, bytes_written: %i", 
-                         ft2232_buffer_size, 
+               LOG_DEBUG("ft2232_buffer_size: %i, bytes_written: %i",
+                         ft2232_buffer_size,
                          (int)bytes_written);
                ft2232_buffer_size = 0;
 
@@ -1031,8 +1051,8 @@ static int ft2232_large_scan(scan_command_t* cmd, enum scan_type type, uint8_t*
                                LOG_ERROR("couldn't read from FT2232");
                                exit(-1);
                        }
-                       LOG_DEBUG("thisrun_read: %i, bytes_read: %i", 
-                                 thisrun_read, 
+                       LOG_DEBUG("thisrun_read: %i, bytes_read: %i",
+                                 thisrun_read,
                                  (int)bytes_read);
                        receive_pointer += bytes_read;
                }
@@ -1118,6 +1138,7 @@ static int ft2232_large_scan(scan_command_t* cmd, enum scan_type type, uint8_t*
                        /* LOG_DEBUG("added TMS scan (no read)"); */
                }
 
+               DEBUG_JTAG_IO("finish, %s", (type == SCAN_OUT) ? "no read" : "read");
                clock_tms(mpsse_cmd, tms_bits, tms_count, last_bit);
        }
 
@@ -1129,8 +1150,8 @@ static int ft2232_large_scan(scan_command_t* cmd, enum scan_type type, uint8_t*
                LOG_ERROR("couldn't write MPSSE commands to FT2232");
                exit(-1);
        }
-       LOG_DEBUG("ft2232_buffer_size: %i, bytes_written: %i", 
-                 ft2232_buffer_size, 
+       LOG_DEBUG("ft2232_buffer_size: %i, bytes_written: %i",
+                 ft2232_buffer_size,
                  (int)bytes_written);
        ft2232_buffer_size = 0;
 
@@ -1141,8 +1162,8 @@ static int ft2232_large_scan(scan_command_t* cmd, enum scan_type type, uint8_t*
                        LOG_ERROR("couldn't read from FT2232");
                        exit(-1);
                }
-               LOG_DEBUG("thisrun_read: %i, bytes_read: %i", 
-                         thisrun_read, 
+               LOG_DEBUG("thisrun_read: %i, bytes_read: %i",
+                         thisrun_read,
                          (int)bytes_read);
                receive_pointer += bytes_read;
        }
@@ -1150,7 +1171,6 @@ static int ft2232_large_scan(scan_command_t* cmd, enum scan_type type, uint8_t*
        return ERROR_OK;
 }
 
-
 static int ft2232_predict_scan_out(int scan_size, enum scan_type type)
 {
        int predicted_size = 3;
@@ -1159,18 +1179,18 @@ static int ft2232_predict_scan_out(int scan_size, enum scan_type type)
        if (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 */
-               predicted_size += CEIL(num_bytes, 65536) * 3;
+               predicted_size += DIV_ROUND_UP(num_bytes, 65536) * 3;
 
                /* remaining bits - 1 (up to 7) */
                predicted_size += ((scan_size - 1) % 8) ? 2 : 0;
        }
-       else                    /* host to device, or bidirectional */
+       else    /* host to device, or bidirectional */
        {
                /* complete bytes */
-               predicted_size += num_bytes + CEIL(num_bytes, 65536) * 3;
+               predicted_size += num_bytes + DIV_ROUND_UP(num_bytes, 65536) * 3;
 
                /* remaining bits -1 (up to 7) */
                predicted_size += ((scan_size - 1) % 8) ? 3 : 0;
@@ -1179,7 +1199,6 @@ static int ft2232_predict_scan_out(int scan_size, enum scan_type type)
        return predicted_size;
 }
 
-
 static int ft2232_predict_scan_in(int scan_size, enum scan_type type)
 {
        int predicted_size = 0;
@@ -1187,7 +1206,7 @@ static int ft2232_predict_scan_in(int scan_size, enum scan_type type)
        if (type != SCAN_OUT)
        {
                /* complete bytes */
-               predicted_size += (CEIL(scan_size, 8) > 1) ? (CEIL(scan_size, 8) - 1) : 0;
+               predicted_size += (DIV_ROUND_UP(scan_size, 8) > 1) ? (DIV_ROUND_UP(scan_size, 8) - 1) : 0;
 
                /* remaining bits - 1 */
                predicted_size += ((scan_size - 1) % 8) ? 1 : 0;
@@ -1201,38 +1220,37 @@ static int ft2232_predict_scan_in(int scan_size, enum scan_type type)
        return predicted_size;
 }
 
-
 static void usbjtag_reset(int trst, int srst)
 {
        enum reset_types jtag_reset_config = jtag_get_reset_config();
        if (trst == 1)
        {
                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
-                       low_output &= ~nTRST;       /* switch output low */
+                       low_output &= ~nTRST;           /* switch output low */
        }
        else if (trst == 0)
        {
                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
-                       low_output |= nTRST;        /* switch output high */
+                       low_output |= nTRST;            /* switch output high */
        }
 
        if (srst == 1)
        {
                if (jtag_reset_config & RESET_SRST_PUSH_PULL)
-                       low_output &= ~nSRST;       /* switch output low */
+                       low_output &= ~nSRST;           /* switch output low */
                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)
        {
                if (jtag_reset_config & RESET_SRST_PUSH_PULL)
-                       low_output |= nSRST;        /* switch output high */
+                       low_output |= nSRST;            /* switch output high */
                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" */
@@ -1241,7 +1259,6 @@ static void usbjtag_reset(int trst, int srst)
        buffer_write(low_direction);
 }
 
-
 static void jtagkey_reset(int trst, int srst)
 {
        enum reset_types jtag_reset_config = jtag_get_reset_config();
@@ -1283,7 +1300,6 @@ static void jtagkey_reset(int trst, int srst)
                        high_direction);
 }
 
-
 static void olimex_jtag_reset(int trst, int srst)
 {
        enum reset_types jtag_reset_config = jtag_get_reset_config();
@@ -1319,7 +1335,6 @@ static void olimex_jtag_reset(int trst, int srst)
                        high_direction);
 }
 
-
 static void axm0432_jtag_reset(int trst, int srst)
 {
        if (trst == 1)
@@ -1349,7 +1364,6 @@ static void axm0432_jtag_reset(int trst, int srst)
                        high_direction);
 }
 
-
 static void flyswatter_reset(int trst, int srst)
 {
        if (trst == 1)
@@ -1377,7 +1391,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);
 }
 
-
 static void turtle_reset(int trst, int srst)
 {
        trst = trst;
@@ -1398,7 +1411,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);
 }
 
-
 static void comstick_reset(int trst, int srst)
 {
        if (trst == 1)
@@ -1427,7 +1439,6 @@ static void comstick_reset(int trst, int srst)
                        high_direction);
 }
 
-
 static void stm32stick_reset(int trst, int srst)
 {
        if (trst == 1)
@@ -1461,8 +1472,6 @@ static void stm32stick_reset(int trst, int srst)
                        high_direction);
 }
 
-
-
 static void sheevaplug_reset(int trst, int srst)
 {
        if (trst == 1)
@@ -1482,10 +1491,10 @@ static void sheevaplug_reset(int trst, int srst)
        LOG_DEBUG("trst: %i, srst: %i, high_output: 0x%2.2x, high_direction: 0x%2.2x", trst, srst, high_output, high_direction);
 }
 
-static int ft2232_execute_runtest(jtag_command_t *cmd)
+static int ft2232_execute_runtest(struct jtag_command *cmd)
 {
-       int  retval;
-       int             i;
+       int retval;
+       int i;
        int predicted_size = 0;
        retval = ERROR_OK;
 
@@ -1497,7 +1506,7 @@ static int ft2232_execute_runtest(jtag_command_t *cmd)
        predicted_size = 0;
        if (tap_get_state() != TAP_IDLE)
                predicted_size += 3;
-       predicted_size += 3 * CEIL(cmd->cmd.runtest->num_cycles, 7);
+       predicted_size += 3 * DIV_ROUND_UP(cmd->cmd.runtest->num_cycles, 7);
        if (cmd->cmd.runtest->end_state != TAP_IDLE)
                predicted_size += 3;
        if (tap_get_end_state() != TAP_IDLE)
@@ -1527,7 +1536,6 @@ static int ft2232_execute_runtest(jtag_command_t *cmd)
 
                /* TMS data bits */
                buffer_write(0x0);
-               tap_set_state(TAP_IDLE);
 
                i -= (i > 7) ? 7 : i;
                /* LOG_DEBUG("added TMS scan (no read)"); */
@@ -1541,20 +1549,19 @@ static int ft2232_execute_runtest(jtag_command_t *cmd)
        }
 
        require_send = 1;
-#ifdef _DEBUG_JTAG_IO_
-       LOG_DEBUG("runtest: %i, end in %s", cmd->cmd.runtest->num_cycles, tap_state_name(tap_get_end_state()));
-#endif
-
+       DEBUG_JTAG_IO("runtest: %i, end in %s",
+                       cmd->cmd.runtest->num_cycles,
+                       tap_state_name(tap_get_end_state()));
        return retval;
 }
 
-
-static int ft2232_execute_statemove(jtag_command_t *cmd)
+static int ft2232_execute_statemove(struct jtag_command *cmd)
 {
        int     predicted_size = 0;
        int     retval = ERROR_OK;
 
-       DEBUG_JTAG_IO("statemove end in %i", cmd->cmd.statemove->end_state);
+       DEBUG_JTAG_IO("statemove end in %s",
+                       tap_state_name(cmd->cmd.statemove->end_state));
 
        /* only send the maximum buffer size that FT2232C can handle */
        predicted_size = 3;
@@ -1567,8 +1574,16 @@ static int ft2232_execute_statemove(jtag_command_t *cmd)
        }
        ft2232_end_state(cmd->cmd.statemove->end_state);
 
-       /* move to end state */
-       if (tap_get_state() != tap_get_end_state())
+       /* For TAP_RESET, ignore the current recorded state.  It's often
+        * wrong at server startup, and this transation is critical whenever
+        * it's requested.
+        */
+       if (tap_get_end_state() == TAP_RESET) {
+               clock_tms(0x4b,  0xff, 5, 0);
+               require_send = 1;
+
+       /* shortest-path move to desired end state */
+       } else if (tap_get_state() != tap_get_end_state())
        {
                move_to_state(tap_get_end_state());
                require_send = 1;
@@ -1577,7 +1592,7 @@ static int ft2232_execute_statemove(jtag_command_t *cmd)
        return retval;
 }
 
-static int ft2232_execute_pathmove(jtag_command_t *cmd)
+static int ft2232_execute_pathmove(struct jtag_command *cmd)
 {
        int     predicted_size = 0;
        int     retval = ERROR_OK;
@@ -1587,11 +1602,10 @@ static int ft2232_execute_pathmove(jtag_command_t *cmd)
 
        DEBUG_JTAG_IO("pathmove: %i states, current: %s  end: %s", num_states,
                        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 */
-       predicted_size = 3 * CEIL(num_states, 7);
+       predicted_size = 3 * DIV_ROUND_UP(num_states, 7);
        if (ft2232_buffer_size + predicted_size + 1 > FT2232_BUFFER_SIZE)
        {
                if (ft2232_send_and_recv(first_unsent, cmd) != ERROR_OK)
@@ -1607,13 +1621,12 @@ static int ft2232_execute_pathmove(jtag_command_t *cmd)
        return retval;
 }
 
-
-static int ft2232_execute_scan(jtag_command_t *cmd)
+static int ft2232_execute_scan(struct jtag_command *cmd)
 {
-       uint8_t*             buffer;
-       int             scan_size;                  /* size of IR or DR scan */
-       int             predicted_size = 0;
-       int                             retval = ERROR_OK;
+       uint8_t* buffer;
+       int scan_size;                          /* size of IR or DR scan */
+       int predicted_size = 0;
+       int retval = ERROR_OK;
 
        enum scan_type  type = jtag_scan_type(cmd->cmd.scan);
 
@@ -1656,18 +1669,17 @@ static int ft2232_execute_scan(jtag_command_t *cmd)
        require_send = 1;
        if (buffer)
                free(buffer);
-#ifdef _DEBUG_JTAG_IO_
-       LOG_DEBUG("%s scan, %i bits, end in %s", (cmd->cmd.scan->ir_scan) ? "IR" : "DR", scan_size,
+       DEBUG_JTAG_IO("%s scan, %i bits, end in %s",
+                       (cmd->cmd.scan->ir_scan) ? "IR" : "DR", scan_size,
                        tap_state_name(tap_get_end_state()));
-#endif
        return retval;
 
 }
 
-static int ft2232_execute_reset(jtag_command_t *cmd)
+static int ft2232_execute_reset(struct jtag_command *cmd)
 {
-       int             retval;
-       int             predicted_size = 0;
+       int retval;
+       int predicted_size = 0;
        retval = ERROR_OK;
 
        DEBUG_JTAG_IO("reset trst: %i srst %i",
@@ -1683,36 +1695,39 @@ static int ft2232_execute_reset(jtag_command_t *cmd)
                first_unsent = cmd;
        }
 
+       if ((cmd->cmd.reset->trst == 1) || (cmd->cmd.reset->srst && (jtag_get_reset_config() & RESET_SRST_PULLS_TRST)))
+       {
+               tap_set_state(TAP_RESET);
+       }
+
        layout->reset(cmd->cmd.reset->trst, cmd->cmd.reset->srst);
        require_send = 1;
 
-#ifdef _DEBUG_JTAG_IO_
-       LOG_DEBUG("trst: %i, srst: %i", cmd->cmd.reset->trst, cmd->cmd.reset->srst);
-#endif
+       DEBUG_JTAG_IO("trst: %i, srst: %i",
+                       cmd->cmd.reset->trst, cmd->cmd.reset->srst);
        return retval;
 }
 
-static int ft2232_execute_sleep(jtag_command_t *cmd)
+static int ft2232_execute_sleep(struct jtag_command *cmd)
 {
-       int             retval;
+       int retval;
        retval = ERROR_OK;
 
-       DEBUG_JTAG_IO("sleep %i", cmd->cmd.sleep->us);
+       DEBUG_JTAG_IO("sleep %" PRIi32, cmd->cmd.sleep->us);
 
        if (ft2232_send_and_recv(first_unsent, cmd) != ERROR_OK)
                                retval = ERROR_JTAG_QUEUE_FAILED;
        first_unsent = cmd->next;
        jtag_sleep(cmd->cmd.sleep->us);
-#ifdef _DEBUG_JTAG_IO_
-                       LOG_DEBUG("sleep %i usec while in %s", cmd->cmd.sleep->us, tap_state_name(tap_get_state()));
-#endif
-
+       DEBUG_JTAG_IO("sleep %" PRIi32 " usec while in %s",
+                       cmd->cmd.sleep->us,
+                       tap_state_name(tap_get_state()));
        return retval;
 }
 
-static int ft2232_execute_stableclocks(jtag_command_t *cmd)
+static int ft2232_execute_stableclocks(struct jtag_command *cmd)
 {
-       int             retval;
+       int retval;
        retval = ERROR_OK;
 
        /* this is only allowed while in a stable state.  A check for a stable
@@ -1720,16 +1735,15 @@ static int ft2232_execute_stableclocks(jtag_command_t *cmd)
         */
        if (ft2232_stableclocks(cmd->cmd.stableclocks->num_cycles, cmd) != ERROR_OK)
                retval = ERROR_JTAG_QUEUE_FAILED;
-#ifdef _DEBUG_JTAG_IO_
-       LOG_DEBUG("clocks %i while in %s", cmd->cmd.stableclocks->num_cycles, tap_state_name(tap_get_state()));
-#endif
-
+       DEBUG_JTAG_IO("clocks %i while in %s",
+                       cmd->cmd.stableclocks->num_cycles,
+                       tap_state_name(tap_get_state()));
        return retval;
 }
 
-static int ft2232_execute_command(jtag_command_t *cmd)
+static int ft2232_execute_command(struct jtag_command *cmd)
 {
-       int             retval;
+       int retval;
        retval = ERROR_OK;
 
        switch (cmd->type)
@@ -1748,12 +1762,12 @@ static int ft2232_execute_command(jtag_command_t *cmd)
        return retval;
 }
 
-static int ft2232_execute_queue()
+static int ft2232_execute_queue(void)
 {
-       jtag_command_t* cmd = jtag_command_queue;   /* currently processed command */
-       int             retval;
+       struct jtag_command* cmd = jtag_command_queue;  /* currently processed command */
+       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;
 
        /* return ERROR_OK, unless ft2232_send_and_recv reports a failed check
@@ -1789,7 +1803,6 @@ static int ft2232_execute_queue()
        return retval;
 }
 
-
 #if BUILD_FT2232_FTD2XX == 1
 static int ft2232_init_ftd2xx(uint16_t vid, uint16_t pid, int more, int* try_more)
 {
@@ -1837,18 +1850,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);
        if (status != FT_OK) {
-               // under Win32, the FTD2XX driver appends an "A" to the end
-               // of the description, if we tried by the desc, then
-               // try by the alternate "A" description.
+               /* under Win32, the FTD2XX driver appends an "A" to the end
+                * of the description, if we tried by the desc, then
+                * try by the alternate "A" description. */
                if (openex_string == ft2232_device_desc) {
-                       // Try the alternate method.
+                       /* Try the alternate method. */
                        openex_string = ft2232_device_desc_A;
                        status = FT_OpenEx(openex_string, openex_flags, &ftdih);
                        if (status == FT_OK) {
-                               // yea, the "alternate" method worked!
+                               /* yea, the "alternate" method worked! */
                        } else {
-                               // drat, give the user a meaningfull message.
-                               // telling the use we tried *BOTH* methods.
+                               /* drat, give the user a meaningfull message.
+                                * telling the use we tried *BOTH* methods. */
                                LOG_WARNING("Unable to open FTDI Device tried: '%s' and '%s'\n",
                                                        ft2232_device_desc,
                                                        ft2232_device_desc_A);
@@ -1884,7 +1897,7 @@ static int ft2232_init_ftd2xx(uint16_t vid, uint16_t pid, int more, int* try_mor
                        {
                                LOG_ERROR("ListDevices: %lu\n", num_devices);
                                for (i = 0; i < num_devices; i++)
-                                       LOG_ERROR("%i: \"%s\"", i, desc_array[i]);
+                                       LOG_ERROR("%" PRIu32 ": \"%s\"", i, desc_array[i]);
                        }
 
                        for (i = 0; i < num_devices; i++)
@@ -1934,24 +1947,20 @@ static int ft2232_init_ftd2xx(uint16_t vid, uint16_t pid, int more, int* try_mor
        }
        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 = ARRAY_SIZE(type_str) - 1;
+               unsigned type_index = ((unsigned)ftdi_device <= no_of_known_types)
+                       ? ftdi_device : FT_DEVICE_UNKNOWN;
+               LOG_INFO("device: %lu \"%s\"", ftdi_device, type_str[type_index]);
                LOG_INFO("deviceID: %lu", deviceID);
                LOG_INFO("SerialNumber: %s", SerialNumber);
                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;
 }
 
-
 static int ft2232_purge_ftd2xx(void)
 {
        FT_STATUS status;
@@ -1965,7 +1974,6 @@ static int ft2232_purge_ftd2xx(void)
        return ERROR_OK;
 }
 
-
 #endif /* BUILD_FT2232_FTD2XX == 1 */
 
 #if BUILD_FT2232_LIBFTDI == 1
@@ -2023,10 +2031,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_device = ftdic.type;
+       static const char* type_str[] =
+               {"AM", "BM", "2232C", "R", "2232H", "4232H", "Unknown"};
+       unsigned no_of_known_types = ARRAY_SIZE(type_str) - 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;
 }
 
-
 static int ft2232_purge_libftdi(void)
 {
        if (ftdi_usb_purge_buffers(&ftdic) < 0)
@@ -2038,7 +2052,6 @@ static int ft2232_purge_libftdi(void)
        return ERROR_OK;
 }
 
-
 #endif /* BUILD_FT2232_LIBFTDI == 1 */
 
 static int ft2232_init(void)
@@ -2046,10 +2059,10 @@ static int ft2232_init(void)
        uint8_t  buf[1];
        int retval;
        uint32_t bytes_written;
-       const ft2232_layout_t* cur_layout = ft2232_layouts;
+       const struct ft2232_layout* cur_layout = ft2232_layouts;
        int i;
 
-       if (tap_get_tms_path_len(TAP_IRPAUSE,TAP_IRPAUSE)==7)
+       if (tap_get_tms_path_len(TAP_IRPAUSE,TAP_IRPAUSE) == 7)
        {
                LOG_DEBUG("ft2232 interface using 7 step jtag state transitions");
        }
@@ -2113,6 +2126,20 @@ static int ft2232_init(void)
        if (layout->init() != ERROR_OK)
                return ERROR_JTAG_INIT_FAILED;
 
+       if (ft2232_device_is_highspeed())
+       {
+#ifndef BUILD_FT2232_HIGHSPEED
+ #if BUILD_FT2232_FTD2XX == 1
+               LOG_WARNING("High Speed device found - You need a newer FTD2XX driver (version 2.04.16 or later)");
+ #elif BUILD_FT2232_LIBFTDI == 1
+               LOG_WARNING("High Speed device found - You need a newer libftdi version (0.16 or later)");
+ #endif
+#endif
+               /* make sure the legacy mode is disabled */
+               if (ft2232h_ft4232h_clk_divide_by_5(false) != ERROR_OK)
+                       return ERROR_JTAG_INIT_FAILED;
+       }
+
        ft2232_speed(jtag_get_speed());
 
        buf[0] = 0x85; /* Disconnect TDI/DO to TDO/DI for Loopback */
@@ -2131,7 +2158,6 @@ static int ft2232_init(void)
        return ERROR_OK;
 }
 
-
 static int usbjtag_init(void)
 {
        uint8_t  buf[3];
@@ -2163,6 +2189,15 @@ static int usbjtag_init(void)
                low_output    = 0x88;
                low_direction = 0x8b;
        }
+       else if (strcmp(ft2232_layout, "luminary_icdi") == 0)
+       {
+               nTRST = 0x0;
+               nTRSTnOE = 0x00;
+               nSRST = 0x20;
+               nSRSTnOE = 0x20;
+               low_output    = 0x88;
+               low_direction = 0xcb;
+       }
        else
        {
                LOG_ERROR("BUG: usbjtag_init called for unknown layout '%s'", ft2232_layout);
@@ -2194,8 +2229,8 @@ static int usbjtag_init(void)
 
        /* initialize low byte for jtag */
        buf[0] = 0x80;          /* command "set data bits low byte" */
-       buf[1] = low_output;    /* value (TMS=1,TCK=0, TDI=0, xRST high) */
-       buf[2] = low_direction; /* dir (output=1), TCK/TDI/TMS=out, TDO=in */
+       buf[1] = low_output;    /* value (TMS = 1,TCK = 0, TDI = 0, xRST high) */
+       buf[2] = low_direction; /* dir (output = 1), TCK/TDI/TMS = out, TDO = in */
        LOG_DEBUG("%2.2x %2.2x %2.2x", buf[0], buf[1], buf[2]);
 
        if (((ft2232_write(buf, 3, &bytes_written)) != ERROR_OK) || (bytes_written != 3))
@@ -2207,7 +2242,6 @@ static int usbjtag_init(void)
        return ERROR_OK;
 }
 
-
 static int axm0432_jtag_init(void)
 {
        uint8_t  buf[3];
@@ -2218,8 +2252,8 @@ static int axm0432_jtag_init(void)
 
        /* initialize low byte for jtag */
        buf[0] = 0x80;          /* command "set data bits low byte" */
-       buf[1] = low_output;    /* value (TMS=1,TCK=0, TDI=0, nOE=0) */
-       buf[2] = low_direction; /* dir (output=1), TCK/TDI/TMS=out, TDO=in, nOE=out */
+       buf[1] = low_output;    /* value (TMS = 1,TCK = 0, TDI = 0, nOE = 0) */
+       buf[2] = low_direction; /* dir (output = 1), TCK/TDI/TMS = out, TDO = in, nOE = out */
        LOG_DEBUG("%2.2x %2.2x %2.2x", buf[0], buf[1], buf[2]);
 
        if (((ft2232_write(buf, 3, &bytes_written)) != ERROR_OK) || (bytes_written != 3))
@@ -2278,7 +2312,6 @@ static int axm0432_jtag_init(void)
        return ERROR_OK;
 }
 
-
 static int jtagkey_init(void)
 {
        uint8_t  buf[3];
@@ -2289,8 +2322,8 @@ static int jtagkey_init(void)
 
        /* initialize low byte for jtag */
        buf[0] = 0x80;          /* command "set data bits low byte" */
-       buf[1] = low_output;    /* value (TMS=1,TCK=0, TDI=0, nOE=0) */
-       buf[2] = low_direction; /* dir (output=1), TCK/TDI/TMS=out, TDO=in, nOE=out */
+       buf[1] = low_output;    /* value (TMS = 1,TCK = 0, TDI = 0, nOE = 0) */
+       buf[2] = low_direction; /* dir (output = 1), TCK/TDI/TMS = out, TDO = in, nOE = out */
        LOG_DEBUG("%2.2x %2.2x %2.2x", buf[0], buf[1], buf[2]);
 
        if (((ft2232_write(buf, 3, &bytes_written)) != ERROR_OK) || (bytes_written != 3))
@@ -2361,7 +2394,6 @@ static int jtagkey_init(void)
        return ERROR_OK;
 }
 
-
 static int olimex_jtag_init(void)
 {
        uint8_t  buf[3];
@@ -2372,8 +2404,8 @@ static int olimex_jtag_init(void)
 
        /* initialize low byte for jtag */
        buf[0] = 0x80;          /* command "set data bits low byte" */
-       buf[1] = low_output;    /* value (TMS=1,TCK=0, TDI=0, nOE=0) */
-       buf[2] = low_direction; /* dir (output=1), TCK/TDI/TMS=out, TDO=in, nOE=out */
+       buf[1] = low_output;    /* value (TMS = 1,TCK = 0, TDI = 0, nOE = 0) */
+       buf[2] = low_direction; /* dir (output = 1), TCK/TDI/TMS = out, TDO = in, nOE = out */
        LOG_DEBUG("%2.2x %2.2x %2.2x", buf[0], buf[1], buf[2]);
 
        if (((ft2232_write(buf, 3, &bytes_written)) != ERROR_OK) || (bytes_written != 3))
@@ -2429,7 +2461,6 @@ static int olimex_jtag_init(void)
        return ERROR_OK;
 }
 
-
 static int flyswatter_init(void)
 {
        uint8_t  buf[3];
@@ -2440,8 +2471,8 @@ static int flyswatter_init(void)
 
        /* initialize low byte for jtag */
        buf[0] = 0x80;          /* command "set data bits low byte" */
-       buf[1] = low_output;    /* value (TMS=1,TCK=0, TDI=0, nOE=0) */
-       buf[2] = low_direction; /* dir (output=1), TCK/TDI/TMS=out, TDO=in, nOE[12]=out, n[ST]srst=out */
+       buf[1] = low_output;    /* value (TMS = 1,TCK = 0, TDI = 0, nOE = 0) */
+       buf[2] = low_direction; /* dir (output = 1), TCK/TDI/TMS = out, TDO = in, nOE[12]=out, n[ST]srst = out */
        LOG_DEBUG("%2.2x %2.2x %2.2x", buf[0], buf[1], buf[2]);
 
        if (((ft2232_write(buf, 3, &bytes_written)) != ERROR_OK) || (bytes_written != 3))
@@ -2476,7 +2507,6 @@ static int flyswatter_init(void)
        return ERROR_OK;
 }
 
-
 static int turtle_init(void)
 {
        uint8_t  buf[3];
@@ -2487,8 +2517,8 @@ static int turtle_init(void)
 
        /* initialize low byte for jtag */
        buf[0] = 0x80;          /* command "set data bits low byte" */
-       buf[1] = low_output;    /* value (TMS=1,TCK=0, TDI=0, nOE=0) */
-       buf[2] = low_direction; /* dir (output=1), TCK/TDI/TMS=out, TDO=in, nOE=out */
+       buf[1] = low_output;    /* value (TMS = 1,TCK = 0, TDI = 0, nOE = 0) */
+       buf[2] = low_direction; /* dir (output = 1), TCK/TDI/TMS = out, TDO = in, nOE = out */
        LOG_DEBUG("%2.2x %2.2x %2.2x", buf[0], buf[1], buf[2]);
 
        if (((ft2232_write(buf, 3, &bytes_written)) != ERROR_OK) || (bytes_written != 3))
@@ -2517,7 +2547,6 @@ static int turtle_init(void)
        return ERROR_OK;
 }
 
-
 static int comstick_init(void)
 {
        uint8_t  buf[3];
@@ -2528,8 +2557,8 @@ static int comstick_init(void)
 
        /* initialize low byte for jtag */
        buf[0] = 0x80;          /* command "set data bits low byte" */
-       buf[1] = low_output;    /* value (TMS=1,TCK=0, TDI=0, nOE=0) */
-       buf[2] = low_direction; /* dir (output=1), TCK/TDI/TMS=out, TDO=in, nOE=out */
+       buf[1] = low_output;    /* value (TMS = 1,TCK = 0, TDI = 0, nOE = 0) */
+       buf[2] = low_direction; /* dir (output = 1), TCK/TDI/TMS = out, TDO = in, nOE = out */
        LOG_DEBUG("%2.2x %2.2x %2.2x", buf[0], buf[1], buf[2]);
 
        if (((ft2232_write(buf, 3, &bytes_written)) != ERROR_OK) || (bytes_written != 3))
@@ -2561,7 +2590,6 @@ static int comstick_init(void)
        return ERROR_OK;
 }
 
-
 static int stm32stick_init(void)
 {
        uint8_t  buf[3];
@@ -2572,8 +2600,8 @@ static int stm32stick_init(void)
 
        /* initialize low byte for jtag */
        buf[0] = 0x80;          /* command "set data bits low byte" */
-       buf[1] = low_output;    /* value (TMS=1,TCK=0, TDI=0, nOE=0) */
-       buf[2] = low_direction; /* dir (output=1), TCK/TDI/TMS=out, TDO=in, nOE=out */
+       buf[1] = low_output;    /* value (TMS = 1,TCK = 0, TDI = 0, nOE = 0) */
+       buf[2] = low_direction; /* dir (output = 1), TCK/TDI/TMS = out, TDO = in, nOE = out */
        LOG_DEBUG("%2.2x %2.2x %2.2x", buf[0], buf[1], buf[2]);
 
        if (((ft2232_write(buf, 3, &bytes_written)) != ERROR_OK) || (bytes_written != 3))
@@ -2605,7 +2633,6 @@ static int stm32stick_init(void)
        return ERROR_OK;
 }
 
-
 static int sheevaplug_init(void)
 {
        uint8_t buf[3];
@@ -2616,8 +2643,8 @@ static int sheevaplug_init(void)
 
        /* initialize low byte for jtag */
        buf[0] = 0x80; /* command "set data bits low byte" */
-       buf[1] = low_output; /* value (TMS=1,TCK=0, TDI=0, nOE=0) */
-       buf[2] = low_direction; /* dir (output=1), TCK/TDI/TMS=out, TDO=in */
+       buf[1] = low_output; /* value (TMS = 1,TCK = 0, TDI = 0, nOE = 0) */
+       buf[2] = low_direction; /* dir (output = 1), TCK/TDI/TMS = out, TDO = in */
        LOG_DEBUG("%2.2x %2.2x %2.2x", buf[0], buf[1], buf[2]);
 
        if (((ft2232_write(buf, 3, &bytes_written)) != ERROR_OK) || (bytes_written != 3))
@@ -2667,8 +2694,8 @@ static int cortino_jtag_init(void)
 
        /* initialize low byte for jtag */
        buf[0] = 0x80;          /* command "set data bits low byte" */
-       buf[1] = low_output;    /* value (TMS=1,TCK=0, TDI=0, nOE=0) */
-       buf[2] = low_direction; /* dir (output=1), TCK/TDI/TMS=out, TDO=in, nOE=out */
+       buf[1] = low_output;    /* value (TMS = 1,TCK = 0, TDI = 0, nOE = 0) */
+       buf[2] = low_direction; /* dir (output = 1), TCK/TDI/TMS = out, TDO = in, nOE = out */
        LOG_DEBUG("%2.2x %2.2x %2.2x", buf[0], buf[1], buf[2]);
 
        if (((ft2232_write(buf, 3, &bytes_written)) != ERROR_OK) || (bytes_written != 3))
@@ -2721,7 +2748,6 @@ static void olimex_jtag_blink(void)
        buffer_write(high_direction);
 }
 
-
 static void flyswatter_jtag_blink(void)
 {
        /*
@@ -2734,7 +2760,6 @@ static void flyswatter_jtag_blink(void)
        buffer_write(high_direction);
 }
 
-
 static void turtle_jtag_blink(void)
 {
        /*
@@ -2754,7 +2779,6 @@ static void turtle_jtag_blink(void)
        buffer_write(high_direction);
 }
 
-
 static int ft2232_quit(void)
 {
 #if BUILD_FT2232_FTD2XX == 1
@@ -2773,29 +2797,28 @@ static int ft2232_quit(void)
        return ERROR_OK;
 }
 
-
-static int ft2232_handle_device_desc_command(struct command_context_s* cmd_ctx, char* cmd, char** args, int argc)
+COMMAND_HANDLER(ft2232_handle_device_desc_command)
 {
        char *cp;
        char buf[200];
-       if (argc == 1)
+       if (CMD_ARGC == 1)
        {
-               ft2232_device_desc = strdup(args[0]);
+               ft2232_device_desc = strdup(CMD_ARGV[0]);
                cp = strchr(ft2232_device_desc, 0);
-               // under Win32, the FTD2XX driver appends an "A" to the end
-               // of the description, this examines the given desc
-               // and creates the 'missing' _A or non_A variable.
+               /* under Win32, the FTD2XX driver appends an "A" to the end
+                * of the description, this examines the given desc
+                * and creates the 'missing' _A or non_A variable. */
                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;
-                       // and *CREATE* the non-A version.
+                       /* and *CREATE* the non-A version. */
                        strcpy(buf, ft2232_device_desc);
                        cp = strchr(buf, 0);
                        cp[-2] = 0;
                        ft2232_device_desc =  strdup(buf);
                } else {
-                       // <space>A not defined
-                       // so create it
+                       /* <space > A not defined
+                        * so create it */
                        sprintf(buf, "%s A", ft2232_device_desc);
                        ft2232_device_desc_A = strdup(buf);
                }
@@ -2808,12 +2831,11 @@ static int ft2232_handle_device_desc_command(struct command_context_s* cmd_ctx,
        return ERROR_OK;
 }
 
-
-static int ft2232_handle_serial_command(struct command_context_s* cmd_ctx, char* cmd, char** args, int argc)
+COMMAND_HANDLER(ft2232_handle_serial_command)
 {
-       if (argc == 1)
+       if (CMD_ARGC == 1)
        {
-               ft2232_serial = strdup(args[0]);
+               ft2232_serial = strdup(CMD_ARGV[0]);
        }
        else
        {
@@ -2823,46 +2845,39 @@ static int ft2232_handle_serial_command(struct command_context_s* cmd_ctx, char*
        return ERROR_OK;
 }
 
-
-static int ft2232_handle_layout_command(struct command_context_s* cmd_ctx, char* cmd, char** args, int argc)
+COMMAND_HANDLER(ft2232_handle_layout_command)
 {
-       if (argc == 0)
+       if (CMD_ARGC == 0)
                return ERROR_OK;
 
-       ft2232_layout = malloc(strlen(args[0]) + 1);
-       strcpy(ft2232_layout, args[0]);
+       ft2232_layout = malloc(strlen(CMD_ARGV[0]) + 1);
+       strcpy(ft2232_layout, CMD_ARGV[0]);
 
        return ERROR_OK;
 }
 
-
-static int ft2232_handle_vid_pid_command(struct command_context_s* cmd_ctx, char* cmd, char** args, int argc)
+COMMAND_HANDLER(ft2232_handle_vid_pid_command)
 {
-       if (argc > MAX_USB_IDS * 2)
+       if (CMD_ARGC > MAX_USB_IDS * 2)
        {
                LOG_WARNING("ignoring extra IDs in ft2232_vid_pid "
                                        "(maximum is %d pairs)", MAX_USB_IDS);
-               argc = MAX_USB_IDS * 2;
+               CMD_ARGC = MAX_USB_IDS * 2;
        }
-       if (argc < 2 || (argc & 1))
+       if (CMD_ARGC < 2 || (CMD_ARGC & 1))
        {
                LOG_WARNING("incomplete ft2232_vid_pid configuration directive");
-               if (argc < 2)
+               if (CMD_ARGC < 2)
                        return ERROR_COMMAND_SYNTAX_ERROR;
-               // remove the incomplete trailing id
-               argc -= 1;
+               /* remove the incomplete trailing id */
+               CMD_ARGC -= 1;
        }
 
-       int i;
-       int retval = ERROR_OK;
-       for (i = 0; i < argc; i += 2)
+       unsigned i;
+       for (i = 0; i < CMD_ARGC; i += 2)
        {
-               retval = parse_u16(args[i], &ft2232_vid[i >> 1]);
-               if (ERROR_OK != retval)
-                       break;
-               retval = parse_u16(args[i + 1], &ft2232_pid[i >> 1]);
-               if (ERROR_OK != retval)
-                       break;
+               COMMAND_PARSE_NUMBER(u16, CMD_ARGV[i], ft2232_vid[i >> 1]);
+               COMMAND_PARSE_NUMBER(u16, CMD_ARGV[i + 1], ft2232_pid[i >> 1]);
        }
 
        /*
@@ -2871,15 +2886,14 @@ static int ft2232_handle_vid_pid_command(struct command_context_s* cmd_ctx, char
         */
        ft2232_vid[i >> 1] = ft2232_pid[i >> 1] = 0;
 
-       return retval;
+       return ERROR_OK;
 }
 
-
-static int ft2232_handle_latency_command(struct command_context_s* cmd_ctx, char* cmd, char** args, int argc)
+COMMAND_HANDLER(ft2232_handle_latency_command)
 {
-       if (argc == 1)
+       if (CMD_ARGC == 1)
        {
-               ft2232_latency = atoi(args[0]);
+               ft2232_latency = atoi(CMD_ARGV[0]);
        }
        else
        {
@@ -2889,8 +2903,7 @@ static int ft2232_handle_latency_command(struct command_context_s* cmd_ctx, char
        return ERROR_OK;
 }
 
-
-static int ft2232_stableclocks(int num_cycles, jtag_command_t* cmd)
+static int ft2232_stableclocks(int num_cycles, struct jtag_command* cmd)
 {
        int retval = 0;
 
@@ -2932,7 +2945,6 @@ static int ft2232_stableclocks(int num_cycles, jtag_command_t* cmd)
        return retval;
 }
 
-
 /* ---------------------------------------------------------------------
  * Support for IceBear JTAG adapter from Section5:
  *     http://section5.ch/icebear
@@ -3037,3 +3049,973 @@ static void icebear_jtag_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);
 }
+
+/* ---------------------------------------------------------------------
+ * Support for Signalyzer H2 and Signalyzer H4
+ * JTAG adapter from Xverve Technologies Inc.
+ * http://www.signalyzer.com or http://www.xverve.com
+ *
+ * Author: Oleg Seiljus, oleg@signalyzer.com
+ */
+static unsigned char signalyzer_h_side;
+static unsigned int signalyzer_h_adapter_type;
+
+static int signalyzer_h_ctrl_write(int address, unsigned short value);
+
+#if BUILD_FT2232_FTD2XX == 1
+static int signalyzer_h_ctrl_read(int address, unsigned short *value);
+#endif
+
+#define SIGNALYZER_COMMAND_ADDR                                        128
+#define SIGNALYZER_DATA_BUFFER_ADDR                            129
+
+#define SIGNALYZER_COMMAND_VERSION                             0x41
+#define SIGNALYZER_COMMAND_RESET                               0x42
+#define SIGNALYZER_COMMAND_POWERCONTROL_GET            0x50
+#define SIGNALYZER_COMMAND_POWERCONTROL_SET            0x51
+#define SIGNALYZER_COMMAND_PWM_SET                             0x52
+#define SIGNALYZER_COMMAND_LED_SET                             0x53
+#define SIGNALYZER_COMMAND_ADC                                 0x54
+#define SIGNALYZER_COMMAND_GPIO_STATE                  0x55
+#define SIGNALYZER_COMMAND_GPIO_MODE                   0x56
+#define SIGNALYZER_COMMAND_GPIO_PORT                   0x57
+#define SIGNALYZER_COMMAND_I2C                                 0x58
+
+#define SIGNALYZER_CHAN_A                                              1
+#define SIGNALYZER_CHAN_B                                              2
+/* LEDS use channel C */
+#define SIGNALYZER_CHAN_C                                              4
+
+#define SIGNALYZER_LED_GREEN                                   1
+#define SIGNALYZER_LED_RED                                             2
+
+#define SIGNALYZER_MODULE_TYPE_EM_LT16_A               0x0301
+#define SIGNALYZER_MODULE_TYPE_EM_ARM_JTAG             0x0302
+#define SIGNALYZER_MODULE_TYPE_EM_JTAG                 0x0303
+#define SIGNALYZER_MODULE_TYPE_EM_ARM_JTAG_P   0x0304
+#define SIGNALYZER_MODULE_TYPE_EM_JTAG_P               0x0305
+
+
+static int signalyzer_h_ctrl_write(int address, unsigned short value)
+{
+#if BUILD_FT2232_FTD2XX == 1
+       return FT_WriteEE(ftdih, address, value);
+#elif BUILD_FT2232_LIBFTDI == 1
+       return 0;
+#endif
+}
+
+#if BUILD_FT2232_FTD2XX == 1
+static int signalyzer_h_ctrl_read(int address, unsigned short *value)
+{
+       return FT_ReadEE(ftdih, address, value);
+}
+#endif
+
+static int signalyzer_h_led_set(unsigned char channel, unsigned char led,
+       int on_time_ms, int off_time_ms, unsigned char cycles)
+{
+       unsigned char on_time;
+       unsigned char off_time;
+
+       if (on_time_ms < 0xFFFF)
+               on_time = (unsigned char)(on_time_ms / 62);
+       else
+               on_time = 0xFF;
+
+       off_time = (unsigned char)(off_time_ms / 62);
+
+#if BUILD_FT2232_FTD2XX == 1
+       FT_STATUS status;
+
+       if ((status = signalyzer_h_ctrl_write(SIGNALYZER_DATA_BUFFER_ADDR,
+                       ((uint32_t)(channel << 8) | led))) != FT_OK)
+       {
+               LOG_ERROR("signalyzer_h_ctrl_write  returned: %lu", status);
+               return ERROR_JTAG_DEVICE_ERROR;
+       }
+
+       if ((status = signalyzer_h_ctrl_write(
+                       (SIGNALYZER_DATA_BUFFER_ADDR + 1),
+                       ((uint32_t)(on_time << 8) | off_time))) != FT_OK)
+       {
+               LOG_ERROR("signalyzer_h_ctrl_write  returned: %lu", status);
+               return ERROR_JTAG_DEVICE_ERROR;
+       }
+
+       if ((status = signalyzer_h_ctrl_write(
+                       (SIGNALYZER_DATA_BUFFER_ADDR + 2),
+                       ((uint32_t)cycles))) != FT_OK)
+       {
+               LOG_ERROR("signalyzer_h_ctrl_write  returned: %lu", status);
+               return ERROR_JTAG_DEVICE_ERROR;
+       }
+
+       if ((status = signalyzer_h_ctrl_write(SIGNALYZER_COMMAND_ADDR,
+                       SIGNALYZER_COMMAND_LED_SET)) != FT_OK)
+       {
+               LOG_ERROR("signalyzer_h_ctrl_write  returned: %lu", status);
+               return ERROR_JTAG_DEVICE_ERROR;
+       }
+
+       return ERROR_OK;
+#elif BUILD_FT2232_LIBFTDI == 1
+       int retval;
+
+       if ((retval = signalyzer_h_ctrl_write(SIGNALYZER_DATA_BUFFER_ADDR,
+                       ((uint32_t)(channel << 8) | led))) < 0)
+       {
+               LOG_ERROR("signalyzer_h_ctrl_write returned: %s",
+                               ftdi_get_error_string(&ftdic));
+               return ERROR_JTAG_DEVICE_ERROR;
+       }
+
+       if ((retval = signalyzer_h_ctrl_write(
+                       (SIGNALYZER_DATA_BUFFER_ADDR + 1),
+                       ((uint32_t)(on_time << 8) | off_time))) < 0)
+       {
+               LOG_ERROR("signalyzer_h_ctrl_write returned: %s",
+                               ftdi_get_error_string(&ftdic));
+               return ERROR_JTAG_DEVICE_ERROR;
+       }
+
+       if ((retval = signalyzer_h_ctrl_write(
+                       (SIGNALYZER_DATA_BUFFER_ADDR + 2),
+                       (uint32_t)cycles)) < 0)
+       {
+               LOG_ERROR("signalyzer_h_ctrl_write returned: %s",
+                               ftdi_get_error_string(&ftdic));
+               return ERROR_JTAG_DEVICE_ERROR;
+       }
+
+       if ((retval = signalyzer_h_ctrl_write(SIGNALYZER_COMMAND_ADDR,
+                       SIGNALYZER_COMMAND_LED_SET)) < 0)
+       {
+               LOG_ERROR("signalyzer_h_ctrl_write returned: %s",
+                               ftdi_get_error_string(&ftdic));
+               return ERROR_JTAG_DEVICE_ERROR;
+       }
+
+       return ERROR_OK;
+#endif
+}
+
+static int signalyzer_h_init(void)
+{
+#if BUILD_FT2232_FTD2XX == 1
+       FT_STATUS status;
+       int i;
+#endif
+
+       char *end_of_desc;
+
+       uint16_t read_buf[12] = { 0 };
+       uint8_t  buf[3];
+       uint32_t bytes_written;
+
+       /* turn on center green led */
+       signalyzer_h_led_set(SIGNALYZER_CHAN_C, SIGNALYZER_LED_GREEN,
+                       0xFFFF, 0x00, 0x00);
+
+       /* determine what channel config wants to open
+        * TODO: change me... current implementation is made to work
+        * with openocd description parsing.
+        */
+       end_of_desc = strrchr(ft2232_device_desc, 0x00);
+
+       if (end_of_desc)
+       {
+               signalyzer_h_side = *(end_of_desc - 1);
+               if (signalyzer_h_side == 'B')
+                       signalyzer_h_side = SIGNALYZER_CHAN_B;
+               else
+                       signalyzer_h_side = SIGNALYZER_CHAN_A;
+       }
+       else
+       {
+               LOG_ERROR("No Channel was specified");
+               return ERROR_FAIL;
+       }
+
+       signalyzer_h_led_set(signalyzer_h_side, SIGNALYZER_LED_GREEN,
+                       1000, 1000, 0xFF);
+
+#if BUILD_FT2232_FTD2XX == 1
+       /* read signalyzer versionining information */
+       if ((status = signalyzer_h_ctrl_write(SIGNALYZER_COMMAND_ADDR,
+                       SIGNALYZER_COMMAND_VERSION)) != FT_OK)
+       {
+               LOG_ERROR("signalyzer_h_ctrl_write returned: %lu", status);
+               return ERROR_JTAG_DEVICE_ERROR;
+       }
+
+       for (i = 0; i < 10; i++)
+       {
+               if ((status = signalyzer_h_ctrl_read(
+                       (SIGNALYZER_DATA_BUFFER_ADDR + i),
+                       &read_buf[i])) != FT_OK)
+               {
+                       LOG_ERROR("signalyzer_h_ctrl_read returned: %lu",
+                                       status);
+                       return ERROR_JTAG_DEVICE_ERROR;
+               }
+       }
+
+       LOG_INFO("Signalyzer: ID info: { %.4x %.4x %.4x %.4x %.4x %.4x %.4x }",
+                       read_buf[0], read_buf[1], read_buf[2], read_buf[3],
+                       read_buf[4], read_buf[5], read_buf[6]);
+
+       /* set gpio register */
+       if ((status = signalyzer_h_ctrl_write(SIGNALYZER_DATA_BUFFER_ADDR,
+                       (uint32_t)(signalyzer_h_side << 8))) != FT_OK)
+       {
+               LOG_ERROR("signalyzer_h_ctrl_write returned: %lu", status);
+               return ERROR_JTAG_DEVICE_ERROR;
+       }
+
+       if ((status = signalyzer_h_ctrl_write(SIGNALYZER_DATA_BUFFER_ADDR + 1,
+                       0x0404)) != FT_OK)
+       {
+               LOG_ERROR("signalyzer_h_ctrl_write returned: %lu", status);
+               return ERROR_JTAG_DEVICE_ERROR;
+       }
+
+       if ((status = signalyzer_h_ctrl_write(SIGNALYZER_COMMAND_ADDR,
+                       SIGNALYZER_COMMAND_GPIO_STATE)) != FT_OK)
+       {
+               LOG_ERROR("signalyzer_h_ctrl_write returned: %lu", status);
+               return ERROR_JTAG_DEVICE_ERROR;
+       }
+
+       /* read adapter type information */
+       if ((status = signalyzer_h_ctrl_write(SIGNALYZER_DATA_BUFFER_ADDR,
+                       ((uint32_t)(signalyzer_h_side << 8) | 0x01))) != FT_OK)
+       {
+               LOG_ERROR("signalyzer_h_ctrl_write returned: %lu", status);
+               return ERROR_JTAG_DEVICE_ERROR;
+       }
+
+       if ((status = signalyzer_h_ctrl_write(
+                       (SIGNALYZER_DATA_BUFFER_ADDR + 1), 0xA000)) != FT_OK)
+       {
+               LOG_ERROR("signalyzer_h_ctrl_write returned: %lu", status);
+               return ERROR_JTAG_DEVICE_ERROR;
+       }
+
+       if ((status = signalyzer_h_ctrl_write(
+                       (SIGNALYZER_DATA_BUFFER_ADDR + 2), 0x0008)) != FT_OK)
+       {
+               LOG_ERROR("signalyzer_h_ctrl_write returned: %lu", status);
+               return ERROR_JTAG_DEVICE_ERROR;
+       }
+
+       if ((status = signalyzer_h_ctrl_write(SIGNALYZER_COMMAND_ADDR,
+                       SIGNALYZER_COMMAND_I2C)) != FT_OK)
+       {
+               LOG_ERROR("signalyzer_h_ctrl_write returned: %lu", status);
+               return ERROR_JTAG_DEVICE_ERROR;
+       }
+
+       usleep(100000);
+
+       if ((status = signalyzer_h_ctrl_read(SIGNALYZER_COMMAND_ADDR,
+                       &read_buf[0])) != FT_OK)
+       {
+               LOG_ERROR("signalyzer_h_ctrl_read returned: %lu", status);
+               return ERROR_JTAG_DEVICE_ERROR;
+       }
+
+       if (read_buf[0] != 0x0498)
+               signalyzer_h_adapter_type = 0x0000;
+       else
+       {
+               for (i = 0; i < 4; i++)
+               {
+                       if ((status = signalyzer_h_ctrl_read(
+                                       (SIGNALYZER_DATA_BUFFER_ADDR + i),
+                                       &read_buf[i])) != FT_OK)
+                       {
+                               LOG_ERROR("signalyzer_h_ctrl_read returned: %lu",
+                                       status);
+                               return ERROR_JTAG_DEVICE_ERROR;
+                       }
+               }
+
+               signalyzer_h_adapter_type = read_buf[0];
+       }
+
+#elif BUILD_FT2232_LIBFTDI == 1
+       /* currently libftdi does not allow reading individual eeprom
+        * locations, therefore adapter type cannot be detected.
+        * override with most common type
+        */
+       signalyzer_h_adapter_type = SIGNALYZER_MODULE_TYPE_EM_ARM_JTAG;
+#endif
+
+       enum reset_types jtag_reset_config = jtag_get_reset_config();
+
+       /* ADAPTOR: EM_LT16_A */
+       if (signalyzer_h_adapter_type == SIGNALYZER_MODULE_TYPE_EM_LT16_A)
+       {
+               LOG_INFO("Signalyzer: EM-LT (16-channel level translator) "
+                       "detected. (HW: %2x).", (read_buf[1] >> 8));
+
+               nTRST    = 0x10;
+               nTRSTnOE = 0x10;
+               nSRST    = 0x20;
+               nSRSTnOE = 0x20;
+
+               low_output     = 0x08;
+               low_direction  = 0x1b;
+
+               high_output    = 0x0;
+               high_direction = 0x0;
+
+               if (jtag_reset_config & RESET_TRST_OPEN_DRAIN)
+               {
+                       low_direction &= ~nTRSTnOE; /* nTRST input */
+                       low_output    &= ~nTRST;    /* nTRST = 0 */
+               }
+               else
+               {
+                       low_direction |= nTRSTnOE;  /* nTRST output */
+                       low_output    |= nTRST;     /* nTRST = 1 */
+               }
+
+               if (jtag_reset_config & RESET_SRST_PUSH_PULL)
+               {
+                       low_direction |= nSRSTnOE;  /* nSRST output */
+                       low_output    |= nSRST;     /* nSRST = 1 */
+               }
+               else
+               {
+                       low_direction &= ~nSRSTnOE; /* nSRST input */
+                       low_output    &= ~nSRST;    /* nSRST = 0 */
+               }
+
+#if BUILD_FT2232_FTD2XX == 1
+               /* enable power to the module */
+               if ((status = signalyzer_h_ctrl_write(
+                               SIGNALYZER_DATA_BUFFER_ADDR,
+                               ((uint32_t)(signalyzer_h_side << 8) | 0x01)))
+                       != FT_OK)
+               {
+                       LOG_ERROR("signalyzer_h_ctrl_write returned: %lu",
+                               status);
+                       return ERROR_JTAG_DEVICE_ERROR;
+               }
+
+               if ((status = signalyzer_h_ctrl_write(SIGNALYZER_COMMAND_ADDR,
+                               SIGNALYZER_COMMAND_POWERCONTROL_SET)) != FT_OK)
+               {
+                       LOG_ERROR("signalyzer_h_ctrl_write returned: %lu",
+                                       status);
+                       return ERROR_JTAG_DEVICE_ERROR;
+               }
+
+               /* set gpio mode register */
+               if ((status = signalyzer_h_ctrl_write(
+                               SIGNALYZER_DATA_BUFFER_ADDR,
+                               (uint32_t)(signalyzer_h_side << 8))) != FT_OK)
+               {
+                       LOG_ERROR("signalyzer_h_ctrl_write returned: %lu",
+                                       status);
+                       return ERROR_JTAG_DEVICE_ERROR;
+               }
+
+               if ((status = signalyzer_h_ctrl_write(
+                               SIGNALYZER_DATA_BUFFER_ADDR + 1, 0x0000))
+                       != FT_OK)
+               {
+                       LOG_ERROR("signalyzer_h_ctrl_write returned: %lu",
+                                       status);
+                       return ERROR_JTAG_DEVICE_ERROR;
+               }
+
+               if ((status = signalyzer_h_ctrl_write(SIGNALYZER_COMMAND_ADDR,
+                               SIGNALYZER_COMMAND_GPIO_MODE)) != FT_OK)
+               {
+                       LOG_ERROR("signalyzer_h_ctrl_write returned: %lu",
+                                       status);
+                       return ERROR_JTAG_DEVICE_ERROR;
+               }
+
+               /* set gpio register */
+               if ((status = signalyzer_h_ctrl_write(
+                               SIGNALYZER_DATA_BUFFER_ADDR,
+                               (uint32_t)(signalyzer_h_side << 8))) != FT_OK)
+               {
+                       LOG_ERROR("signalyzer_h_ctrl_write returned: %lu",
+                                       status);
+                       return ERROR_JTAG_DEVICE_ERROR;
+               }
+
+               if ((status = signalyzer_h_ctrl_write(
+                               SIGNALYZER_DATA_BUFFER_ADDR + 1, 0x4040))
+                       != FT_OK)
+               {
+                       LOG_ERROR("signalyzer_h_ctrl_write returned: %lu",
+                                       status);
+                       return ERROR_JTAG_DEVICE_ERROR;
+               }
+
+               if ((status = signalyzer_h_ctrl_write(
+                               SIGNALYZER_COMMAND_ADDR,
+                               SIGNALYZER_COMMAND_GPIO_STATE)) != FT_OK)
+               {
+                       LOG_ERROR("signalyzer_h_ctrl_write returned: %lu",
+                                       status);
+                       return ERROR_JTAG_DEVICE_ERROR;
+               }
+#endif
+       }
+
+       /* ADAPTOR: EM_ARM_JTAG, EM_ARM_JTAG_P, EM_JTAG, EM_JTAG_P */
+       else if ((signalyzer_h_adapter_type == SIGNALYZER_MODULE_TYPE_EM_ARM_JTAG) ||
+                               (signalyzer_h_adapter_type == SIGNALYZER_MODULE_TYPE_EM_ARM_JTAG_P) ||
+                               (signalyzer_h_adapter_type == SIGNALYZER_MODULE_TYPE_EM_JTAG)  ||
+                               (signalyzer_h_adapter_type == SIGNALYZER_MODULE_TYPE_EM_JTAG_P))
+       {
+               if (signalyzer_h_adapter_type
+                               == SIGNALYZER_MODULE_TYPE_EM_ARM_JTAG)
+                       LOG_INFO("Signalyzer: EM-ARM-JTAG (ARM JTAG) "
+                               "detected. (HW: %2x).", (read_buf[1] >> 8));
+               else if (signalyzer_h_adapter_type
+                               == SIGNALYZER_MODULE_TYPE_EM_ARM_JTAG_P)
+                       LOG_INFO("Signalyzer: EM-ARM-JTAG_P "
+                               "(ARM JTAG with PSU) detected. (HW: %2x).",
+                               (read_buf[1] >> 8));
+               else if (signalyzer_h_adapter_type
+                               == SIGNALYZER_MODULE_TYPE_EM_JTAG)
+                       LOG_INFO("Signalyzer: EM-JTAG (Generic JTAG) "
+                               "detected. (HW: %2x).", (read_buf[1] >> 8));
+               else if (signalyzer_h_adapter_type
+                               == SIGNALYZER_MODULE_TYPE_EM_JTAG_P)
+                       LOG_INFO("Signalyzer: EM-JTAG-P "
+                               "(Generic JTAG with PSU) detected. (HW: %2x).",
+                               (read_buf[1] >> 8));
+
+               nTRST          = 0x02;
+               nTRSTnOE       = 0x04;
+               nSRST          = 0x08;
+               nSRSTnOE       = 0x10;
+
+               low_output     = 0x08;
+               low_direction  = 0x1b;
+
+               high_output    = 0x0;
+               high_direction = 0x1f;
+
+               if (jtag_reset_config & RESET_TRST_OPEN_DRAIN)
+               {
+                       high_output |= nTRSTnOE;
+                       high_output &= ~nTRST;
+               }
+               else
+               {
+                       high_output &= ~nTRSTnOE;
+                       high_output |= nTRST;
+               }
+
+               if (jtag_reset_config & RESET_SRST_PUSH_PULL)
+               {
+                       high_output &= ~nSRSTnOE;
+                       high_output |= nSRST;
+               }
+               else
+               {
+                       high_output |= nSRSTnOE;
+                       high_output &= ~nSRST;
+               }
+
+#if BUILD_FT2232_FTD2XX == 1
+               /* enable power to the module */
+               if ((status = signalyzer_h_ctrl_write(
+                               SIGNALYZER_DATA_BUFFER_ADDR,
+                               ((uint32_t)(signalyzer_h_side << 8) | 0x01)))
+                       != FT_OK)
+               {
+                       LOG_ERROR("signalyzer_h_ctrl_write returned: %lu",
+                                       status);
+                       return ERROR_JTAG_DEVICE_ERROR;
+               }
+
+               if ((status = signalyzer_h_ctrl_write(
+                               SIGNALYZER_COMMAND_ADDR,
+                               SIGNALYZER_COMMAND_POWERCONTROL_SET)) != FT_OK)
+               {
+                       LOG_ERROR("signalyzer_h_ctrl_write returned: %lu",
+                                       status);
+                       return ERROR_JTAG_DEVICE_ERROR;
+               }
+
+               /* set gpio mode register (IO_16 and IO_17 set as analog
+                * inputs, other is gpio)
+                */
+               if ((status = signalyzer_h_ctrl_write(
+                               SIGNALYZER_DATA_BUFFER_ADDR,
+                               (uint32_t)(signalyzer_h_side << 8))) != FT_OK)
+               {
+                       LOG_ERROR("signalyzer_h_ctrl_write returned: %lu",
+                                       status);
+                       return ERROR_JTAG_DEVICE_ERROR;
+               }
+
+               if ((status = signalyzer_h_ctrl_write(
+                               SIGNALYZER_DATA_BUFFER_ADDR + 1, 0x0060))
+                       != FT_OK)
+               {
+                       LOG_ERROR("signalyzer_h_ctrl_write returned: %lu",
+                                       status);
+                       return ERROR_JTAG_DEVICE_ERROR;
+               }
+
+               if ((status = signalyzer_h_ctrl_write(
+                               SIGNALYZER_COMMAND_ADDR,
+                               SIGNALYZER_COMMAND_GPIO_MODE)) != FT_OK)
+               {
+                       LOG_ERROR("signalyzer_h_ctrl_write returned: %lu",
+                                       status);
+                       return ERROR_JTAG_DEVICE_ERROR;
+               }
+
+               /* set gpio register (all inputs, for -P modules,
+                * PSU will be turned off)
+                */
+               if ((status = signalyzer_h_ctrl_write(
+                               SIGNALYZER_DATA_BUFFER_ADDR,
+                               (uint32_t)(signalyzer_h_side << 8))) != FT_OK)
+               {
+                       LOG_ERROR("signalyzer_h_ctrl_write returned: %lu",
+                                       status);
+                       return ERROR_JTAG_DEVICE_ERROR;
+               }
+
+               if ((status = signalyzer_h_ctrl_write(
+                               SIGNALYZER_DATA_BUFFER_ADDR + 1, 0x0000))
+                       != FT_OK)
+               {
+                       LOG_ERROR("signalyzer_h_ctrl_write returned: %lu",
+                                       status);
+                       return ERROR_JTAG_DEVICE_ERROR;
+               }
+
+               if ((status = signalyzer_h_ctrl_write(
+                               SIGNALYZER_COMMAND_ADDR,
+                               SIGNALYZER_COMMAND_GPIO_STATE)) != FT_OK)
+               {
+                       LOG_ERROR("signalyzer_h_ctrl_write returned: %lu",
+                                       status);
+                       return ERROR_JTAG_DEVICE_ERROR;
+               }
+#endif
+       }
+
+       else if (signalyzer_h_adapter_type == 0x0000)
+       {
+               LOG_INFO("Signalyzer: No external modules were detected.");
+
+               nTRST    = 0x10;
+               nTRSTnOE = 0x10;
+               nSRST    = 0x20;
+               nSRSTnOE = 0x20;
+
+               low_output     = 0x08;
+               low_direction  = 0x1b;
+
+               high_output    = 0x0;
+               high_direction = 0x0;
+
+               if (jtag_reset_config & RESET_TRST_OPEN_DRAIN)
+               {
+                       low_direction &= ~nTRSTnOE; /* nTRST input */
+                       low_output    &= ~nTRST;    /* nTRST = 0 */
+               }
+               else
+               {
+                       low_direction |= nTRSTnOE;  /* nTRST output */
+                       low_output    |= nTRST;     /* nTRST = 1 */
+               }
+
+               if (jtag_reset_config & RESET_SRST_PUSH_PULL)
+               {
+                       low_direction |= nSRSTnOE;  /* nSRST output */
+                       low_output    |= nSRST;     /* nSRST = 1 */
+               }
+               else
+               {
+                       low_direction &= ~nSRSTnOE; /* nSRST input */
+                       low_output    &= ~nSRST;    /* nSRST = 0 */
+               }
+       }
+       else
+       {
+               LOG_ERROR("Unknown module type is detected: %.4x",
+                               signalyzer_h_adapter_type);
+               return ERROR_JTAG_DEVICE_ERROR;
+       }
+
+       /* initialize low byte of controller for jtag operation */
+       buf[0] = 0x80;
+       buf[1] = low_output;
+       buf[2] = low_direction;
+
+       if (((ft2232_write(buf, 3, &bytes_written)) != ERROR_OK)
+                       || (bytes_written != 3))
+       {
+               LOG_ERROR("couldn't initialize Signalyzer-H layout");
+               return ERROR_JTAG_INIT_FAILED;
+       }
+
+#if BUILD_FT2232_FTD2XX == 1
+       if (ftdi_device == FT_DEVICE_2232H)
+       {
+               /* initialize high byte of controller for jtag operation */
+               buf[0] = 0x82;
+               buf[1] = high_output;
+               buf[2] = high_direction;
+
+               if ((ft2232_write(buf, 3, &bytes_written) != ERROR_OK)
+                               || (bytes_written != 3))
+               {
+                       LOG_ERROR("couldn't initialize Signalyzer-H layout");
+                       return ERROR_JTAG_INIT_FAILED;
+               }
+       }
+#elif BUILD_FT2232_LIBFTDI == 1
+       if (ftdi_device == TYPE_2232H)
+       {
+               /* initialize high byte of controller for jtag operation */
+               buf[0] = 0x82;
+               buf[1] = high_output;
+               buf[2] = high_direction;
+
+               if ((ft2232_write(buf, 3, &bytes_written) != ERROR_OK)
+                               || (bytes_written != 3))
+               {
+                       LOG_ERROR("couldn't initialize Signalyzer-H layout");
+                       return ERROR_JTAG_INIT_FAILED;
+               }
+       }
+#endif
+       return ERROR_OK;
+}
+
+static void signalyzer_h_reset(int trst, int srst)
+{
+       enum reset_types jtag_reset_config = jtag_get_reset_config();
+
+       /* ADAPTOR: EM_LT16_A */
+       if (signalyzer_h_adapter_type == SIGNALYZER_MODULE_TYPE_EM_LT16_A)
+       {
+               if (trst == 1)
+               {
+                       if (jtag_reset_config & RESET_TRST_OPEN_DRAIN)
+                               /* switch to output pin (output is low) */
+                               low_direction |= nTRSTnOE;
+                       else
+                               /* switch output low */
+                               low_output &= ~nTRST;
+               }
+               else if (trst == 0)
+               {
+                       if (jtag_reset_config & RESET_TRST_OPEN_DRAIN)
+                               /* switch to input pin (high-Z + internal
+                                * and external pullup) */
+                               low_direction &= ~nTRSTnOE;
+                       else
+                               /* switch output high */
+                               low_output |= nTRST;
+               }
+
+               if (srst == 1)
+               {
+                       if (jtag_reset_config & RESET_SRST_PUSH_PULL)
+                               /* switch output low */
+                               low_output &= ~nSRST;
+                       else
+                               /* switch to output pin (output is low) */
+                               low_direction |= nSRSTnOE;
+               }
+               else if (srst == 0)
+               {
+                       if (jtag_reset_config & RESET_SRST_PUSH_PULL)
+                               /* switch output high */
+                               low_output |= nSRST;
+                       else
+                               /* switch to input pin (high-Z) */
+                               low_direction &= ~nSRSTnOE;
+               }
+
+               /* command "set data bits low byte" */
+               buffer_write(0x80);
+               buffer_write(low_output);
+               buffer_write(low_direction);
+               LOG_DEBUG("trst: %i, srst: %i, low_output: 0x%2.2x, "
+                               "low_direction: 0x%2.2x",
+                               trst, srst, low_output, low_direction);
+       }
+       /* ADAPTOR: EM_ARM_JTAG,  EM_ARM_JTAG_P, EM_JTAG, EM_JTAG_P */
+       else if ((signalyzer_h_adapter_type == SIGNALYZER_MODULE_TYPE_EM_ARM_JTAG) ||
+                               (signalyzer_h_adapter_type == SIGNALYZER_MODULE_TYPE_EM_ARM_JTAG_P) ||
+                               (signalyzer_h_adapter_type == SIGNALYZER_MODULE_TYPE_EM_JTAG)  ||
+                               (signalyzer_h_adapter_type == SIGNALYZER_MODULE_TYPE_EM_JTAG_P))
+       {
+               if (trst == 1)
+               {
+                       if (jtag_reset_config & RESET_TRST_OPEN_DRAIN)
+                               high_output &= ~nTRSTnOE;
+                       else
+                               high_output &= ~nTRST;
+               }
+               else if (trst == 0)
+               {
+                       if (jtag_reset_config & RESET_TRST_OPEN_DRAIN)
+                               high_output |= nTRSTnOE;
+                       else
+                               high_output |= nTRST;
+               }
+
+               if (srst == 1)
+               {
+                       if (jtag_reset_config & RESET_SRST_PUSH_PULL)
+                               high_output &= ~nSRST;
+                       else
+                               high_output &= ~nSRSTnOE;
+               }
+               else if (srst == 0)
+               {
+                       if (jtag_reset_config & RESET_SRST_PUSH_PULL)
+                               high_output |= nSRST;
+                       else
+                               high_output |= nSRSTnOE;
+               }
+
+               /* command "set data bits high byte" */
+               buffer_write(0x82);
+               buffer_write(high_output);
+               buffer_write(high_direction);
+               LOG_INFO("trst: %i, srst: %i, high_output: 0x%2.2x, "
+                               "high_direction: 0x%2.2x",
+                               trst, srst, high_output, high_direction);
+       }
+       else if (signalyzer_h_adapter_type == 0x0000)
+       {
+               if (trst == 1)
+               {
+                       if (jtag_reset_config & RESET_TRST_OPEN_DRAIN)
+                               /* switch to output pin (output is low) */
+                               low_direction |= nTRSTnOE;
+                       else
+                               /* switch output low */
+                               low_output &= ~nTRST;
+               }
+               else if (trst == 0)
+               {
+                       if (jtag_reset_config & RESET_TRST_OPEN_DRAIN)
+                               /* switch to input pin (high-Z + internal
+                                * and external pullup) */
+                               low_direction &= ~nTRSTnOE;
+                       else
+                               /* switch output high */
+                               low_output |= nTRST;
+               }
+
+               if (srst == 1)
+               {
+                       if (jtag_reset_config & RESET_SRST_PUSH_PULL)
+                               /* switch output low */
+                               low_output &= ~nSRST;
+                       else
+                               /* switch to output pin (output is low) */
+                               low_direction |= nSRSTnOE;
+               }
+               else if (srst == 0)
+               {
+                       if (jtag_reset_config & RESET_SRST_PUSH_PULL)
+                               /* switch output high */
+                               low_output |= nSRST;
+                       else
+                               /* switch to input pin (high-Z) */
+                               low_direction &= ~nSRSTnOE;
+               }
+
+               /* command "set data bits low byte" */
+               buffer_write(0x80);
+               buffer_write(low_output);
+               buffer_write(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 signalyzer_h_blink(void)
+{
+       signalyzer_h_led_set(signalyzer_h_side, SIGNALYZER_LED_RED, 100, 0, 1);
+}
+
+/********************************************************************
+ * Support for KT-LINK
+ * JTAG adapter from KRISTECH
+ * http://www.kristech.eu
+ *******************************************************************/
+static int ktlink_init(void)
+{
+       uint8_t  buf[3];
+       uint32_t bytes_written;
+       uint8_t  swd_en = 0x20; //0x20 SWD disable, 0x00 SWD enable (ADBUS5)
+
+       low_output    = 0x08 | swd_en; // value; TMS=1,TCK=0,TDI=0,SWD=swd_en
+       low_direction = 0x3B;          // out=1; TCK/TDI/TMS=out,TDO=in,SWD=out,RTCK=in,SRSTIN=in
+
+       // initialize low port
+       buf[0] = 0x80;          // command "set data bits low byte"
+       buf[1] = low_output;
+       buf[2] = low_direction;
+       LOG_DEBUG("%2.2x %2.2x %2.2x", buf[0], buf[1], buf[2]);
+
+       if (((ft2232_write(buf, 3, &bytes_written)) != ERROR_OK) || (bytes_written != 3))
+       {
+               LOG_ERROR("couldn't initialize FT2232 with 'ktlink' layout");
+               return ERROR_JTAG_INIT_FAILED;
+       }
+
+       nTRST    = 0x01;
+       nSRST    = 0x02;
+       nTRSTnOE = 0x04;
+       nSRSTnOE = 0x08;
+
+       high_output    = 0x80; // turn LED on
+       high_direction = 0xFF; // all outputs
+
+       enum reset_types jtag_reset_config = jtag_get_reset_config();
+
+       if (jtag_reset_config & RESET_TRST_OPEN_DRAIN) {
+               high_output |= nTRSTnOE;
+               high_output &= ~nTRST;
+       } else {
+               high_output &= ~nTRSTnOE;
+               high_output |= nTRST;
+       }
+
+       if (jtag_reset_config & RESET_SRST_PUSH_PULL) {
+               high_output &= ~nSRSTnOE;
+               high_output |= nSRST;
+       } else {
+               high_output |= nSRSTnOE;
+               high_output &= ~nSRST;
+       }
+
+       // initialize high port
+       buf[0] = 0x82;              // command "set data bits high byte"
+       buf[1] = high_output;       // value
+       buf[2] = high_direction;
+       LOG_DEBUG("%2.2x %2.2x %2.2x", buf[0], buf[1], buf[2]);
+
+       if (((ft2232_write(buf, 3, &bytes_written)) != ERROR_OK) || (bytes_written != 3))
+       {
+               LOG_ERROR("couldn't initialize FT2232 with 'ktlink' layout");
+               return ERROR_JTAG_INIT_FAILED;
+       }
+
+       return ERROR_OK;
+}
+
+static void ktlink_reset(int trst, int srst)
+{
+       enum reset_types jtag_reset_config = jtag_get_reset_config();
+
+       if (trst == 1) {
+               if (jtag_reset_config & RESET_TRST_OPEN_DRAIN)
+                       high_output &= ~nTRSTnOE;
+               else
+                       high_output &= ~nTRST;
+       } else if (trst == 0) {
+               if (jtag_reset_config & RESET_TRST_OPEN_DRAIN)
+                       high_output |= nTRSTnOE;
+               else
+                       high_output |= nTRST;
+       }
+
+       if (srst == 1) {
+               if (jtag_reset_config & RESET_SRST_PUSH_PULL)
+                       high_output &= ~nSRST;
+               else
+                       high_output &= ~nSRSTnOE;
+       } else if (srst == 0) {
+               if (jtag_reset_config & RESET_SRST_PUSH_PULL)
+                       high_output |= nSRST;
+               else
+                       high_output |= nSRSTnOE;
+       }
+
+       buffer_write(0x82); // command "set data bits high byte"
+       buffer_write(high_output);
+       buffer_write(high_direction);
+       LOG_DEBUG("trst: %i, srst: %i, high_output: 0x%2.2x, high_direction: 0x%2.2x", trst, srst, high_output,high_direction);
+}
+
+static void ktlink_blink(void)
+{
+       /* LED connected to ACBUS7 */
+       if (high_output & 0x80)
+               high_output &= 0x7F;
+       else
+               high_output |= 0x80;
+
+       buffer_write(0x82);  // command "set data bits high byte"
+       buffer_write(high_output);
+       buffer_write(high_direction);
+}
+
+static const struct command_registration ft2232_command_handlers[] = {
+       {
+               .name = "ft2232_device_desc",
+               .handler = &ft2232_handle_device_desc_command,
+               .mode = COMMAND_CONFIG,
+               .help = "set the USB device description of the FTDI FT2232 device",
+               .usage = "<description>",
+       },
+       {
+               .name = "ft2232_serial",
+               .handler = &ft2232_handle_serial_command,
+               .mode = COMMAND_CONFIG,
+               .help = "set the serial number of the FTDI FT2232 device",
+               .usage = "<serial#>",
+       },
+       {
+               .name = "ft2232_layout",
+               .handler = &ft2232_handle_layout_command,
+               .mode = COMMAND_CONFIG,
+               .help = "set the layout of the FT2232 GPIO signals used "
+                       "to control output-enables and reset signals",
+               .usage = "<layout>",
+       },
+       {
+               .name = "ft2232_vid_pid",
+               .handler = &ft2232_handle_vid_pid_command,
+               .mode = COMMAND_CONFIG,
+               .help = "the vendor ID and product ID of the FTDI FT2232 device",
+               .usage = "<vid> <pid> [...]",
+       },
+       {
+               .name = "ft2232_latency",
+               .handler = &ft2232_handle_latency_command,
+               .mode = COMMAND_CONFIG,
+               .help = "set the FT2232 latency timer to a new value",
+               .usage = "<vid> <pid> [...]",
+       },
+       COMMAND_REGISTRATION_DONE
+};
+
+struct jtag_interface ft2232_interface = {
+               .name = "ft2232",
+               .commands = ft2232_command_handlers,
+               .init = &ft2232_init,
+               .quit = &ft2232_quit,
+               .speed = &ft2232_speed,
+               .speed_div = &ft2232_speed_div,
+               .khz = &ft2232_khz,
+               .execute_queue = &ft2232_execute_queue,
+       };