Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Pavel pointed out that jtag_add_tlr() is better than jtag_add_tms().
[openocd.git] / src / jtag / jtag.c
diff --git a/src/jtag/jtag.c b/src/jtag/jtag.c
index 884cf2f333f032a6cde53551f289ca018dfa878a..c73e0c9aa879663b1056e796215d2b2591c44a78 100644 (file)
--- a/src/jtag/jtag.c
+++ b/src/jtag/jtag.c
@@ -109,6 +109,11 @@ char* jtag_event_strings[] =
        "JTAG controller reset(tms or TRST)"
 };
 
+/* kludge!!!! these are just global variables that the
+ * interface use internally. They really belong
+ * inside the drivers, but we don't want to break
+ * linking the drivers!!!!
+ */
 enum tap_state end_state = TAP_TLR;
 enum tap_state cur_state = TAP_TLR;
 int jtag_trst = 0;
@@ -780,17 +785,17 @@ int MINIDRIVER(interface_jtag_add_plain_dr_scan)(int num_fields, scan_field_t *f
        return ERROR_OK;
 }
 
-void jtag_add_tms()
+void jtag_add_tlr()
 {
        jtag_prelude(TAP_TLR);
        
        int retval;
-       retval=interface_jtag_add_tms();
+       retval=interface_jtag_add_tlr();
        if (retval!=ERROR_OK)
                jtag_error=retval;
 }
 
-int MINIDRIVER(interface_jtag_add_tms)()
+int MINIDRIVER(interface_jtag_add_tlr)()
 {
        enum tap_state state = TAP_TLR;
        jtag_command_t **last_cmd = jtag_get_last_command_p();
@@ -888,14 +893,14 @@ void jtag_add_runtest(int num_cycles, enum tap_state state)
                jtag_error=retval;
 }
 
-void jtag_add_reset(int req_tms_or_trst, int req_srst)
+void jtag_add_reset(int req_tlr_or_trst, int req_srst)
 {
-       int trst_with_tms = 0;
+       int trst_with_tlr = 0;
        int retval;
        
        /* Make sure that jtag_reset_config allows the requested reset */
        /* if SRST pulls TRST, we can't fulfill srst == 1 with trst == 0 */
-       if (((jtag_reset_config & RESET_SRST_PULLS_TRST) && (req_srst == 1)) && (!req_tms_or_trst))
+       if (((jtag_reset_config & RESET_SRST_PULLS_TRST) && (req_srst == 1)) && (!req_tlr_or_trst))
        {
                LOG_ERROR("BUG: requested reset would assert trst");
                jtag_error=ERROR_FAIL;
@@ -903,9 +908,9 @@ void jtag_add_reset(int req_tms_or_trst, int req_srst)
        }
                
        /* if TRST pulls SRST, we reset with TAP T-L-R */
-       if (((jtag_reset_config & RESET_TRST_PULLS_SRST) && (req_tms_or_trst)) && (req_srst == 0))
+       if (((jtag_reset_config & RESET_TRST_PULLS_SRST) && (req_tlr_or_trst)) && (req_srst == 0))
        {
-               trst_with_tms = 1;
+               trst_with_tlr = 1;
        }
        
        if (req_srst && !(jtag_reset_config & RESET_HAS_SRST))
@@ -915,14 +920,14 @@ void jtag_add_reset(int req_tms_or_trst, int req_srst)
                return;
        }
        
-       if (req_tms_or_trst)
+       if (req_tlr_or_trst)
        {
-               if (!trst_with_tms && (jtag_reset_config & RESET_HAS_TRST))
+               if (!trst_with_tlr && (jtag_reset_config & RESET_HAS_TRST))
                {
                        jtag_trst = 1;
                } else
                {
-                       trst_with_tms = 1;
+                       trst_with_tlr = 1;
                }
        } else
        {
@@ -949,11 +954,11 @@ void jtag_add_reset(int req_tms_or_trst, int req_srst)
                        jtag_add_sleep(jtag_nsrst_delay * 1000);
        }
        
-       if (trst_with_tms)
+       if (trst_with_tlr)
        {
                LOG_DEBUG("JTAG reset with tms instead of TRST");
                jtag_add_end_state(TAP_TLR);
-               jtag_add_tms();
+               jtag_add_tlr();
                jtag_call_event_callbacks(JTAG_TRST_ASSERTED);
                return;
        }
@@ -1422,9 +1427,9 @@ int jtag_register_commands(struct command_context_s *cmd_ctx)
        register_command(cmd_ctx, NULL, "reset_config", handle_reset_config_command,
                COMMAND_CONFIG, NULL);
        register_command(cmd_ctx, NULL, "jtag_nsrst_delay", handle_jtag_nsrst_delay_command,
-               COMMAND_CONFIG, NULL);
+               COMMAND_ANY, "jtag_nsrst_delay <ms> - delay after deasserting srst in ms");
        register_command(cmd_ctx, NULL, "jtag_ntrst_delay", handle_jtag_ntrst_delay_command,
-               COMMAND_CONFIG, NULL);
+               COMMAND_ANY, "jtag_ntrst_delay <ms> - delay after deasserting trst in ms");
                
        register_command(cmd_ctx, NULL, "scan_chain", handle_scan_chain_command,
                COMMAND_EXEC, "print current scan chain configuration");
@@ -1492,7 +1497,7 @@ int jtag_init(struct command_context_s *cmd_ctx)
                device = device->next;
        }
        
-       jtag_add_tms();
+       jtag_add_tlr();
        jtag_execute_queue();
 
        /* examine chain first, as this could discover the real chain layout */
@@ -1733,21 +1738,26 @@ int handle_jtag_ntrst_delay_command(struct command_context_s *cmd_ctx, char *cmd
 int handle_jtag_speed_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
 {
        int cur_speed = 0;
-       if ((argc<1) || (argc>2))
-               return ERROR_COMMAND_SYNTAX_ERROR;
-
-       LOG_DEBUG("handle jtag speed");
        
-       if (argc >= 1)
-               cur_speed = jtag_speed = jtag_speed_post_reset = strtoul(args[0], NULL, 0);
-       if (argc == 2)
-               cur_speed = jtag_speed_post_reset = strtoul(args[1], NULL, 0);
+       if (argc != 0)
+       {
+               if ((argc<1) || (argc>2))
+                       return ERROR_COMMAND_SYNTAX_ERROR;
                
-       /* this command can be called during CONFIG, 
-        * in which case jtag isn't initialized */
-       if (jtag)
-               jtag->speed(cur_speed);
-
+               LOG_DEBUG("handle jtag speed");
+               
+               if (argc >= 1)
+                       cur_speed = jtag_speed = jtag_speed_post_reset = strtoul(args[0], NULL, 0);
+               if (argc == 2)
+                       cur_speed = jtag_speed_post_reset = strtoul(args[1], NULL, 0);
+                       
+               /* this command can be called during CONFIG, 
+                * in which case jtag isn't initialized */
+               if (jtag)
+                       jtag->speed(cur_speed);
+       }               
+       command_print(cmd_ctx, "jtag_speed: %d, %d", jtag_speed, jtag_speed_post_reset);
+       
        return ERROR_OK;
 }
 
@@ -1807,7 +1817,7 @@ int handle_endstate_command(struct command_context_s *cmd_ctx, char *cmd, char *
                        }
                }
        }
-       command_print(cmd_ctx, "current endstate: %s", tap_state_strings[end_state]);
+       command_print(cmd_ctx, "current endstate: %s", tap_state_strings[cmd_queue_end_state]);
        
        return ERROR_OK;
 }
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)