added a couple of FT2232 based cables

git-svn-id: https://urjtag.svn.sourceforge.net/svnroot/urjtag/trunk@1038 b68d4a1b-bc3d-0410-92ed-d4ac073336b7
17 years ago · ab08aae159
parent 68e3cf5966
commit ab08aae159
5 changed files with 446 additions and 26 deletions
--- a/jtag/NEWS
+++ b/jtag/NEWS
@ -9,6 +9,11 @@ urjtag-n/a
      - Prototype bus driver (Detrick Martin)
    * New and updated cable drivers
      - Vision EP9307 GPIO (Hartley Sweeten)
+      - Amontec JTAGkey
+      - OOCDLink-s
+      - Turtelizer 2
+      - USB to JTAG Interface
+      - Xverve DT-USB-ST Signalyzer Tool
    * Added new JTAG declarations for
      - Altera EP2C8 (Hartley Sweeten)
      - Xilinx XC2V80-FG256, XC2V250-FG256, XC2V1000-FG256 (Alexander Didebulidze)
--- a/jtag/doc/UrJTAG.txt
+++ b/jtag/doc/UrJTAG.txt
@ -211,8 +211,13 @@ See 'help cable' command for up-to-date info.
 * Mpcbdm JTAG Cable
 * Macraigor Wiggler JTAG Cable
 * Amontec JTAGkey (FT2232-based)
- * Olimex FT2232-based ARM-USB-JTAG
+ * Olimex ARM-USB-JTAG (FT2232-based)
+ * Olimex ARM-USB-TINY (FT2232-based)
+ * OOCDLink-s (FT2232-based) (experimental) http://www.joernonline.de/dw/doku.php?id=projects:oocdlink:2_oocdlinks
 * Other FT2232-based USB JTAG cables (experimental)
+ * Xverve Signalyzer Tool (FT2232-based) (experimental)
+ * Turtelizer 2 (FT2232-based) (experimental) http://www.ethernut.de/en/hardware/turtelizer/
+ * USB to JTAG Interface (FT2232-based) (experimental) http://www.hs-augsburg.de/~hhoegl/proj/usbjtag/usbjtag.html
 * Xilinx Platform USB Cable (experimental)

 ==== JTAG-aware parts (chips) ====
--- a/jtag/src/tap/cable.c
+++ b/jtag/src/tap/cable.c
@ -46,6 +46,10 @@ extern cable_driver_t usbblaster_cable_driver;
 extern cable_driver_t ft2232_cable_driver;
 extern cable_driver_t ft2232_jtagkey_cable_driver;
 extern cable_driver_t ft2232_armusbocd_cable_driver;
+extern cable_driver_t ft2232_oocdlinks_cable_driver;
+extern cable_driver_t ft2232_signalyzer_cable_driver;
+extern cable_driver_t ft2232_turtelizer2_cable_driver;
+extern cable_driver_t ft2232_usbtojtagif_cable_driver;
 #endif
 extern cable_driver_t dlc5_cable_driver;
 extern cable_driver_t ea253_cable_driver;
@ -77,6 +81,10 @@ cable_driver_t *cable_drivers[] = {
 	&ft2232_cable_driver,
 	&ft2232_jtagkey_cable_driver,
 	&ft2232_armusbocd_cable_driver,
+	&ft2232_oocdlinks_cable_driver,
+	&ft2232_signalyzer_cable_driver,
+	&ft2232_turtelizer2_cable_driver,
+	&ft2232_usbtojtagif_cable_driver,
 #endif
 	&dlc5_cable_driver,
 	&ea253_cable_driver,
--- a/jtag/src/tap/cable/ft2232.c
+++ b/jtag/src/tap/cable/ft2232.c
@ -80,31 +80,67 @@
 #define BIT_TDI 1
 #define BIT_TDO 2
 #define BIT_TMS 3
+#define BITMASK_TDO (1 << BIT_TDO)
+#define BITMASK_TDI (1 << BIT_TDI)
+#define BITMASK_TCK (1 << BIT_TCK)
+#define BITMASK_TMS (1 << BIT_TMS)
+
+/* bit and bitmask definitions for Amontec JTAGkey */
 #define BIT_JTAGKEY_nOE 4
 #define BIT_JTAGKEY_TRST_N_OUT 0
 #define BIT_JTAGKEY_SRST_N_OUT 1
 #define BIT_JTAGKEY_TRST_N_OE_N 2
 #define BIT_JTAGKEY_SRST_N_OE_N 3
-#define BIT_ARMUSBOCD_nOE 4
-#define BIT_ARMUSBOCD_nTRST 0
-#define BIT_ARMUSBOCD_nTSRST 1
-#define BIT_ARMUSBOCD_nTRST_nOE 2
-#define BIT_ARMUSBOCD_RED_LED 3
-
-#define BITMASK_TDO (1 << BIT_TDO)
-#define BITMASK_TDI (1 << BIT_TDI)
-#define BITMASK_TCK (1 << BIT_TCK)
-#define BITMASK_TMS (1 << BIT_TMS)
 #define BITMASK_JTAGKEY_nOE (1 << BIT_JTAGKEY_nOE)
 #define BITMASK_JTAGKEY_TRST_N_OUT (1 << BIT_JTAGKEY_TRST_N_OUT)
 #define BITMASK_JTAGKEY_SRST_N_OUT (1 << BIT_JTAGKEY_SRST_N_OUT)
 #define BITMASK_JTAGKEY_TRST_N_OE_N (1 << BIT_JTAGKEY_TRST_N_OE_N)
 #define BITMASK_JTAGKEY_SRST_N_OE_N (1 << BIT_JTAGKEY_SRST_N_OE_N)
+/* bit and bitmask definitions for Olimex ARM-USB-OCD */
+#define BIT_ARMUSBOCD_nOE 4
+#define BIT_ARMUSBOCD_nTRST 0
+#define BIT_ARMUSBOCD_nTSRST 1
+#define BIT_ARMUSBOCD_nTRST_nOE 2
+#define BIT_ARMUSBOCD_RED_LED 3
 #define BITMASK_ARMUSBOCD_nOE (1 << BIT_ARMUSBOCD_nOE)
 #define BITMASK_ARMUSBOCD_nTRST (1 << BIT_ARMUSBOCD_nTRST)
 #define BITMASK_ARMUSBOCD_nTSRST (1 << BIT_ARMUSBOCD_nTRST)
 #define BITMASK_ARMUSBOCD_nTRST_nOE (1 << BIT_ARMUSBOCD_nTRST_nOE)
 #define BITMASK_ARMUSBOCD_RED_LED (1 << BIT_ARMUSBOCD_RED_LED)
+/* bit and bitmask definitions for OOCDLink-s */
+#define BIT_OOCDLINKS_nTRST_nOE 0
+#define BIT_OOCDLINKS_nTRST 1
+#define BIT_OOCDLINKS_nSRST_nOE 2
+#define BIT_OOCDLINKS_nSRST 3
+#define BITMASK_OOCDLINKS_nTRST_nOE (1 << BIT_OOCDLINKS_nTRST_nOE)
+#define BITMASK_OOCDLINKS_nTRST (1 << BIT_OOCDLINKS_nTRST)
+#define BITMASK_OOCDLINKS_nSRST_nOE (1 << BIT_OOCDLINKS_nSRST_nOE)
+#define BITMASK_OOCDLINKS_nSRST (1 << BIT_OOCDLINKS_nSRST)
+/* bit and bitmask definitions for Turtelizer 2 */
+#define BIT_TURTELIZER2_nJTAGOE 4
+#define BIT_TURTELIZER2_RST 6
+#define BIT_TURTELIZER2_nTX1LED 2
+#define BIT_TURTELIZER2_nRX1LED 3
+#define BITMASK_TURTELIZER2_nJTAGOE (1 << BIT_TURTELIZER2_nJTAGOE)
+#define BITMASK_TURTELIZER2_RST (1 << BIT_TURTELIZER2_RST)
+#define BITMASK_TURTELIZER2_nTX1LED (1 << BIT_TURTELIZER2_nTX1LED)
+#define BITMASK_TURTELIZER2_nRX1LED (1 << BIT_TURTELIZER2_nRX1LED)
+/* bit and bitmask definitions for USB to JTAG Interface */
+#define BIT_USBTOJTAGIF_nTRST 4
+#define BIT_USBTOJTAGIF_RST 6
+#define BIT_USBTOJTAGIF_DBGRQ 7
+#define BIT_USBTOJTAGIF_nRxLED 2
+#define BIT_USBTOJTAGIF_nTxLED 3
+#define BITMASK_USBTOJTAGIF_nTRST (1 << BIT_USBTOJTAGIF_nTRST)
+#define BITMASK_USBTOJTAGIF_RST (1 << BIT_USBTOJTAGIF_RST)
+#define BITMASK_USBTOJTAGIF_DBGRQ (1 << BIT_USBTOJTAGIF_DBGRQ)
+#define BITMASK_USBTOJTAGIF_nRxLED (1 << BIT_USBTOJTAGIF_nRxLED)
+#define BITMASK_USBTOJTAGIF_nTxLED (1 << BIT_USBTOJTAGIF_nTxLED)
+/* bit and bitmask definitions for Xverve DT-USB-ST Signalyzer Tool */
+#define BIT_SIGNALYZER_nTRST 4
+#define BIT_SIGNALYZER_nSRST 5
+#define BITMASK_SIGNALYZER_nTRST (1 << BIT_SIGNALYZER_nTRST)
+#define BITMASK_SIGNALYZER_nSRST (1 << BIT_SIGNALYZER_nSRST)


 typedef struct {
@ -312,11 +348,6 @@ ft2232_generic_init( cable_t *cable )
 	push_to_send( params, params->low_byte_value | BITMASK_TMS );
 	push_to_send( params, params->low_byte_dir | BITMASK_TCK | BITMASK_TDI | BITMASK_TMS );

-	/* Set TCK/SK Divisor to max frequency */
-	push_to_send( params, TCK_DIVISOR );
-	push_to_send( params, 0 );
-	push_to_send( params, 0 );
-
 	/* Set Data Bits High Byte */
 	params->high_byte_value_trst_active   = 0;
 	params->high_byte_value_trst_inactive = 0;
@ -356,11 +387,6 @@ ft2232_jtagkey_init( cable_t *cable )
 	push_to_send( params, params->low_byte_value | BITMASK_TMS );
 	push_to_send( params, params->low_byte_dir | BITMASK_TCK | BITMASK_TDI | BITMASK_TMS );

-	/* Set TCK/SK Divisor to max frequency */
-	push_to_send( params, TCK_DIVISOR );
-	push_to_send( params, 0 );
-	push_to_send( params, 0 );
-
 	/* Set Data Bits High Byte
 	   default:
 	   TRST_N_OUT = 1
@ -373,6 +399,9 @@ ft2232_jtagkey_init( cable_t *cable )
 	                                        BITMASK_JTAGKEY_SRST_N_OUT | BITMASK_JTAGKEY_SRST_N_OE_N;
 	push_to_send( params, SET_BITS_HIGH );
 	push_to_send( params, params->high_byte_value_trst_inactive );
+	push_to_send( params, 0 );
+	push_to_send( params, SET_BITS_HIGH );
+	push_to_send( params, params->high_byte_value_trst_inactive );
 	push_to_send( params, params->high_byte_dir );

 	ft2232_set_frequency( cable, FT2232_MAX_TCK_FREQ );
@ -407,11 +436,6 @@ ft2232_armusbocd_init( cable_t *cable )
 	push_to_send( params, params->low_byte_value | BITMASK_TMS );
 	push_to_send( params, params->low_byte_dir | BITMASK_TCK | BITMASK_TDI | BITMASK_TMS );

-	/* Set TCK/SK Divisor */
-	push_to_send( params, TCK_DIVISOR );
-	push_to_send( params, 0 );
-	push_to_send( params, 0 );
-
 	/* Set Data Bits High Byte
 	   default:
 	   TRST = 1
@ -428,6 +452,187 @@ ft2232_armusbocd_init( cable_t *cable )
 	                                        BITMASK_ARMUSBOCD_RED_LED;
 	push_to_send( params, SET_BITS_HIGH );
 	push_to_send( params, params->high_byte_value_trst_inactive );
+	push_to_send( params, 0 );
+	push_to_send( params, SET_BITS_HIGH );
+	push_to_send( params, params->high_byte_value_trst_inactive );
+	push_to_send( params, params->high_byte_dir );
+
+	ft2232_set_frequency( cable, FT2232_MAX_TCK_FREQ );
+
+	params->last_tdo_valid = 0;
+
+	return 0;
+}
+
+
+static int
+ft2232_oocdlinks_init( cable_t *cable )
+{
+	parport_t *p = cable->port;
+	params_t *params = (params_t *)cable->params;
+
+	if (parport_open( p ))
+		return -1;
+
+	/* set loopback off */
+	push_to_send( params, LOOPBACK_END );
+	send_and_receive( cable );
+
+	/* static low byte value and direction */
+	params->low_byte_value = 0;
+	params->low_byte_dir   = 0;
+
+	/* Set Data Bits Low Byte
+		 TCK = 0, TMS = 1, TDI = 0 */
+	push_to_send( params, SET_BITS_LOW );
+	push_to_send( params, params->low_byte_value | BITMASK_TMS );
+	push_to_send( params, params->low_byte_dir | BITMASK_TCK | BITMASK_TDI | BITMASK_TMS );
+
+	/* Set Data Bits High Byte
+	   default:
+	   TRST = 1
+	   TRST buffer enable = 0
+	   SRST = 1
+	   SRST buffer enable = 0 */
+	params->high_byte_value_trst_active   = BITMASK_OOCDLINKS_nSRST;
+	params->high_byte_value_trst_inactive = BITMASK_OOCDLINKS_nTRST |
+	                                        BITMASK_OOCDLINKS_nSRST;
+	params->high_byte_dir                 = BITMASK_OOCDLINKS_nTRST | BITMASK_OOCDLINKS_nTRST_nOE |
+	                                        BITMASK_OOCDLINKS_nSRST | BITMASK_OOCDLINKS_nSRST_nOE;
+	push_to_send( params, SET_BITS_HIGH );
+	push_to_send( params, params->high_byte_value_trst_inactive );
+	push_to_send( params, 0 );
+	push_to_send( params, SET_BITS_HIGH );
+	push_to_send( params, params->high_byte_value_trst_inactive );
+	push_to_send( params, params->high_byte_dir );
+
+	ft2232_set_frequency( cable, FT2232_MAX_TCK_FREQ );
+
+	params->last_tdo_valid = 0;
+
+	return 0;
+}
+
+
+static int
+ft2232_turtelizer2_init( cable_t *cable )
+{
+	parport_t *p = cable->port;
+	params_t *params = (params_t *)cable->params;
+
+	if (parport_open( p ))
+		return -1;
+
+	/* set loopback off */
+	push_to_send( params, LOOPBACK_END );
+	send_and_receive( cable );
+
+	/* static low byte value and direction:
+	   set nJTAGOE to '0' -> activate output enables
+	   set RST to 0 -> inactive nSRST */
+	params->low_byte_value = 0;
+	params->low_byte_dir   = BITMASK_TURTELIZER2_nJTAGOE | BITMASK_TURTELIZER2_RST;
+
+	/* Set Data Bits Low Byte
+		 TCK = 0, TMS = 1, TDI = 0 */
+	push_to_send( params, SET_BITS_LOW );
+	push_to_send( params, params->low_byte_value | BITMASK_TMS );
+	push_to_send( params, params->low_byte_dir | BITMASK_TCK | BITMASK_TDI | BITMASK_TMS );
+
+	/* Set Data Bits High Byte
+	   default:
+	   TX1LED on
+	   RX1LED on */
+	params->high_byte_value_trst_active   = 0;
+	params->high_byte_value_trst_inactive = 0;
+	params->high_byte_dir                 = BITMASK_TURTELIZER2_nTX1LED | BITMASK_TURTELIZER2_nRX1LED;
+	push_to_send( params, SET_BITS_HIGH );
+	push_to_send( params, params->high_byte_value_trst_inactive );
+	push_to_send( params, params->high_byte_dir );
+
+	ft2232_set_frequency( cable, FT2232_MAX_TCK_FREQ );
+
+	params->last_tdo_valid = 0;
+
+	return 0;
+}
+
+
+static int
+ft2232_usbtojtagif_init( cable_t *cable )
+{
+	parport_t *p = cable->port;
+	params_t *params = (params_t *)cable->params;
+
+	if (parport_open( p ))
+		return -1;
+
+	/* set loopback off */
+	push_to_send( params, LOOPBACK_END );
+	send_and_receive( cable );
+
+	/* static low byte value and direction:
+	   nTRST = 1, RST = 1, DBGRQ = 0 */
+	params->low_byte_value = BITMASK_USBTOJTAGIF_nTRST | BITMASK_USBTOJTAGIF_RST;
+	params->low_byte_dir   = BITMASK_USBTOJTAGIF_nTRST | BITMASK_USBTOJTAGIF_RST | BITMASK_USBTOJTAGIF_DBGRQ;
+
+	/* Set Data Bits Low Byte
+		 TCK = 0, TMS = 1, TDI = 0 */
+	push_to_send( params, SET_BITS_LOW );
+	push_to_send( params, params->low_byte_value | BITMASK_TMS );
+	push_to_send( params, params->low_byte_dir | BITMASK_TCK | BITMASK_TDI | BITMASK_TMS );
+
+	/* Set Data Bits High Byte
+	   default:
+	   RxLED on
+	   TxLED on */
+	params->high_byte_value_trst_active   = 0;
+	params->high_byte_value_trst_inactive = 0;
+	params->high_byte_dir                 = BITMASK_USBTOJTAGIF_nRxLED | BITMASK_USBTOJTAGIF_nTxLED;
+	push_to_send( params, SET_BITS_HIGH );
+	push_to_send( params, params->high_byte_value_trst_inactive );
+	push_to_send( params, params->high_byte_dir );
+
+	/* I-couplers can only work up to 3 MHz
+	   ref. http://www.hs-augsburg.de/~hhoegl/proj/usbjtag/usbjtag.html */
+	ft2232_set_frequency( cable, FT2232_MAX_TCK_FREQ/2 );
+
+	params->last_tdo_valid = 0;
+
+	return 0;
+}
+
+
+static int
+ft2232_signalyzer_init( cable_t *cable )
+{
+	parport_t *p = cable->port;
+	params_t *params = (params_t *)cable->params;
+
+	if (parport_open( p ))
+		return -1;
+
+	/* set loopback off */
+	push_to_send( params, LOOPBACK_END );
+	send_and_receive( cable );
+
+	/* static low byte value and direction:
+	   nTRST = 1, RST = 1, DBGRQ = 0 */
+	params->low_byte_value = BITMASK_SIGNALYZER_nTRST | BITMASK_SIGNALYZER_nSRST;
+	params->low_byte_dir   = BITMASK_SIGNALYZER_nTRST | BITMASK_SIGNALYZER_nSRST;
+
+	/* Set Data Bits Low Byte
+		 TCK = 0, TMS = 1, TDI = 0 */
+	push_to_send( params, SET_BITS_LOW );
+	push_to_send( params, params->low_byte_value | BITMASK_TMS );
+	push_to_send( params, params->low_byte_dir | BITMASK_TCK | BITMASK_TDI | BITMASK_TMS );
+
+	/* Set Data Bits High Byte */
+	params->high_byte_value_trst_active   = 0;
+	params->high_byte_value_trst_inactive = 0;
+	params->high_byte_dir                 = 0;
+	push_to_send( params, SET_BITS_HIGH );
+	push_to_send( params, params->high_byte_value_trst_inactive );
 	push_to_send( params, params->high_byte_dir );

 	ft2232_set_frequency( cable, FT2232_MAX_TCK_FREQ );
@ -538,6 +743,131 @@ ft2232_armusbocd_done( cable_t *cable )
 }


+static void
+ft2232_oocdlinks_done( cable_t *cable )
+{
+	parport_t *p = cable->port;
+	params_t *params = (params_t *)cable->params;
+
+	/* Set Data Bits Low Byte
+		 set all to input */
+	push_to_send( params, SET_BITS_LOW );
+	push_to_send( params, 0 );
+	push_to_send( params, 0 );
+
+	/* Set Data Bits High Byte
+		 disable output drivers */
+	push_to_send( params, SET_BITS_HIGH );
+	push_to_send( params, BITMASK_OOCDLINKS_nTRST | BITMASK_OOCDLINKS_nTRST_nOE |
+	                      BITMASK_OOCDLINKS_nSRST | BITMASK_OOCDLINKS_nSRST_nOE );
+	push_to_send( params, BITMASK_OOCDLINKS_nTRST | BITMASK_OOCDLINKS_nTRST_nOE |
+	                      BITMASK_OOCDLINKS_nSRST | BITMASK_OOCDLINKS_nSRST_nOE );
+
+	/* Set Data Bits High Byte
+		 set all to input */
+	push_to_send( params, SET_BITS_HIGH );
+	push_to_send( params, BITMASK_OOCDLINKS_nTRST | BITMASK_OOCDLINKS_nTRST_nOE |
+	                      BITMASK_OOCDLINKS_nSRST | BITMASK_OOCDLINKS_nSRST_nOE );
+	push_to_send( params, 0 );
+	send_and_receive( cable );
+
+	parport_close( p );
+}
+
+
+static void
+ft2232_turtelizer2_done( cable_t *cable )
+{
+	parport_t *p = cable->port;
+	params_t *params = (params_t *)cable->params;
+
+	/* Set Data Bits Low Byte
+		 disable output drivers */
+	push_to_send( params, SET_BITS_LOW );
+	push_to_send( params, BITMASK_TURTELIZER2_nJTAGOE );
+	push_to_send( params, BITMASK_TURTELIZER2_nJTAGOE );
+
+	/* Set Data Bits Low Byte
+		 set all to input */
+	push_to_send( params, SET_BITS_LOW );
+	push_to_send( params, BITMASK_TURTELIZER2_nJTAGOE );
+	push_to_send( params, 0 );
+
+	/* Set Data Bits High Byte
+		 switch off LEDs */
+	push_to_send( params, SET_BITS_HIGH );
+	push_to_send( params, BITMASK_TURTELIZER2_nTX1LED | BITMASK_TURTELIZER2_nRX1LED );
+	push_to_send( params, BITMASK_TURTELIZER2_nTX1LED | BITMASK_TURTELIZER2_nRX1LED );
+
+	/* Set Data Bits High Byte
+		 set all to input */
+	push_to_send( params, SET_BITS_HIGH );
+	push_to_send( params, 0 );
+	push_to_send( params, 0 );
+	send_and_receive( cable );
+
+	parport_close( p );
+}
+
+
+static void
+ft2232_usbtojtagif_done( cable_t *cable )
+{
+	parport_t *p = cable->port;
+	params_t *params = (params_t *)cable->params;
+
+	/* Set Data Bits Low Byte
+		 set all to input */
+	push_to_send( params, SET_BITS_LOW );
+	push_to_send( params, BITMASK_USBTOJTAGIF_nTRST | BITMASK_USBTOJTAGIF_RST );
+	push_to_send( params, 0 );
+
+	/* Set Data Bits High Byte
+		 disable output drivers */
+	push_to_send( params, SET_BITS_HIGH );
+	push_to_send( params, BITMASK_USBTOJTAGIF_nRxLED | BITMASK_USBTOJTAGIF_nTxLED );
+	push_to_send( params, BITMASK_USBTOJTAGIF_nRxLED | BITMASK_USBTOJTAGIF_nTxLED );
+
+	/* Set Data Bits High Byte
+		 set all to input */
+	push_to_send( params, SET_BITS_HIGH );
+	push_to_send( params, BITMASK_USBTOJTAGIF_nRxLED | BITMASK_USBTOJTAGIF_nTxLED );
+	push_to_send( params, 0 );
+	send_and_receive( cable );
+
+	parport_close( p );
+}
+
+
+static void
+ft2232_signalyzer_done( cable_t *cable )
+{
+	parport_t *p = cable->port;
+	params_t *params = (params_t *)cable->params;
+
+	/* Set Data Bits Low Byte
+		 set all to input */
+	push_to_send( params, SET_BITS_LOW );
+	push_to_send( params, BITMASK_SIGNALYZER_nTRST | BITMASK_SIGNALYZER_nSRST );
+	push_to_send( params, 0 );
+
+	/* Set Data Bits High Byte
+		 disable output drivers */
+	push_to_send( params, SET_BITS_HIGH );
+	push_to_send( params, BITMASK_SIGNALYZER_nTRST | BITMASK_SIGNALYZER_nSRST );
+	push_to_send( params, BITMASK_SIGNALYZER_nTRST | BITMASK_SIGNALYZER_nSRST );
+
+	/* Set Data Bits High Byte
+		 set all to input */
+	push_to_send( params, SET_BITS_HIGH );
+	push_to_send( params, 0 );
+	push_to_send( params, 0 );
+	send_and_receive( cable );
+
+	parport_close( p );
+}
+
+
 static void
 ft2232_clock_schedule( cable_t *cable, int tms, int tdi, int n )
 {
@ -1089,6 +1419,77 @@ cable_driver_t ft2232_jtagkey_cable_driver = {
 	ft2232_usbcable_help
 };

+cable_driver_t ft2232_oocdlinks_cable_driver = {
+	"OOCDLink-s",
+	N_("OOCDLink-s (FT2232) Cable (EXPERIMENTAL)"),
+	ft2232_connect,
+	generic_disconnect,
+	ft2232_cable_free,
+	ft2232_oocdlinks_init,
+	ft2232_oocdlinks_done,
+	ft2232_set_frequency,
+	ft2232_clock,
+	ft2232_get_tdo,
+	ft2232_transfer,
+	ft2232_set_trst,
+	generic_get_trst,
+	ft2232_flush,
+	ft2232_usbcable_help
+};
+
+cable_driver_t ft2232_turtelizer2_cable_driver = {
+	"Turtelizer2",
+	N_("Turtelizer 2 Rev. B (FT2232) Cable (EXPERIMENTAL)"),
+	ft2232_connect,
+	generic_disconnect,
+	ft2232_cable_free,
+	ft2232_turtelizer2_init,
+	ft2232_turtelizer2_done,
+	ft2232_set_frequency,
+	ft2232_clock,
+	ft2232_get_tdo,
+	ft2232_transfer,
+	ft2232_set_trst,
+	generic_get_trst,
+	ft2232_flush,
+	ft2232_usbcable_help
+};
+
+cable_driver_t ft2232_usbtojtagif_cable_driver = {
+	"USB-to-JTAG-IF",
+	N_("USB to JTAG Interface (FT2232) Cable (EXPERIMENTAL)"),
+	ft2232_connect,
+	generic_disconnect,
+	ft2232_cable_free,
+	ft2232_usbtojtagif_init,
+	ft2232_usbtojtagif_done,
+	ft2232_set_frequency,
+	ft2232_clock,
+	ft2232_get_tdo,
+	ft2232_transfer,
+	ft2232_set_trst,
+	generic_get_trst,
+	ft2232_flush,
+	ft2232_usbcable_help
+};
+
+cable_driver_t ft2232_signalyzer_cable_driver = {
+	"Signalyzer",
+	N_("Xverve DT-USB-ST Signalyzer Tool (FT2232) Cable (EXPERIMENTAL)"),
+	ft2232_connect,
+	generic_disconnect,
+	ft2232_cable_free,
+	ft2232_signalyzer_init,
+	ft2232_signalyzer_done,
+	ft2232_set_frequency,
+	ft2232_clock,
+	ft2232_get_tdo,
+	ft2232_transfer,
+	ft2232_set_trst,
+	generic_get_trst,
+	ft2232_flush,
+	ft2232_usbcable_help
+};


 /*
--- a/jtag/src/tap/parport/ftdi.c
+++ b/jtag/src/tap/parport/ftdi.c
@ -226,6 +226,7 @@ ftdi_generic_open( parport_t *parport )
 		if(r<0) r = ftdi_usb_open_desc(fc, 0x16C0, 0x06AD, NULL, p->serial); /* http://www.ixo.de/info/usb_jtag/ */
 		if(r<0) r = ftdi_usb_open_desc(fc, 0x0403, 0xCFF8, NULL, p->serial); /* Amontec JTAGkey http://www.amontec.com/jtagkey.shtml */
 		if(r<0) r = ftdi_usb_open_desc(fc, 0x15BA, 0x0003, NULL, p->serial); /* Olimex ARM-USB-OCD */
+		if(r<0) r = ftdi_usb_open_desc(fc, 0x0403, 0xBDC8, NULL, p->serial); /* Turtelizer 2 */
 	};

 	if(r<0)