STLINK: swd transport renamed and jtag+swim transport added

This patch add jtag support to the stlink driver add
two new transport types, JTAG and SWIM.

Change-Id: I7089d74250330be5c6a01c24066307641df7d11e
Signed-off-by: Mathias K <kesmtp@freenet.de>
Reviewed-on: http://openocd.zylin.com/393
Tested-by: jenkins
Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>

6 files changed, 68 insertions, 13 deletions

diff --git a/src/jtag/stlink/stlink_interface.c b/src/jtag/stlink/stlink_interface.c
index fc5edc61..6a856945 100644
--- a/src/jtag/stlink/stlink_interface.c
+++ b/src/jtag/stlink/stlink_interface.c
@@ -28,16 +28,20 @@
 
 #include <jtag/stlink/stlink_tcl.h>
 #include <jtag/stlink/stlink_layout.h>
+#include <jtag/stlink/stlink_transport.h>
 #include <jtag/stlink/stlink_interface.h>
 
 #include <target/target.h>
 
-static struct stlink_interface_s stlink_if = { {0, 0, 0, 0}, 0, 0 };
+static struct stlink_interface_s stlink_if = { {0, 0, 0, 0, 0}, 0, 0 };
 
-int stlink_interface_open(void)
+int stlink_interface_open(enum stlink_transports tr)
 {
 	LOG_DEBUG("stlink_interface_open");
 
+	/* set transport mode */
+	stlink_if.param.transport = tr;
+
 	return stlink_if.layout->open(&stlink_if);
 }
 
@@ -45,6 +49,8 @@ int stlink_interface_init_target(struct target *t)
 {
 	int res;
 
+	LOG_DEBUG("stlink_interface_init_target");
+
 	/* this is the interface for the current target and we
 	 * can setup the private pointer in the tap structure
 	 * if the interface match the tap idcode
diff --git a/src/jtag/stlink/stlink_interface.h b/src/jtag/stlink/stlink_interface.h
index 9b3f791e..b1bffc77 100644
--- a/src/jtag/stlink/stlink_interface.h
+++ b/src/jtag/stlink/stlink_interface.h
@@ -23,6 +23,8 @@
 /** */
 struct target;
 /** */
+enum e_stlink_transports;
+/** */
 extern const char *stlink_transports[];
 
 struct stlink_interface_param_s {
@@ -34,6 +36,8 @@ struct stlink_interface_param_s {
 	uint16_t vid;
 	/** */
 	uint16_t pid;
+	/** */
+	enum stlink_transports transport;
 };
 
 struct stlink_interface_s {
@@ -46,7 +50,7 @@ struct stlink_interface_s {
 };
 
 /** */
-int stlink_interface_open(void);
+int stlink_interface_open(enum stlink_transports tr);
 /** */
 int stlink_interface_init_target(struct target *t);
 
diff --git a/src/jtag/stlink/stlink_layout.c b/src/jtag/stlink/stlink_layout.c
index 4d510bb0..0681d2a6 100644
--- a/src/jtag/stlink/stlink_layout.c
+++ b/src/jtag/stlink/stlink_layout.c
@@ -29,6 +29,7 @@
 
 #include <jtag/stlink/stlink_layout.h>
 #include <jtag/stlink/stlink_tcl.h>
+#include <jtag/stlink/stlink_transport.h>
 #include <jtag/stlink/stlink_interface.h>
 
 #define STLINK_LAYOUT_UNKNOWN	0
@@ -46,7 +47,7 @@ static int stlink_layout_open(struct stlink_interface_s *stlink_if)
 	res = stlink_if->layout->api->open(&stlink_if->param, &stlink_if->fd);
 
 	if (res != ERROR_OK) {
-		LOG_DEBUG("stlink_layout_open: failed");
+		LOG_DEBUG("failed");
 		return res;
 	}
 
@@ -64,7 +65,7 @@ static const struct stlink_layout stlink_layouts[] = {
 	 .type = STLINK_LAYOUT_USB,
 	 .open = stlink_layout_open,
 	 .close = stlink_layout_close,
-	 .api = &stlink_layout_api,
+	 .api = &stlink_usb_layout_api,
 	 },
 	{.name = NULL, /* END OF TABLE */ },
 };
diff --git a/src/jtag/stlink/stlink_layout.h b/src/jtag/stlink/stlink_layout.h
index bf1e2c68..caae8284 100644
--- a/src/jtag/stlink/stlink_layout.h
+++ b/src/jtag/stlink/stlink_layout.h
@@ -25,7 +25,7 @@ struct stlink_interface_s;
 struct stlink_interface_param_s;
 
 /** */
-extern struct stlink_layout_api_s stlink_layout_api;
+extern struct stlink_layout_api_s stlink_usb_layout_api;
 
 /** */
 struct stlink_layout_api_s {
diff --git a/src/jtag/stlink/stlink_transport.c b/src/jtag/stlink/stlink_transport.c
index 14e59ec7..dc3c6810 100644
--- a/src/jtag/stlink/stlink_transport.c
+++ b/src/jtag/stlink/stlink_transport.c
@@ -29,6 +29,7 @@
 #include <helper/time_support.h>
 #include <target/target.h>
 #include <jtag/stlink/stlink_tcl.h>
+#include <jtag/stlink/stlink_transport.h>
 #include <jtag/stlink/stlink_interface.h>
 
 COMMAND_HANDLER(stlink_transport_jtag_command)
@@ -138,13 +139,35 @@ static int stlink_transport_init(struct command_context *cmd_ctx)
 {
 	LOG_DEBUG("stlink_transport_init");
 	struct target *t = get_current_target(cmd_ctx);
+	struct transport *transport;
+	enum stlink_transports tr;
 
 	if (!t) {
-		LOG_ERROR("stlink_transport_init: no current target");
+		LOG_ERROR("no current target");
 		return ERROR_FAIL;
 	}
 
-	int retval = stlink_interface_open();
+	transport = get_current_transport();
+
+	if (!transport) {
+		LOG_ERROR("no transport selected");
+		return ERROR_FAIL;
+	}
+
+	LOG_DEBUG("current transport %s", transport->name);
+
+	/* get selected transport as enum */
+	tr = STLINK_TRANSPORT_UNKNOWN;
+
+	if (strcmp(transport->name, "stlink_swd") == 0)
+		tr = STLINK_TRANSPORT_SWD;
+	else if (strcmp(transport->name, "stlink_jtag") == 0)
+		tr = STLINK_TRANSPORT_JTAG;
+	else if (strcmp(transport->name, "stlink_swim") == 0)
+		tr = STLINK_TRANSPORT_SWIM;
+
+	int retval = stlink_interface_open(tr);
+
 	if (retval != ERROR_OK)
 		return retval;
 
@@ -169,21 +192,35 @@ static int stlink_transport_select(struct command_context *ctx)
 	return ERROR_OK;
 }
 
-static struct transport stlink_transport = {
-	.name = "stlink",
+static struct transport stlink_swd_transport = {
+	.name = "stlink_swd",
+	.select = stlink_transport_select,
+	.init = stlink_transport_init,
+};
+
+static struct transport stlink_jtag_transport = {
+	.name = "stlink_jtag",
+	.select = stlink_transport_select,
+	.init = stlink_transport_init,
+};
+
+static struct transport stlink_swim_transport = {
+	.name = "stlink_swim",
 	.select = stlink_transport_select,
 	.init = stlink_transport_init,
 };
 
-const char *stlink_transports[] = { "stlink", NULL };
+const char *stlink_transports[] = { "stlink_swd", "stlink_jtag", "stlink_swim", NULL };
 
 static void stlink_constructor(void) __attribute__ ((constructor));
 static void stlink_constructor(void)
 {
-	transport_register(&stlink_transport);
+	transport_register(&stlink_swd_transport);
+	transport_register(&stlink_jtag_transport);
+	transport_register(&stlink_swim_transport);
 }
 
 bool transport_is_stlink(void)
 {
-	return get_current_transport() == &stlink_transport;
+	return get_current_transport() == &stlink_swd_transport;
 }
diff --git a/src/jtag/stlink/stlink_transport.h b/src/jtag/stlink/stlink_transport.h
index 066b194b..e5197dae 100644
--- a/src/jtag/stlink/stlink_transport.h
+++ b/src/jtag/stlink/stlink_transport.h
@@ -20,4 +20,11 @@
 #ifndef _STLINK_TRANSPORT_
 #define _STLINK_TRANSPORT_
 
+enum stlink_transports {
+	STLINK_TRANSPORT_UNKNOWN = 0,
+	STLINK_TRANSPORT_SWD,
+	STLINK_TRANSPORT_JTAG,
+	STLINK_TRANSPORT_SWIM
+};
+
 #endif