FT2232: LT-LINK interface layout initialization routines: renamed existing layout to be ktlink_jtag, added ktlink_swd layout and initialization routine. Updated existing configuration file kt-link.cfg to match ktlink_jtag layout.

2 files changed, 67 insertions, 9 deletions

diff --git a/src/jtag/drivers/ft2232.c b/src/jtag/drivers/ft2232.c
index c040b740..215c13e8 100644
--- a/src/jtag/drivers/ft2232.c
+++ b/src/jtag/drivers/ft2232.c
@@ -199,7 +199,8 @@ static int icebear_jtag_init(void);
 static int cortino_jtag_init(void);
 static int signalyzer_init(void);
 static int signalyzer_h_init(void);
-static int ktlink_init(void);
+static int ktlink_init_jtag(void);
+static int ktlink_init_swd(void);
 static int redbee_init(void);
 static int lisa_l_init(void);
 static int flossjtag_init(void);
@@ -313,10 +314,15 @@ static const struct ft2232_layout  ft2232_layouts[] =
 		.reset = signalyzer_h_reset,
 		.blink = signalyzer_h_blink
 	},
-	{ .name = "ktlink",
-		.init = ktlink_init,
+	{ .name = "ktlink_jtag",
+		.init = ktlink_init_jtag,
 		.reset = ktlink_reset,
-		.blink = ktlink_blink
+		.blink = ktlink_blink,
+	},
+	{ .name = "ktlink_swd",
+		.init = ktlink_init_swd,
+		.reset = ktlink_reset,
+		.blink = ktlink_blink,
 	},
 	{ .name = "redbee-econotag",
 		.init = redbee_init,
@@ -4484,10 +4490,11 @@ static void signalyzer_h_blink(void)
 
 /********************************************************************
  * Support for KT-LINK
- * JTAG adapter from KRISTECH
+ * JTAG and SWD adapter from KRISTECH
  * http://www.kristech.eu
  *******************************************************************/
-static int ktlink_init(void)
+/*
+static int ktlink_init_jtag(void)
 {
 	uint8_t  swd_en = 0x20; //0x20 SWD disable, 0x00 SWD enable (ADBUS5)
 
@@ -4497,7 +4504,7 @@ static int ktlink_init(void)
 	/* initialize low byte for jtag */
 	if (ft2232_set_data_bits_low_byte(low_output,low_direction) != ERROR_OK)
 	{
-		LOG_ERROR("couldn't initialize FT2232 with 'ktlink' layout");
+		LOG_ERROR("couldn't initialize FT2232 with 'ktlink_jtag' layout");
 		return ERROR_JTAG_INIT_FAILED;
 	}
 
@@ -4530,13 +4537,64 @@ static int ktlink_init(void)
 	/* initialize high byte for jtag */
 	if (ft2232_set_data_bits_high_byte(high_output,high_direction) != ERROR_OK)
 	{
-		LOG_ERROR("couldn't initialize FT2232 with 'ktlink' layout");
+		LOG_ERROR("couldn't initialize FT2232 with 'ktlink_jtag' layout");
 		return ERROR_JTAG_INIT_FAILED;
 	}
 
+	LOG_INFO("KT-LINK JTAG-Mode initialization complete...");     
 	return ERROR_OK;
 }
 
+/* KT-LINK SWD Support added by Tomasz Boleslaw CEDRO (http://www.tomek.cedro.info). */
+static int ktlink_init_swd(void)
+{
+	/* High Byte (ACBUS) members. */
+	static uint8_t nSWCLKen=0x40, nTDIen=0x20, TRST=0x01, nTRSTen=0x04, SRST=0x02, nSRSTen=0x08, LED=0x80;
+	//RnW=0x10, LED=0x80;
+	/* Low Byte (ADBUS) members. */
+	static uint8_t SWCLK=0x01, TDI=0x02, TDO=0x04, nSWDIOsel=0x20;
+
+	nTRST    = TRST;
+	nSRST    = SRST;
+	nTRSTnOE = nTRSTen;
+	nSRSTnOE = nSRSTen;
+
+	/* Set ADBUS Port Data: SWCLK=0, TDI=0,TDO=1, nSWDIOsel=0 */
+	low_output = 0 | TDO;
+	/* Set ADBUS Port Direction (1=Output) */
+	low_direction = 0 | SWCLK | TDI | nSWDIOsel; 
+
+	/* initialize low byte port (ADBUS) */
+	if (ft2232_set_data_bits_low_byte(low_output,low_direction) != ERROR_OK)
+	{
+		LOG_ERROR("couldn't initialize FT2232 ADBUS with 'ktlink_swd' layout");
+		return ERROR_JTAG_INIT_FAILED;
+	}
+
+	/* Set Data Bits High Byte (ACBUS)                                */
+	/* Enable SWD pins  : nTCKen=0, RnW=1, nSRSTen=0, nLED=0, SRST=1  */
+	/* Disable JTAG pins: nTDIen=1, nSWDIOen=1, nTRSTen=1             */ 
+	//high_output = 0 | RnW | SRST | nTDIen | nTRSTen;
+	high_output = 0 | nTDIen | nTRSTen;
+	/* Set ACBUS Port Direction (1=Output) */
+	//high_direction = 0 | RnW | nSWCLKen | nTDIen | nTRSTen | nSRSTen | SRST | LED;
+	high_direction = 0 | nSWCLKen | nTDIen | nTRSTen | LED;
+
+	/* initialize high byte port (ACBUS) */
+	if (ft2232_set_data_bits_high_byte(high_output,high_direction) != ERROR_OK)
+	{
+		LOG_ERROR("couldn't initialize FT2232 ACBUS with 'ktlink_swd' layout");
+		return ERROR_JTAG_INIT_FAILED;
+	}
+
+	/* Additional bit-bang signals should be placed in a configuration file. */
+
+	LOG_INFO("KT-LINK SWD-Mode initialization complete...");     
+	return ERROR_OK;
+}
+
+
+
 static void ktlink_reset(int trst, int srst)
 {
 	enum reset_types jtag_reset_config = jtag_get_reset_config();
diff --git a/tcl/interface/kt-link.cfg b/tcl/interface/kt-link.cfg
index 93af8e44..e3585ced 100644
--- a/tcl/interface/kt-link.cfg
+++ b/tcl/interface/kt-link.cfg
@@ -6,5 +6,5 @@
 
 interface ft2232
 ft2232_device_desc "KT-LINK"
-ft2232_layout ktlink
+ft2232_layout ktlink_jtag
 ft2232_vid_pid 0x0403 0xBBE2