X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fjtag%2Fadapter.c;h=bdb131cf00ee6be26d008ca8b2056fb8c9466d3c;hp=b262a9a769d7918eaac0c04cd021f528dd302fea;hb=b8ec1d4e7ddcb4cc3993a2d31225fd17527f267d;hpb=d60ebc0ab535e54f76e734d00d9ac1b5c9b6eb93

diff --git a/src/jtag/adapter.c b/src/jtag/adapter.c
index b262a9a769..bdb131cf00 100644
--- a/src/jtag/adapter.c
+++ b/src/jtag/adapter.c
@@ -1,40 +1,22 @@
-/***************************************************************************
- *   Copyright (C) 2005 by Dominic Rath                                    *
- *   Dominic.Rath@gmx.de                                                   *
- *                                                                         *
- *   Copyright (C) 2007-2010 Øyvind Harboe                                 *
- *   oyvind.harboe@zylin.com                                               *
- *                                                                         *
- *   Copyright (C) 2009 SoftPLC Corporation                                *
- *       http://softplc.com                                                *
- *   dick@softplc.com                                                      *
- *                                                                         *
- *   Copyright (C) 2009 Zachary T Welch                                    *
- *   zw@superlucidity.net                                                  *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   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.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
- ***************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+/*
+ * Copyright (C) 2005 by Dominic Rath <Dominic.Rath@gmx.de>
+ * Copyright (C) 2007-2010 Øyvind Harboe <oyvind.harboe@zylin.com>
+ * Copyright (C) 2009 SoftPLC Corporation, http://softplc.com, Dick Hollenbeck <dick@softplc.com>
+ * Copyright (C) 2009 Zachary T Welch <zw@superlucidity.net>
+ * Copyright (C) 2018 Pengutronix, Oleksij Rempel <kernel@pengutronix.de>
+ */
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
+#include "adapter.h"
 #include "jtag.h"
 #include "minidriver.h"
 #include "interface.h"
 #include "interfaces.h"
+#include <transport/transport.h>
 
 #ifdef HAVE_STRINGS_H
 #include <strings.h>
@@ -45,73 +27,329 @@
  * Holds support for configuring debug adapters from TCl scripts.
  */
 
-extern struct jtag_interface *jtag_interface;
+struct adapter_driver *adapter_driver;
+const char * const jtag_only[] = { "jtag", NULL };
 
+/**
+ * Adapter configuration
+ */
+static struct {
+	char *usb_location;
+} adapter_config;
 
+/* speed in kHz*/
+static int speed_khz;
+/* speed to fallback to when RCLK is requested but not supported */
+static int rclk_fallback_speed_khz;
+static enum {CLOCK_MODE_UNSELECTED, CLOCK_MODE_KHZ, CLOCK_MODE_RCLK} clock_mode;
 
-static int
-jim_adapter_name(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
+static bool adapter_initialized;
+
+bool is_adapter_initialized(void)
 {
-	Jim_GetOptInfo goi;
-	Jim_GetOpt_Setup(&goi, interp, argc-1, argv + 1);
+	return adapter_initialized;
+}
 
-	/* return the name of the interface */
-	/* TCL code might need to know the exact type... */
-	/* FUTURE: we allow this as a means to "set" the interface. */
-	if (goi.argc != 0) {
-		Jim_WrongNumArgs(goi.interp, 1, goi.argv-1, "(no params)");
-		return JIM_ERR;
+/**
+ * Do low-level setup like initializing registers, output signals,
+ * and clocking.
+ */
+int adapter_init(struct command_context *cmd_ctx)
+{
+	if (is_adapter_initialized())
+		return ERROR_OK;
+
+	if (!adapter_driver) {
+		/* nothing was previously specified by "adapter driver" command */
+		LOG_ERROR("Debug Adapter has to be specified, "
+			"see \"adapter driver\" command");
+		return ERROR_JTAG_INVALID_INTERFACE;
 	}
-	const char *name = jtag_interface ? jtag_interface->name : NULL;
-	Jim_SetResultString(goi.interp, name ? : "undefined", -1);
-	return JIM_OK;
-}
 
+	int retval;
+	retval = adapter_driver->init();
+	if (retval != ERROR_OK)
+		return retval;
+	adapter_initialized = true;
+
+	if (!adapter_driver->speed) {
+		LOG_INFO("This adapter doesn't support configurable speed");
+		return ERROR_OK;
+	}
+
+	if (clock_mode == CLOCK_MODE_UNSELECTED) {
+		LOG_ERROR("An adapter speed is not selected in the init script."
+			" Insert a call to \"adapter speed\" or \"jtag_rclk\" to proceed.");
+		return ERROR_JTAG_INIT_FAILED;
+	}
+
+	int requested_khz = jtag_get_speed_khz();
+	int actual_khz = requested_khz;
+	int jtag_speed_var = 0;
+	retval = jtag_get_speed(&jtag_speed_var);
+	if (retval != ERROR_OK)
+		return retval;
+	retval = adapter_driver->speed(jtag_speed_var);
+	if (retval != ERROR_OK)
+		return retval;
+	retval = jtag_get_speed_readable(&actual_khz);
+	if (retval != ERROR_OK)
+		LOG_INFO("adapter-specific clock speed value %d", jtag_speed_var);
+	else if (actual_khz) {
+		/* Adaptive clocking -- JTAG-specific */
+		if ((clock_mode == CLOCK_MODE_RCLK)
+				|| ((clock_mode == CLOCK_MODE_KHZ) && !requested_khz)) {
+			LOG_INFO("RCLK (adaptive clock speed) not supported - fallback to %d kHz"
+			, actual_khz);
+		} else
+			LOG_INFO("clock speed %d kHz", actual_khz);
+	} else
+		LOG_INFO("RCLK (adaptive clock speed)");
+
+	return ERROR_OK;
+}
 
-static int default_khz(int khz, int *jtag_speed)
+int adapter_quit(void)
 {
-	LOG_ERROR("Translation from khz to jtag_speed not implemented");
-	return ERROR_FAIL;
+	if (is_adapter_initialized() && adapter_driver->quit) {
+		/* close the JTAG interface */
+		int result = adapter_driver->quit();
+		if (result != ERROR_OK)
+			LOG_ERROR("failed: %d", result);
+	}
+
+	struct jtag_tap *t = jtag_all_taps();
+	while (t) {
+		struct jtag_tap *n = t->next_tap;
+		jtag_tap_free(t);
+		t = n;
+	}
+
+	return ERROR_OK;
 }
 
-static int default_speed_div(int speed, int *khz)
+unsigned jtag_get_speed_khz(void)
 {
-	LOG_ERROR("Translation from jtag_speed to khz not implemented");
-	return ERROR_FAIL;
+	return speed_khz;
 }
 
-static int default_power_dropout(int *dropout)
+static int adapter_khz_to_speed(unsigned khz, int *speed)
 {
-	*dropout = 0; /* by default we can't detect power dropout */
+	LOG_DEBUG("convert khz to interface specific speed value");
+	speed_khz = khz;
+	if (!is_adapter_initialized())
+		return ERROR_OK;
+	LOG_DEBUG("have interface set up");
+	if (!adapter_driver->khz) {
+		LOG_ERROR("Translation from khz to jtag_speed not implemented");
+		return ERROR_FAIL;
+	}
+	int speed_div1;
+	int retval = adapter_driver->khz(jtag_get_speed_khz(), &speed_div1);
+	if (retval != ERROR_OK)
+		return retval;
+	*speed = speed_div1;
 	return ERROR_OK;
 }
 
-static int default_srst_asserted(int *srst_asserted)
+static int jtag_rclk_to_speed(unsigned fallback_speed_khz, int *speed)
+{
+	int retval = adapter_khz_to_speed(0, speed);
+	if ((retval != ERROR_OK) && fallback_speed_khz) {
+		LOG_DEBUG("trying fallback speed...");
+		retval = adapter_khz_to_speed(fallback_speed_khz, speed);
+	}
+	return retval;
+}
+
+static int jtag_set_speed(int speed)
+{
+	/* this command can be called during CONFIG,
+	 * in which case jtag isn't initialized */
+	return is_adapter_initialized() ? adapter_driver->speed(speed) : ERROR_OK;
+}
+
+int jtag_config_khz(unsigned khz)
+{
+	LOG_DEBUG("handle jtag khz");
+	clock_mode = CLOCK_MODE_KHZ;
+	int speed = 0;
+	int retval = adapter_khz_to_speed(khz, &speed);
+	return (retval != ERROR_OK) ? retval : jtag_set_speed(speed);
+}
+
+int jtag_config_rclk(unsigned fallback_speed_khz)
+{
+	LOG_DEBUG("handle jtag rclk");
+	clock_mode = CLOCK_MODE_RCLK;
+	rclk_fallback_speed_khz = fallback_speed_khz;
+	int speed = 0;
+	int retval = jtag_rclk_to_speed(fallback_speed_khz, &speed);
+	return (retval != ERROR_OK) ? retval : jtag_set_speed(speed);
+}
+
+int jtag_get_speed(int *speed)
 {
-	*srst_asserted = 0; /* by default we can't detect srst asserted */
+	switch (clock_mode) {
+		case CLOCK_MODE_KHZ:
+			adapter_khz_to_speed(jtag_get_speed_khz(), speed);
+			break;
+		case CLOCK_MODE_RCLK:
+			jtag_rclk_to_speed(rclk_fallback_speed_khz, speed);
+			break;
+		default:
+			LOG_ERROR("BUG: unknown jtag clock mode");
+			return ERROR_FAIL;
+	}
 	return ERROR_OK;
 }
 
-COMMAND_HANDLER(handle_interface_list_command)
+int jtag_get_speed_readable(int *khz)
+{
+	int jtag_speed_var = 0;
+	int retval = jtag_get_speed(&jtag_speed_var);
+	if (retval != ERROR_OK)
+		return retval;
+	if (!is_adapter_initialized())
+		return ERROR_OK;
+	if (!adapter_driver->speed_div) {
+		LOG_ERROR("Translation from jtag_speed to khz not implemented");
+		return ERROR_FAIL;
+	}
+	return adapter_driver->speed_div(jtag_speed_var, khz);
+}
+
+/*
+ * 1 char: bus
+ * 2 * 7 chars: max 7 ports
+ * 1 char: test for overflow
+ * ------
+ * 16 chars
+ */
+#define USB_MAX_LOCATION_LENGTH         16
+
+#ifdef HAVE_LIBUSB_GET_PORT_NUMBERS
+static void adapter_usb_set_location(const char *location)
+{
+	if (strnlen(location, USB_MAX_LOCATION_LENGTH) == USB_MAX_LOCATION_LENGTH)
+		LOG_WARNING("usb location string is too long!!");
+
+	free(adapter_config.usb_location);
+
+	adapter_config.usb_location = strndup(location, USB_MAX_LOCATION_LENGTH);
+}
+#endif /* HAVE_LIBUSB_GET_PORT_NUMBERS */
+
+const char *adapter_usb_get_location(void)
 {
-	if (strcmp(CMD_NAME, "interface_list") == 0 && CMD_ARGC > 0)
+	return adapter_config.usb_location;
+}
+
+bool adapter_usb_location_equal(uint8_t dev_bus, uint8_t *port_path, size_t path_len)
+{
+	size_t path_step, string_length;
+	char *ptr, *loc;
+	bool equal = false;
+
+	if (!adapter_usb_get_location())
+		return equal;
+
+	/* strtok need non const char */
+	loc = strndup(adapter_usb_get_location(), USB_MAX_LOCATION_LENGTH);
+	string_length = strnlen(loc, USB_MAX_LOCATION_LENGTH);
+
+	ptr = strtok(loc, "-");
+	if (!ptr) {
+		LOG_WARNING("no '-' in usb path\n");
+		goto done;
+	}
+
+	string_length -= strnlen(ptr, string_length);
+	/* check bus mismatch */
+	if (atoi(ptr) != dev_bus)
+		goto done;
+
+	path_step = 0;
+	while (path_step < path_len) {
+		ptr = strtok(NULL, ".");
+
+		/* no more tokens in path */
+		if (!ptr)
+			break;
+
+		/* path mismatch at some step */
+		if (path_step < path_len && atoi(ptr) != port_path[path_step])
+			break;
+
+		path_step++;
+		string_length -= strnlen(ptr, string_length) + 1;
+	};
+
+	/* walked the full path, all elements match */
+	if (path_step == path_len && !string_length)
+		equal = true;
+
+done:
+	free(loc);
+	return equal;
+}
+
+static int jim_adapter_name(Jim_Interp *interp, int argc, Jim_Obj * const *argv)
+{
+	struct jim_getopt_info goi;
+	jim_getopt_setup(&goi, interp, argc-1, argv + 1);
+
+	/* return the name of the interface */
+	/* TCL code might need to know the exact type... */
+	/* FUTURE: we allow this as a means to "set" the interface. */
+	if (goi.argc != 0) {
+		Jim_WrongNumArgs(goi.interp, 1, goi.argv-1, "(no params)");
+		return JIM_ERR;
+	}
+	const char *name = adapter_driver ? adapter_driver->name : NULL;
+	Jim_SetResultString(goi.interp, name ? name : "undefined", -1);
+	return JIM_OK;
+}
+
+COMMAND_HANDLER(adapter_transports_command)
+{
+	char **transports;
+	int retval;
+
+	retval = CALL_COMMAND_HANDLER(transport_list_parse, &transports);
+	if (retval != ERROR_OK)
+		return retval;
+
+	retval = allow_transports(CMD_CTX, (const char **)transports);
+
+	if (retval != ERROR_OK) {
+		for (unsigned i = 0; transports[i]; i++)
+			free(transports[i]);
+		free(transports);
+	}
+	return retval;
+}
+
+COMMAND_HANDLER(handle_adapter_list_command)
+{
+	if (strcmp(CMD_NAME, "list") == 0 && CMD_ARGC > 0)
 		return ERROR_COMMAND_SYNTAX_ERROR;
 
-	command_print(CMD_CTX, "The following debug interfaces are available:");
-	for (unsigned i = 0; NULL != jtag_interfaces[i]; i++)
-	{
-		const char *name = jtag_interfaces[i]->name;
-		command_print(CMD_CTX, "%u: %s", i + 1, name);
+	command_print(CMD, "The following debug adapters are available:");
+	for (unsigned i = 0; adapter_drivers[i]; i++) {
+		const char *name = adapter_drivers[i]->name;
+		command_print(CMD, "%u: %s", i + 1, name);
 	}
 
 	return ERROR_OK;
 }
 
-COMMAND_HANDLER(handle_interface_command)
+COMMAND_HANDLER(handle_adapter_driver_command)
 {
+	int retval;
+
 	/* check whether the interface is already configured */
-	if (jtag_interface)
-	{
+	if (adapter_driver) {
 		LOG_WARNING("Interface already configured, ignoring");
 		return ERROR_OK;
 	}
@@ -120,38 +358,28 @@ COMMAND_HANDLER(handle_interface_command)
 	if (CMD_ARGC != 1 || CMD_ARGV[0][0] == '\0')
 		return ERROR_COMMAND_SYNTAX_ERROR;
 
-	for (unsigned i = 0; NULL != jtag_interfaces[i]; i++)
-	{
-		if (strcmp(CMD_ARGV[0], jtag_interfaces[i]->name) != 0)
+	for (unsigned i = 0; adapter_drivers[i]; i++) {
+		if (strcmp(CMD_ARGV[0], adapter_drivers[i]->name) != 0)
 			continue;
 
-		if (NULL != jtag_interfaces[i]->commands)
-		{
-			int retval = register_commands(CMD_CTX, NULL,
-					jtag_interfaces[i]->commands);
-			if (ERROR_OK != retval)
+		if (adapter_drivers[i]->commands) {
+			retval = register_commands(CMD_CTX, NULL,
+					adapter_drivers[i]->commands);
+			if (retval != ERROR_OK)
 				return retval;
 		}
 
-		jtag_interface = jtag_interfaces[i];
-
-		if (jtag_interface->khz == NULL)
-			jtag_interface->khz = default_khz;
-		if (jtag_interface->speed_div == NULL)
-			jtag_interface->speed_div = default_speed_div;
-		if (jtag_interface->power_dropout == NULL)
-			jtag_interface->power_dropout = default_power_dropout;
-		if (jtag_interface->srst_asserted == NULL)
-			jtag_interface->srst_asserted = default_srst_asserted;
+		adapter_driver = adapter_drivers[i];
 
-		return ERROR_OK;
+		return allow_transports(CMD_CTX, adapter_driver->transports);
 	}
 
 	/* no valid interface was found (i.e. the configuration option,
 	 * didn't match one of the compiled-in interfaces
 	 */
-	LOG_ERROR("The specified debug interface was not found (%s)", CMD_ARGV[0]);
-	CALL_COMMAND_HANDLER(handle_interface_list_command);
+	LOG_ERROR("The specified debug interface was not found (%s)",
+				CMD_ARGV[0]);
+	CALL_COMMAND_HANDLER(handle_adapter_list_command);
 	return ERROR_JTAG_INVALID_INTERFACE;
 }
 
@@ -182,7 +410,7 @@ COMMAND_HANDLER(handle_reset_config_command)
 		if (mask & m) {
 			LOG_ERROR("extra reset_config %s spec (%s)",
 					"gating", *CMD_ARGV);
-			return ERROR_INVALID_ARGUMENTS;
+			return ERROR_COMMAND_SYNTAX_ERROR;
 		}
 		if (m)
 			goto next;
@@ -202,7 +430,7 @@ COMMAND_HANDLER(handle_reset_config_command)
 		if (mask & m) {
 			LOG_ERROR("extra reset_config %s spec (%s)",
 					"signal", *CMD_ARGV);
-			return ERROR_INVALID_ARGUMENTS;
+			return ERROR_COMMAND_SYNTAX_ERROR;
 		}
 		if (m)
 			goto next;
@@ -222,7 +450,7 @@ COMMAND_HANDLER(handle_reset_config_command)
 		if (mask & m) {
 			LOG_ERROR("extra reset_config %s spec (%s)",
 					"combination", *CMD_ARGV);
-			return ERROR_INVALID_ARGUMENTS;
+			return ERROR_COMMAND_SYNTAX_ERROR;
 		}
 		if (m)
 			goto next;
@@ -238,13 +466,13 @@ COMMAND_HANDLER(handle_reset_config_command)
 		if (mask & m) {
 			LOG_ERROR("extra reset_config %s spec (%s)",
 					"trst_type", *CMD_ARGV);
-			return ERROR_INVALID_ARGUMENTS;
+			return ERROR_COMMAND_SYNTAX_ERROR;
 		}
 		if (m)
 			goto next;
 
 		/* srst_type (NOP without HAS_SRST) */
-		m |= RESET_SRST_PUSH_PULL;
+		m = RESET_SRST_PUSH_PULL;
 		if (strcmp(*CMD_ARGV, "srst_push_pull") == 0)
 			tmp |= RESET_SRST_PUSH_PULL;
 		else if (strcmp(*CMD_ARGV, "srst_open_drain") == 0)
@@ -254,14 +482,30 @@ COMMAND_HANDLER(handle_reset_config_command)
 		if (mask & m) {
 			LOG_ERROR("extra reset_config %s spec (%s)",
 					"srst_type", *CMD_ARGV);
-			return ERROR_INVALID_ARGUMENTS;
+			return ERROR_COMMAND_SYNTAX_ERROR;
+		}
+		if (m)
+			goto next;
+
+		/* connect_type - only valid when srst_nogate */
+		m = RESET_CNCT_UNDER_SRST;
+		if (strcmp(*CMD_ARGV, "connect_assert_srst") == 0)
+			tmp |= RESET_CNCT_UNDER_SRST;
+		else if (strcmp(*CMD_ARGV, "connect_deassert_srst") == 0)
+			/* connect normally - default */;
+		else
+			m = 0;
+		if (mask & m) {
+			LOG_ERROR("extra reset_config %s spec (%s)",
+					"connect_type", *CMD_ARGV);
+			return ERROR_COMMAND_SYNTAX_ERROR;
 		}
 		if (m)
 			goto next;
 
 		/* caller provided nonsense; fail */
 		LOG_ERROR("unknown reset_config flag (%s)", *CMD_ARGV);
-		return ERROR_INVALID_ARGUMENTS;
+		return ERROR_COMMAND_SYNTAX_ERROR;
 
 next:
 		/* Remember the bits which were specified (mask)
@@ -281,42 +525,41 @@ next:
 	} else
 		new_cfg = jtag_get_reset_config();
 
-
 	/*
 	 * Display the (now-)current reset mode
 	 */
-	char *modes[5];
+	char *modes[6];
 
 	/* minimal JTAG has neither SRST nor TRST (so that's the default) */
 	switch (new_cfg & (RESET_HAS_TRST | RESET_HAS_SRST)) {
-	case RESET_HAS_SRST:
-		modes[0] = "srst_only";
-		break;
-	case RESET_HAS_TRST:
-		modes[0] = "trst_only";
-		break;
-	case RESET_TRST_AND_SRST:
-		modes[0] = "trst_and_srst";
-		break;
-	default:
-		modes[0] = "none";
-		break;
+		case RESET_HAS_SRST:
+			modes[0] = "srst_only";
+			break;
+		case RESET_HAS_TRST:
+			modes[0] = "trst_only";
+			break;
+		case RESET_TRST_AND_SRST:
+			modes[0] = "trst_and_srst";
+			break;
+		default:
+			modes[0] = "none";
+			break;
 	}
 
 	/* normally SRST and TRST are decoupled; but bugs happen ... */
 	switch (new_cfg & (RESET_SRST_PULLS_TRST | RESET_TRST_PULLS_SRST)) {
-	case RESET_SRST_PULLS_TRST:
-		modes[1] = "srst_pulls_trst";
-		break;
-	case RESET_TRST_PULLS_SRST:
-		modes[1] = "trst_pulls_srst";
-		break;
-	case RESET_SRST_PULLS_TRST | RESET_TRST_PULLS_SRST:
-		modes[1] = "combined";
-		break;
-	default:
-		modes[1] = "separate";
-		break;
+		case RESET_SRST_PULLS_TRST:
+			modes[1] = "srst_pulls_trst";
+			break;
+		case RESET_TRST_PULLS_SRST:
+			modes[1] = "trst_pulls_srst";
+			break;
+		case RESET_SRST_PULLS_TRST | RESET_TRST_PULLS_SRST:
+			modes[1] = "combined";
+			break;
+		default:
+			modes[1] = "separate";
+			break;
 	}
 
 	/* TRST-less connectors include Altera, Xilinx, and minimal JTAG */
@@ -339,99 +582,286 @@ next:
 			modes[4] = " srst_push_pull";
 		else
 			modes[4] = " srst_open_drain";
+
+		if (new_cfg & RESET_CNCT_UNDER_SRST)
+			modes[5] = " connect_assert_srst";
+		else
+			modes[5] = " connect_deassert_srst";
 	} else {
 		modes[2] = "";
 		modes[4] = "";
+		modes[5] = "";
 	}
 
-	command_print(CMD_CTX, "%s %s%s%s%s",
+	command_print(CMD, "%s %s%s%s%s%s",
 			modes[0], modes[1],
-			modes[2], modes[3], modes[4]);
+			modes[2], modes[3], modes[4], modes[5]);
 
 	return ERROR_OK;
 }
 
-COMMAND_HANDLER(handle_adapter_nsrst_delay_command)
+COMMAND_HANDLER(handle_adapter_srst_delay_command)
 {
 	if (CMD_ARGC > 1)
 		return ERROR_COMMAND_SYNTAX_ERROR;
-	if (CMD_ARGC == 1)
-	{
+	if (CMD_ARGC == 1) {
 		unsigned delay;
 		COMMAND_PARSE_NUMBER(uint, CMD_ARGV[0], delay);
 
 		jtag_set_nsrst_delay(delay);
 	}
-	command_print(CMD_CTX, "adapter_nsrst_delay: %u", jtag_get_nsrst_delay());
+	command_print(CMD, "adapter srst delay: %u", jtag_get_nsrst_delay());
+	return ERROR_OK;
+}
+
+COMMAND_HANDLER(handle_adapter_srst_pulse_width_command)
+{
+	if (CMD_ARGC > 1)
+		return ERROR_COMMAND_SYNTAX_ERROR;
+	if (CMD_ARGC == 1) {
+		unsigned width;
+		COMMAND_PARSE_NUMBER(uint, CMD_ARGV[0], width);
+
+		jtag_set_nsrst_assert_width(width);
+	}
+	command_print(CMD, "adapter srst pulse_width: %u", jtag_get_nsrst_assert_width());
 	return ERROR_OK;
 }
 
-COMMAND_HANDLER(handle_adapter_khz_command)
+COMMAND_HANDLER(handle_adapter_speed_command)
 {
 	if (CMD_ARGC > 1)
 		return ERROR_COMMAND_SYNTAX_ERROR;
 
 	int retval = ERROR_OK;
-	if (CMD_ARGC == 1)
-	{
+	if (CMD_ARGC == 1) {
 		unsigned khz = 0;
 		COMMAND_PARSE_NUMBER(uint, CMD_ARGV[0], khz);
 
 		retval = jtag_config_khz(khz);
-		if (ERROR_OK != retval)
+		if (retval != ERROR_OK)
 			return retval;
 	}
 
 	int cur_speed = jtag_get_speed_khz();
 	retval = jtag_get_speed_readable(&cur_speed);
-	if (ERROR_OK != retval)
+	if (retval != ERROR_OK)
 		return retval;
 
 	if (cur_speed)
-		command_print(CMD_CTX, "%d kHz", cur_speed);
+		command_print(CMD, "adapter speed: %d kHz", cur_speed);
 	else
-		command_print(CMD_CTX, "RCLK - adaptive");
+		command_print(CMD, "adapter speed: RCLK - adaptive");
 
 	return retval;
 }
 
-static const struct command_registration interface_command_handlers[] = {
+COMMAND_HANDLER(handle_adapter_reset_de_assert)
+{
+	enum values {
+		VALUE_UNDEFINED = -1,
+		VALUE_DEASSERT  = 0,
+		VALUE_ASSERT    = 1,
+	};
+	enum values value;
+	enum values srst = VALUE_UNDEFINED;
+	enum values trst = VALUE_UNDEFINED;
+	enum reset_types jtag_reset_config = jtag_get_reset_config();
+	char *signal;
+
+	if (CMD_ARGC == 0) {
+		if (transport_is_jtag()) {
+			if (jtag_reset_config & RESET_HAS_TRST)
+				signal = jtag_get_trst() ? "asserted" : "deasserted";
+			else
+				signal = "not present";
+			command_print(CMD, "trst %s", signal);
+		}
+
+		if (jtag_reset_config & RESET_HAS_SRST)
+			signal = jtag_get_srst() ? "asserted" : "deasserted";
+		else
+			signal = "not present";
+		command_print(CMD, "srst %s", signal);
+
+		return ERROR_OK;
+	}
+
+	if (CMD_ARGC != 1 && CMD_ARGC != 3)
+		return ERROR_COMMAND_SYNTAX_ERROR;
+
+	value = (strcmp(CMD_NAME, "assert") == 0) ? VALUE_ASSERT : VALUE_DEASSERT;
+	if (strcmp(CMD_ARGV[0], "srst") == 0)
+		srst = value;
+	else if (strcmp(CMD_ARGV[0], "trst") == 0)
+		trst = value;
+	else
+		return ERROR_COMMAND_SYNTAX_ERROR;
+
+	if (CMD_ARGC == 3) {
+		if (strcmp(CMD_ARGV[1], "assert") == 0)
+			value = VALUE_ASSERT;
+		else if (strcmp(CMD_ARGV[1], "deassert") == 0)
+			value = VALUE_DEASSERT;
+		else
+			return ERROR_COMMAND_SYNTAX_ERROR;
+
+		if (strcmp(CMD_ARGV[2], "srst") == 0 && srst == VALUE_UNDEFINED)
+			srst = value;
+		else if (strcmp(CMD_ARGV[2], "trst") == 0 && trst == VALUE_UNDEFINED)
+			trst = value;
+		else
+			return ERROR_COMMAND_SYNTAX_ERROR;
+	}
+
+	if (trst == VALUE_UNDEFINED) {
+		if (transport_is_jtag())
+			trst = jtag_get_trst() ? VALUE_ASSERT : VALUE_DEASSERT;
+		else
+			trst = VALUE_DEASSERT; /* unused, safe value */
+	}
+
+	if (srst == VALUE_UNDEFINED) {
+		if (jtag_reset_config & RESET_HAS_SRST)
+			srst = jtag_get_srst() ? VALUE_ASSERT : VALUE_DEASSERT;
+		else
+			srst = VALUE_DEASSERT; /* unused, safe value */
+	}
+
+	if (trst == VALUE_ASSERT && !transport_is_jtag()) {
+		LOG_ERROR("transport has no trst signal");
+		return ERROR_FAIL;
+	}
+
+	if (srst == VALUE_ASSERT && !(jtag_reset_config & RESET_HAS_SRST)) {
+		LOG_ERROR("adapter has no srst signal");
+		return ERROR_FAIL;
+	}
+
+	return adapter_resets((trst == VALUE_DEASSERT) ? TRST_DEASSERT : TRST_ASSERT,
+						  (srst == VALUE_DEASSERT) ? SRST_DEASSERT : SRST_ASSERT);
+}
+
+#ifdef HAVE_LIBUSB_GET_PORT_NUMBERS
+COMMAND_HANDLER(handle_usb_location_command)
+{
+	if (CMD_ARGC == 1)
+		adapter_usb_set_location(CMD_ARGV[0]);
+
+	command_print(CMD, "adapter usb location: %s", adapter_usb_get_location());
+
+	return ERROR_OK;
+}
+#endif /* HAVE_LIBUSB_GET_PORT_NUMBERS */
+
+static const struct command_registration adapter_usb_command_handlers[] = {
+#ifdef HAVE_LIBUSB_GET_PORT_NUMBERS
 	{
-		.name = "adapter_khz",
-		.handler = handle_adapter_khz_command,
+		.name = "location",
+		.handler = &handle_usb_location_command,
+		.mode = COMMAND_CONFIG,
+		.help = "display or set the USB bus location of the USB device",
+		.usage = "[<bus>-port[.port]...]",
+	},
+#endif /* HAVE_LIBUSB_GET_PORT_NUMBERS */
+	COMMAND_REGISTRATION_DONE
+};
+
+static const struct command_registration adapter_srst_command_handlers[] = {
+	{
+		.name = "delay",
+		.handler = handle_adapter_srst_delay_command,
+		.mode = COMMAND_ANY,
+		.help = "delay after deasserting SRST in ms",
+		.usage = "[milliseconds]",
+	},
+	{
+		.name = "pulse_width",
+		.handler = handle_adapter_srst_pulse_width_command,
+		.mode = COMMAND_ANY,
+		.help = "SRST assertion pulse width in ms",
+		.usage = "[milliseconds]",
+	},
+	COMMAND_REGISTRATION_DONE
+};
+
+static const struct command_registration adapter_command_handlers[] = {
+	{
+		.name = "driver",
+		.handler = handle_adapter_driver_command,
+		.mode = COMMAND_CONFIG,
+		.help = "Select a debug adapter driver",
+		.usage = "driver_name",
+	},
+	{
+		.name = "speed",
+		.handler = handle_adapter_speed_command,
 		.mode = COMMAND_ANY,
 		.help = "With an argument, change to the specified maximum "
 			"jtag speed.  For JTAG, 0 KHz signifies adaptive "
-			" clocking. "
+			"clocking. "
 			"With or without argument, display current setting.",
 		.usage = "[khz]",
 	},
 	{
-		.name = "adapter_name",
+		.name = "list",
+		.handler = handle_adapter_list_command,
+		.mode = COMMAND_ANY,
+		.help = "List all built-in debug adapter drivers",
+		.usage = "",
+	},
+	{
+		.name = "name",
 		.mode = COMMAND_ANY,
 		.jim_handler = jim_adapter_name,
 		.help = "Returns the name of the currently "
 			"selected adapter (driver)",
 	},
 	{
-		.name = "adapter_nsrst_delay",
-		.handler = handle_adapter_nsrst_delay_command,
+		.name = "srst",
 		.mode = COMMAND_ANY,
-		.help = "delay after deasserting SRST in ms",
-		.usage = "[milliseconds]",
+		.help = "srst adapter command group",
+		.usage = "",
+		.chain = adapter_srst_command_handlers,
 	},
 	{
-		.name = "interface",
-		.handler = handle_interface_command,
+		.name = "transports",
+		.handler = adapter_transports_command,
 		.mode = COMMAND_CONFIG,
-		.help = "Select a debug adapter interface (driver)",
-		.usage = "driver_name",
+		.help = "Declare transports the adapter supports.",
+		.usage = "transport ...",
+	},
+	{
+		.name = "usb",
+		.mode = COMMAND_ANY,
+		.help = "usb adapter command group",
+		.usage = "",
+		.chain = adapter_usb_command_handlers,
+	},
+	{
+		.name = "assert",
+		.handler = handle_adapter_reset_de_assert,
+		.mode = COMMAND_EXEC,
+		.help = "Controls SRST and TRST lines.",
+		.usage = "|deassert [srst|trst [assert|deassert srst|trst]]",
 	},
 	{
-		.name = "interface_list",
-		.handler = handle_interface_list_command,
+		.name = "deassert",
+		.handler = handle_adapter_reset_de_assert,
+		.mode = COMMAND_EXEC,
+		.help = "Controls SRST and TRST lines.",
+		.usage = "|assert [srst|trst [deassert|assert srst|trst]]",
+	},
+	COMMAND_REGISTRATION_DONE
+};
+
+static const struct command_registration interface_command_handlers[] = {
+	{
+		.name = "adapter",
 		.mode = COMMAND_ANY,
-		.help = "List all built-in debug adapter interfaces (drivers)",
+		.help = "adapter command group",
+		.usage = "",
+		.chain = adapter_command_handlers,
 	},
 	{
 		.name = "reset_config",
@@ -442,7 +872,8 @@ static const struct command_registration interface_command_handlers[] = {
 			"[srst_pulls_trst|trst_pulls_srst|combined|separate] "
 			"[srst_gates_jtag|srst_nogate] "
 			"[trst_push_pull|trst_open_drain] "
-			"[srst_push_pull|srst_open_drain]",
+			"[srst_push_pull|srst_open_drain] "
+			"[connect_deassert_srst|connect_assert_srst]",
 	},
 	COMMAND_REGISTRATION_DONE
 };