This is an automated email from Gerrit.
Andreas Fritiofson (andreas.fritiof...@gmail.com) just uploaded a new patch set
to Gerrit, which you can find at http://openocd.zylin.com/1996
-- gerrit
commit 506787e8db9547cf68648a15daa77a9128992cbc
Author: Andreas Fritiofson <andreas.fritiof...@gmail.com>
Date: Mon Feb 24 21:39:41 2014 +0100
ftdi: Add separate SWD init values
Change-Id: Icbc362cce5640ea80c0df9341bb942cfd29ecd8a
Signed-off-by: Andreas Fritiofson <andreas.fritiof...@gmail.com>
diff --git a/src/jtag/drivers/ftdi.c b/src/jtag/drivers/ftdi.c
index fc6a15e..38a38a9 100644
--- a/src/jtag/drivers/ftdi.c
+++ b/src/jtag/drivers/ftdi.c
@@ -114,6 +114,10 @@ static struct signal *signals;
static uint16_t output;
static uint16_t direction;
+static uint16_t jtag_output_init;
+static uint16_t jtag_direction_init;
+static uint16_t swd_output_init;
+static uint16_t swd_direction_init;
static struct signal *find_signal_by_name(const char *name)
{
@@ -612,6 +616,9 @@ static int ftdi_initialize(void)
if (!mpsse_ctx)
return ERROR_JTAG_INIT_FAILED;
+ output = swd_mode ? swd_output_init : jtag_output_init;
+ direction = swd_mode ? swd_direction_init : jtag_direction_init;
+
mpsse_set_data_bits_low_byte(mpsse_ctx, output & 0xff, direction &
0xff);
mpsse_set_data_bits_high_byte(mpsse_ctx, output >> 8, direction >> 8);
@@ -692,8 +699,19 @@ COMMAND_HANDLER(ftdi_handle_layout_init_command)
if (CMD_ARGC != 2)
return ERROR_COMMAND_SYNTAX_ERROR;
- COMMAND_PARSE_NUMBER(u16, CMD_ARGV[0], output);
- COMMAND_PARSE_NUMBER(u16, CMD_ARGV[1], direction);
+ COMMAND_PARSE_NUMBER(u16, CMD_ARGV[0], jtag_output_init);
+ COMMAND_PARSE_NUMBER(u16, CMD_ARGV[1], jtag_direction_init);
+
+ return ERROR_OK;
+}
+
+COMMAND_HANDLER(ftdi_handle_layout_init_swd_command)
+{
+ if (CMD_ARGC != 2)
+ return ERROR_COMMAND_SYNTAX_ERROR;
+
+ COMMAND_PARSE_NUMBER(u16, CMD_ARGV[0], swd_output_init);
+ COMMAND_PARSE_NUMBER(u16, CMD_ARGV[1], swd_direction_init);
return ERROR_OK;
}
@@ -830,7 +848,17 @@ static const struct command_registration
ftdi_command_handlers[] = {
.handler = &ftdi_handle_layout_init_command,
.mode = COMMAND_CONFIG,
.help = "initialize the FTDI GPIO signals used "
- "to control output-enables and reset signals",
+ "to control output-enables and reset signals"
+ "when JTAG mode is selected",
+ .usage = "data direction",
+ },
+ {
+ .name = "ftdi_layout_init_swd",
+ .handler = &ftdi_handle_layout_init_swd_command,
+ .mode = COMMAND_CONFIG,
+ .help = "initialize the FTDI GPIO signals used "
+ "to control output-enables and reset signals"
+ "when SWD mode is selected",
.usage = "data direction",
},
{
diff --git a/tcl/interface/ftdi/jtag-lock-pick_tiny_2.cfg
b/tcl/interface/ftdi/jtag-lock-pick_tiny_2.cfg
index 73e3d00..10eedde 100644
--- a/tcl/interface/ftdi/jtag-lock-pick_tiny_2.cfg
+++ b/tcl/interface/ftdi/jtag-lock-pick_tiny_2.cfg
@@ -9,6 +9,8 @@ ftdi_device_desc "JTAG-lock-pick Tiny 2"
ftdi_vid_pid 0x0403 0x8220
ftdi_layout_init 0x8c28 0xff3b
+ftdi_layout_init_swd 0xac08 0xff3b
ftdi_layout_signal nTRST -data 0x0100 -noe 0x0400
ftdi_layout_signal nSRST -data 0x0200 -noe 0x0800
+ftdi_layout_signal SWDIO_OE -ndata 0x1000
ftdi_layout_signal LED -ndata 0x8000
--
------------------------------------------------------------------------------
Flow-based real-time traffic analytics software. Cisco certified tool.
Monitor traffic, SLAs, QoS, Medianet, WAAS etc. with NetFlow Analyzer
Customize your own dashboards, set traffic alerts and generate reports.
Network behavioral analysis & security monitoring. All-in-one tool.
http://pubads.g.doubleclick.net/gampad/clk?id=126839071&iu=/4140/ostg.clktrk
_______________________________________________
OpenOCD-devel mailing list
OpenOCD-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openocd-devel
