From 98da554bbd560fa5af0c639140fe34e211bf38da Mon Sep 17 00:00:00 2001
From: drath <drath@b42882b7-edfa-0310-969c-e2dbd0fdcd60>
Date: Fri, 30 Mar 2007 09:56:31 +0000
Subject: - added support for Turtelizer 2 (USB JTAG interface) (Thanks to
Michael Fischer for this patch) - fixed description of arm9tdmi vector_catch
command
git-svn-id: svn://svn.berlios.de/openocd/trunk@137 b42882b7-edfa-0310-969c-e2dbd0fdcd60
---
src/jtag/ft2232.c | 84 +++++++++++++++++++++++++++++++++++++++++++++++++++
src/openocd.c | 2 +-
src/target/arm9tdmi.c | 2 +-
3 files changed, 86 insertions(+), 2 deletions(-)
diff --git a/src/jtag/ft2232.c b/src/jtag/ft2232.c
index 2a8c7387..fa27d900 100644
--- a/src/jtag/ft2232.c
+++ b/src/jtag/ft2232.c
@@ -93,15 +93,18 @@ int usbjtag_init(void);
int jtagkey_init(void);
int olimex_jtag_init(void);
int m5960_init(void);
+int turtle_init(void);
/* reset procedures for supported layouts */
void usbjtag_reset(int trst, int srst);
void jtagkey_reset(int trst, int srst);
void olimex_jtag_reset(int trst, int srst);
void m5960_reset(int trst, int srst);
+void turtle_reset(int trst, int srst);
/* blink procedures for layouts that support a blinking led */
void olimex_jtag_blink(void);
+void turtle_jtag_blink(void);
ft2232_layout_t ft2232_layouts[] =
{
@@ -113,6 +116,7 @@ ft2232_layout_t ft2232_layouts[] =
{"evb_lm3s811", usbjtag_init, usbjtag_reset, NULL},
{"olimex-jtag", olimex_jtag_init, olimex_jtag_reset, olimex_jtag_blink},
{"m5960", m5960_init, m5960_reset, NULL},
+ {"turtelizer2", turtle_init, turtle_reset, turtle_jtag_blink},
{NULL, NULL, NULL},
};
@@ -1002,6 +1006,26 @@ void m5960_reset(int trst, int srst)
DEBUG("trst: %i, srst: %i, high_output: 0x%2.2x, high_direction: 0x%2.2x", trst, srst, high_output, high_direction);
}
+void turtle_reset(int trst, int srst)
+{
+ trst = trst;
+
+ if (srst == 1)
+ {
+ low_output |= nSRST;
+ }
+ else if (srst == 0)
+ {
+ low_output &= ~nSRST;
+ }
+
+ /* command "set data bits high byte" */
+ BUFFER_ADD = 0x80;
+ BUFFER_ADD = low_output;
+ BUFFER_ADD = low_direction;
+ DEBUG("srst: %i, low_output: 0x%2.2x, low_direction: 0x%2.2x", srst, low_output, low_direction);
+}
+
int ft2232_execute_queue()
{
jtag_command_t *cmd = jtag_command_queue; /* currently processed command */
@@ -1682,6 +1706,46 @@ int m5960_init(void)
return ERROR_OK;
}
+int turtle_init(void)
+{
+ u8 buf[3];
+ u32 bytes_written;
+
+ low_output = 0x08;
+ low_direction = 0x5b;
+
+ /* 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 */
+ 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))
+ {
+ ERROR("couldn't initialize FT2232 with 'turtelizer2' layout");
+ return ERROR_JTAG_INIT_FAILED;
+ }
+
+ nSRST = 0x40;
+
+ high_output = 0x00;
+ high_direction = 0x0C;
+
+ /* initialize high port */
+ buf[0] = 0x82; /* command "set data bits high byte" */
+ buf[1] = high_output;
+ buf[2] = high_direction;
+ 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))
+ {
+ ERROR("couldn't initialize FT2232 with 'turtelizer2' layout");
+ return ERROR_JTAG_INIT_FAILED;
+ }
+
+ return ERROR_OK;
+}
+
void olimex_jtag_blink(void)
{
/* Olimex ARM-USB-OCD has a LED connected to ACBUS3
@@ -1703,6 +1767,26 @@ void olimex_jtag_blink(void)
BUFFER_ADD = high_direction;
}
+void turtle_jtag_blink(void)
+{
+ /*
+ * Turtelizer2 has two LEDs connected to ACBUS2 and ACBUS3
+ */
+ if (high_output & 0x08)
+ {
+ high_output = 0x04;
+ }
+ else
+ {
+ high_output = 0x08;
+ }
+
+ BUFFER_ADD = 0x82;
+ BUFFER_ADD = high_output;
+ BUFFER_ADD = high_direction;
+}
+
+
int ft2232_quit(void)
{
#if BUILD_FT2232_FTD2XX == 1
diff --git a/src/openocd.c b/src/openocd.c
index 0b6d1bc0..6b1fa080 100644
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -18,7 +18,7 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
-#define OPENOCD_VERSION "Open On-Chip Debugger (2007-03-28 18:30 CEST)"
+#define OPENOCD_VERSION "Open On-Chip Debugger (2007-03-30 12:00 CEST)"
#ifdef HAVE_CONFIG_H
#include "config.h"
diff --git a/src/target/arm9tdmi.c b/src/target/arm9tdmi.c
index 4a991c10..dd1ee79d 100644
--- a/src/target/arm9tdmi.c
+++ b/src/target/arm9tdmi.c
@@ -1015,7 +1015,7 @@ int arm9tdmi_register_commands(struct command_context_s *cmd_ctx)
arm9tdmi_cmd = register_command(cmd_ctx, NULL, "arm9tdmi", NULL, COMMAND_ANY, "arm9tdmi specific commands");
- register_command(cmd_ctx, arm9tdmi_cmd, "vector_catch", handle_arm9tdmi_catch_vectors_command, COMMAND_EXEC, "catch arm920t vectors ['all'|'none'|'<vec1,vec2,...>']");
+ register_command(cmd_ctx, arm9tdmi_cmd, "vector_catch", handle_arm9tdmi_catch_vectors_command, COMMAND_EXEC, "catch arm920t vectors ['all'|'none'|'<vec1 vec2 ...>']");
return ERROR_OK;
--
cgit v1.2.3