Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
adapter: add 'adapter speed:' prefix to output
[openocd.git] / src / jtag / adapter.c
diff --git a/src/jtag/adapter.c b/src/jtag/adapter.c
index 94843d7d4a4661c29e80e838b7fb0d6363db59f5..c8779884e64ac63026c59a081b04fa9b99b01847 100644 (file)
--- 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
@@ -47,11 +48,9 @@
  */
 
 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);
@@ -68,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");
@@ -93,18 +91,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 +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);
        }
@@ -136,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;
        }
@@ -146,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)
@@ -169,9 +159,8 @@ COMMAND_HANDLER(handle_interface_command)
                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);
+               retval = allow_transports(CMD_CTX, jtag_interface->transports
+                                               ? jtag_interface->transports : jtag_only);
                        if (ERROR_OK != retval)
                                return retval;
 
@@ -223,7 +212,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 +232,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 +252,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,7 +268,7 @@ 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;
@@ -295,14 +284,14 @@ 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;
 
                /* 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)
@@ -330,34 +319,34 @@ next:
 
        /* 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 */
@@ -396,8 +385,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 +399,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);
 
@@ -430,8 +417,7 @@ COMMAND_HANDLER(handle_adapter_khz_command)
                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 +432,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;
 }
Open On-Chip Debugger

Linking to existing account procedure

If you already have an account and want to add another login method you MUST first sign in with your existing account and then change URL to read https://review.openocd.org/login/?link to get to this page again but this time it'll work for linking. Thank you.

SSH host keys fingerprints

1024 SHA256:YKx8b7u5ZWdcbp7/4AeXNaqElP49m6QrwfXaqQGJAOk gerrit-code-review@openocd.zylin.com (DSA)
384 SHA256:jHIbSQa4REvwCFG4cq5LBlBLxmxSqelQPem/EXIrxjk gerrit-code-review@openocd.org (ECDSA)
521 SHA256:UAOPYkU9Fjtcao0Ul/Rrlnj/OsQvt+pgdYSZ4jOYdgs gerrit-code-review@openocd.org (ECDSA)
256 SHA256:A13M5QlnozFOvTllybRZH6vm7iSt0XLxbA48yfc2yfY gerrit-code-review@openocd.org (ECDSA)
256 SHA256:spYMBqEYoAOtK7yZBrcwE8ZpYt6b68Cfh9yEVetvbXg gerrit-code-review@openocd.org (ED25519)
+--[ED25519 256]--+
|=..              |
|+o..   .         |
|*.o   . .        |
|+B . . .         |
|Bo. = o S        |
|Oo.+ + =         |
|oB=.* = . o      |
| =+=.+   + E     |
|. .=o   . o      |
+----[SHA256]-----+
2048 SHA256:0Onrb7/PHjpo6iVZ7xQX2riKN83FJ3KGU0TvI0TaFG4 gerrit-code-review@openocd.zylin.com (RSA)