X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fjtag%2Fadapter.c;h=2035788bf38a5f8db822c6ae20b1740008b3c6cc;hb=e36c2f2da47a4f038b6c5647d135e0b6f8d3b708;hp=e16f756eb8b6a5421cc9c06d1ee6ebd9e03a2a22;hpb=1c794320615d917d0e8fb4c40d096fd22f9a824f;p=openocd.git
diff --git a/src/jtag/adapter.c b/src/jtag/adapter.c
index e16f756eb8..2035788bf3 100644
--- a/src/jtag/adapter.c
+++ b/src/jtag/adapter.c
@@ -23,10 +23,9 @@
* 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. *
+ * along with this program. If not, see . *
***************************************************************************/
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
@@ -35,7 +34,7 @@
#include "minidriver.h"
#include "interface.h"
#include "interfaces.h"
-#include "transport.h"
+#include
#ifdef HAVE_STRINGS_H
#include
@@ -47,11 +46,9 @@
*/
extern struct jtag_interface *jtag_interface;
+const char * const jtag_only[] = { "jtag", NULL };
-
-
-static int
-jim_adapter_name(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
+static int jim_adapter_name(Jim_Interp *interp, int argc, Jim_Obj * const *argv)
{
Jim_GetOptInfo goi;
Jim_GetOpt_Setup(&goi, interp, argc-1, argv + 1);
@@ -68,7 +65,6 @@ jim_adapter_name(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
return JIM_OK;
}
-
static int default_khz(int khz, int *jtag_speed)
{
LOG_ERROR("Translation from khz to jtag_speed not implemented");
@@ -93,18 +89,14 @@ static int default_srst_asserted(int *srst_asserted)
return ERROR_OK;
}
-const char *jtag_only[] = { "jtag", NULL, };
-
-
COMMAND_HANDLER(interface_transport_command)
{
char **transports;
int retval;
retval = CALL_COMMAND_HANDLER(transport_list_parse, &transports);
- if (retval != ERROR_OK) {
+ if (retval != ERROR_OK)
return retval;
- }
retval = allow_transports(CMD_CTX, (const char **)transports);
@@ -122,8 +114,7 @@ COMMAND_HANDLER(handle_interface_list_command)
return ERROR_COMMAND_SYNTAX_ERROR;
command_print(CMD_CTX, "The following debug interfaces are available:");
- for (unsigned i = 0; NULL != jtag_interfaces[i]; i++)
- {
+ 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);
}
@@ -136,8 +127,7 @@ COMMAND_HANDLER(handle_interface_command)
int retval;
/* check whether the interface is already configured */
- if (jtag_interface)
- {
+ if (jtag_interface) {
LOG_WARNING("Interface already configured, ignoring");
return ERROR_OK;
}
@@ -146,13 +136,11 @@ 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++)
- {
+ for (unsigned i = 0; NULL != jtag_interfaces[i]; i++) {
if (strcmp(CMD_ARGV[0], jtag_interfaces[i]->name) != 0)
continue;
- if (NULL != jtag_interfaces[i]->commands)
- {
+ if (NULL != jtag_interfaces[i]->commands) {
retval = register_commands(CMD_CTX, NULL,
jtag_interfaces[i]->commands);
if (ERROR_OK != retval)
@@ -161,17 +149,16 @@ COMMAND_HANDLER(handle_interface_command)
jtag_interface = jtag_interfaces[i];
- /* LEGACY SUPPORT ... adapter drivers must declare what
- * transports they allow. Until they all do so, assume
- * the legacy drivers are JTAG-only
- */
- if (!jtag_interface->transports)
- LOG_WARNING("Adapter driver '%s' did not declare "
- "which transports it allows; assuming "
- "legacy JTAG-only", jtag_interface->name);
- retval = allow_transports(CMD_CTX,
- jtag_interface->transports
- ? : jtag_only);
+ /* LEGACY SUPPORT ... adapter drivers must declare what
+ * transports they allow. Until they all do so, assume
+ * the legacy drivers are JTAG-only
+ */
+ if (!jtag_interface->transports)
+ LOG_WARNING("Adapter driver '%s' did not declare "
+ "which transports it allows; assuming "
+ "legacy JTAG-only", jtag_interface->name);
+ retval = allow_transports(CMD_CTX, jtag_interface->transports
+ ? jtag_interface->transports : jtag_only);
if (ERROR_OK != retval)
return retval;
@@ -223,7 +210,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;
@@ -243,7 +230,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;
@@ -263,7 +250,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;
@@ -279,13 +266,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)
@@ -295,14 +282,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)
@@ -322,42 +325,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 */
@@ -380,14 +382,20 @@ 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_CTX, "%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;
}
@@ -396,8 +404,7 @@ COMMAND_HANDLER(handle_adapter_nsrst_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);
@@ -411,8 +418,7 @@ COMMAND_HANDLER(handle_adapter_nsrst_assert_width_command)
{
if (CMD_ARGC > 1)
return ERROR_COMMAND_SYNTAX_ERROR;
- if (CMD_ARGC == 1)
- {
+ if (CMD_ARGC == 1) {
unsigned width;
COMMAND_PARSE_NUMBER(uint, CMD_ARGV[0], width);
@@ -422,16 +428,13 @@ COMMAND_HANDLER(handle_adapter_nsrst_assert_width_command)
return ERROR_OK;
}
-
-
COMMAND_HANDLER(handle_adapter_khz_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);
@@ -446,9 +449,9 @@ COMMAND_HANDLER(handle_adapter_khz_command)
return retval;
if (cur_speed)
- command_print(CMD_CTX, "%d kHz", cur_speed);
+ command_print(CMD_CTX, "adapter speed: %d kHz", cur_speed);
else
- command_print(CMD_CTX, "RCLK - adaptive");
+ command_print(CMD_CTX, "adapter speed: RCLK - adaptive");
return retval;
}
@@ -514,7 +517,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
};