X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fjtag%2Fhla%2Fhla_transport.c;h=fbdddfd651de724487688e3bdb36d986c70b0fc1;hb=ffe6bc82201ff3dceea193af530738d868258b0b;hp=e3c003dc44ecbe764d86fa6be6d25c19e576a5ac;hpb=08d4411b59dd8bd0e7d8009003b71d23acbf6eee;p=openocd.git

diff --git a/src/jtag/hla/hla_transport.c b/src/jtag/hla/hla_transport.c
index e3c003dc44..fbdddfd651 100644
--- a/src/jtag/hla/hla_transport.c
+++ b/src/jtag/hla/hla_transport.c
@@ -16,9 +16,7 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
@@ -134,6 +132,12 @@ static const struct command_registration stlink_transport_command_handlers[] = {
 	 .usage = "",
 	 .chain = hl_transport_jtag_subcommand_handlers,
 	 },
+	{
+	 .name = "jtag_ntrst_delay",
+	 .mode = COMMAND_ANY,
+	 .handler = hl_transport_jtag_command,
+	 .usage = "",
+	 },
 	COMMAND_REGISTRATION_DONE
 };
 
@@ -171,8 +175,6 @@ static int hl_transport_init(struct command_context *cmd_ctx)
 		tr = HL_TRANSPORT_SWD;
 	else if (strcmp(transport->name, "hla_jtag") == 0)
 		tr = HL_TRANSPORT_JTAG;
-	else if (strcmp(transport->name, "stlink_swim") == 0)
-		tr = HL_TRANSPORT_SWIM;
 
 	int retval = hl_interface_open(tr);
 
@@ -204,26 +206,28 @@ static struct transport hl_swd_transport = {
 	.name = "hla_swd",
 	.select = hl_transport_select,
 	.init = hl_transport_init,
+	.override_target = hl_interface_override_target,
 };
 
 static struct transport hl_jtag_transport = {
 	.name = "hla_jtag",
 	.select = hl_transport_select,
 	.init = hl_transport_init,
+	.override_target = hl_interface_override_target,
 };
 
-static struct transport stlink_swim_transport = {
-	.name = "stlink_swim",
-	.select = hl_transport_select,
-	.init = hl_transport_init,
-};
-
-const char *hl_transports[] = { "hla_swd", "hla_jtag", "stlink_swim", NULL };
+const char *hl_transports[] = { "hla_swd", "hla_jtag", NULL };
 
 static void hl_constructor(void) __attribute__ ((constructor));
 static void hl_constructor(void)
 {
 	transport_register(&hl_swd_transport);
 	transport_register(&hl_jtag_transport);
-	transport_register(&stlink_swim_transport);
+}
+
+bool transport_is_hla(void)
+{
+	struct transport *t;
+	t = get_current_transport();
+	return t == &hl_swd_transport || t == &hl_jtag_transport;
 }