X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fjtag%2Fadapter.c;h=1abda49ea63c74d15c405f941faa8434104d6743;hb=da2e40bcd3541a172ed037d57b7eaafb479f94d5;hp=acd434c440f58c79816f0d5c79b5de6096edff79;hpb=4668bd264cfe64c3e3ddd0f75cb5bf2e5e85f717;p=openocd.git diff --git a/src/jtag/adapter.c b/src/jtag/adapter.c index acd434c440..1abda49ea6 100644 --- a/src/jtag/adapter.c +++ b/src/jtag/adapter.c @@ -27,6 +27,7 @@ * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ + #ifdef HAVE_CONFIG_H #include "config.h" #endif @@ -49,8 +50,7 @@ extern struct jtag_interface *jtag_interface; const char *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); @@ -67,7 +67,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"); @@ -98,9 +97,8 @@ COMMAND_HANDLER(interface_transport_command) 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); @@ -118,8 +116,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); } @@ -132,8 +129,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; } @@ -142,13 +138,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) @@ -280,7 +274,7 @@ COMMAND_HANDLER(handle_reset_config_command) 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,6 +289,22 @@ COMMAND_HANDLER(handle_reset_config_command) 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_COMMAND_SYNTAX_ERROR; @@ -317,42 +327,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 */ @@ -375,14 +384,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; } @@ -391,8 +406,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); @@ -406,8 +420,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); @@ -417,16 +430,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); @@ -441,9 +451,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; }