Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
added t/nsrst_assert_width commands
[openocd.git] / src / jtag / tcl.c
diff --git a/src/jtag/tcl.c b/src/jtag/tcl.c
index 04fca22770ce545da0c126c5571bbbc3d0771aa2..53c19e1a1b1feb6e324a3ae2a9d7961618443722 100644 (file)
--- a/src/jtag/tcl.c
+++ b/src/jtag/tcl.c
@@ -61,6 +61,8 @@ static int handle_jtag_device_command(struct command_context_s *cmd_ctx, char *c
 static int handle_reset_config_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
 static int handle_jtag_nsrst_delay_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
 static int handle_jtag_ntrst_delay_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
+static int handle_jtag_nsrst_assert_width_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
+static int handle_jtag_ntrst_assert_width_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
 
 static int handle_scan_chain_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
 
@@ -242,13 +244,15 @@ static int jim_newtap_cmd(Jim_GetOptInfo *goi)
        LOG_DEBUG("Creating New Tap, Chip: %s, Tap: %s, Dotted: %s, %d params",
                          pTap->chip, pTap->tapname, pTap->dotted_name, goi->argc);
 
-       /* deal with options */
-#define NTREQ_IRLEN      1
-#define NTREQ_IRCAPTURE  2
-#define NTREQ_IRMASK     4
+       /* IEEE specifies that the two LSBs of an IR scan are 01, so make
+        * that the default.  The "-irlen" and "-irmask" options are only
+        * needed to cope with nonstandard TAPs, or to specify more bits.
+        */
+       pTap->ir_capture_mask = 0x03;
+       pTap->ir_capture_value = 0x01;
 
-       /* clear them as we find them */
-       reqbits = (NTREQ_IRLEN | NTREQ_IRCAPTURE | NTREQ_IRMASK);
+       /* clear flags for "required options" them as we find them */
+       reqbits = 1;
 
        while (goi->argc) {
                e = Jim_GetOpt_Nvp(goi, opts, &n);
@@ -308,31 +312,39 @@ static int jim_newtap_cmd(Jim_GetOptInfo *goi)
                        switch (n->value) {
                        case NTAP_OPT_IRLEN:
                                if (w > (jim_wide) (8 * sizeof(pTap->ir_capture_value)))
-                                       LOG_WARNING("huge IR length %d", (int) w);
+                                       LOG_WARNING("%s: huge IR length %d",
+                                                       pTap->dotted_name,
+                                                       (int) w);
                                pTap->ir_length = w;
-                               reqbits &= (~(NTREQ_IRLEN));
+                               reqbits = 0;
                                break;
                        case NTAP_OPT_IRMASK:
                                if (is_bad_irval(pTap->ir_length, w)) {
-                                       LOG_ERROR("IR mask %x too big",
+                                       LOG_ERROR("%s: IR mask %x too big",
+                                                       pTap->dotted_name,
                                                        (int) w);
                                        free((void *)pTap->dotted_name);
                                        free(pTap);
                                        return ERROR_FAIL;
                                }
+                               if ((w & 3) != 3)
+                                       LOG_WARNING("%s: nonstandard IR mask",
+                                                       pTap->dotted_name);
                                pTap->ir_capture_mask = w;
-                               reqbits &= (~(NTREQ_IRMASK));
                                break;
                        case NTAP_OPT_IRCAPTURE:
                                if (is_bad_irval(pTap->ir_length, w)) {
-                                       LOG_ERROR("IR capture %x too big",
+                                       LOG_ERROR("%s: IR capture %x too big",
+                                                       pTap->dotted_name,
                                                        (int) w);
                                        free((void *)pTap->dotted_name);
                                        free(pTap);
                                        return ERROR_FAIL;
                                }
+                               if ((w & 3) != 1)
+                                       LOG_WARNING("%s: nonstandard IR value",
+                                                       pTap->dotted_name);
                                pTap->ir_capture_value = w;
-                               reqbits &= (~(NTREQ_IRCAPTURE));
                                break;
                        }
                } /* switch (n->value) */
@@ -358,14 +370,9 @@ static int jim_newtap_cmd(Jim_GetOptInfo *goi)
 static void jtag_tap_handle_event(jtag_tap_t *tap, enum jtag_event e)
 {
        jtag_tap_event_action_t * jteap;
-       int done;
-
-       jteap = tap->event_action;
 
-       done = 0;
-       while (jteap) {
+       for (jteap = tap->event_action; jteap != NULL; jteap = jteap->next) {
                if (jteap->event == e) {
-                       done = 1;
                        LOG_DEBUG("JTAG tap: %s event: %d (%s) action: %s\n",
                                        tap->dotted_name,
                                        e,
@@ -386,14 +393,6 @@ static void jtag_tap_handle_event(jtag_tap_t *tap, enum jtag_event e)
                                break;
                        }
                }
-
-               jteap = jteap->next;
-       }
-
-       if (!done) {
-               LOG_DEBUG("event %d %s - no action",
-                               e,
-                               Jim_Nvp_value2name_simple(nvp_jtag_tap_event, e)->name);
        }
 }
 
@@ -622,6 +621,10 @@ int jtag_register_commands(struct command_context_s *cmd_ctx)
                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_ANY, "jtag_ntrst_delay <ms> - delay after deasserting trst in ms");
+       register_command(cmd_ctx, NULL, "jtag_nsrst_assert_width", handle_jtag_nsrst_assert_width_command,
+               COMMAND_ANY, "jtag_nsrst_assert_width <ms> - delay after asserting srst in ms");
+       register_command(cmd_ctx, NULL, "jtag_ntrst_assert_width", handle_jtag_ntrst_assert_width_command,
+               COMMAND_ANY, "jtag_ntrst_assert_width <ms> - delay after asserting trst in ms");
 
        register_command(cmd_ctx, NULL, "scan_chain", handle_scan_chain_command,
                COMMAND_EXEC, "print current scan chain configuration");
@@ -982,6 +985,40 @@ static int handle_jtag_ntrst_delay_command(struct command_context_s *cmd_ctx,
        return ERROR_OK;
 }
 
+static int handle_jtag_nsrst_assert_width_command(struct command_context_s *cmd_ctx,
+               char *cmd, char **args, int argc)
+{
+       if (argc > 1)
+               return ERROR_COMMAND_SYNTAX_ERROR;
+       if (argc == 1)
+       {
+               unsigned delay;
+               int retval = parse_uint(args[0], &delay);
+               if (ERROR_OK != retval)
+                       return retval;
+               jtag_set_nsrst_assert_width(delay);
+       }
+       command_print(cmd_ctx, "jtag_nsrst_assert_width: %u", jtag_get_nsrst_assert_width());
+       return ERROR_OK;
+}
+
+static int handle_jtag_ntrst_assert_width_command(struct command_context_s *cmd_ctx,
+               char *cmd, char **args, int argc)
+{
+       if (argc > 1)
+               return ERROR_COMMAND_SYNTAX_ERROR;
+       if (argc == 1)
+       {
+               unsigned delay;
+               int retval = parse_uint(args[0], &delay);
+               if (ERROR_OK != retval)
+                       return retval;
+               jtag_set_ntrst_assert_width(delay);
+       }
+       command_print(cmd_ctx, "jtag_ntrst_assert_width: %u", jtag_get_ntrst_assert_width());
+       return ERROR_OK;
+}
+
 static int handle_jtag_speed_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
 {
        int retval = 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)