Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
- Fix bug-in-waiting when adding more than one TAP event type
[openocd.git] / src / jtag / tcl.c
diff --git a/src/jtag/tcl.c b/src/jtag/tcl.c
index c81f161740c4195943b837f29d2068dfdb2ae37b..f81b68296686e648973546af36bdead73f7b0d61 100644 (file)
--- a/src/jtag/tcl.c
+++ b/src/jtag/tcl.c
@@ -55,6 +55,7 @@ static int handle_interface_list_command(struct command_context_s *cmd_ctx,
 static int handle_interface_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
 static int handle_jtag_speed_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
 static int handle_jtag_khz_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
+static int handle_jtag_rclk_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
 static int handle_jtag_device_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
 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);
@@ -140,9 +141,11 @@ static int jtag_tap_configure_cmd(Jim_GetOptInfo *goi, jtag_tap_t * tap)
                                        }
 
                                        if (goi->isconfigure) {
+                                               bool replace = true;
                                                if (jteap == NULL) {
                                                        /* create new */
                                                        jteap = calloc(1, sizeof (*jteap));
+                                                       replace = false;
                                                }
                                                jteap->event = n->value;
                                                Jim_GetOpt_Obj(goi, &o);
@@ -152,9 +155,12 @@ static int jtag_tap_configure_cmd(Jim_GetOptInfo *goi, jtag_tap_t * tap)
                                                jteap->body = Jim_DuplicateObj(goi->interp, o);
                                                Jim_IncrRefCount(jteap->body);
 
-                                               /* add to head of event list */
-                                               jteap->next = tap->event_action;
-                                               tap->event_action = jteap;
+                                               if (!replace)
+                                               {
+                                                       /* add to head of event list */
+                                                       jteap->next = tap->event_action;
+                                                       tap->event_action = jteap;
+                                               }
                                                Jim_SetEmptyResult(goi->interp);
                                        } else {
                                                /* get */
@@ -219,6 +225,7 @@ static int jim_newtap_cmd(Jim_GetOptInfo *goi)
         * */
        if (goi->argc < 3) {
                Jim_SetResult_sprintf(goi->interp, "Missing CHIP TAP OPTIONS ....");
+               free(pTap);
                return JIM_ERR;
        }
        Jim_GetOpt_String(goi, &cp, NULL);
@@ -248,6 +255,8 @@ static int jim_newtap_cmd(Jim_GetOptInfo *goi)
                e = Jim_GetOpt_Nvp(goi, opts, &n);
                if (e != JIM_OK) {
                        Jim_GetOpt_NvpUnknown(goi, opts, 0);
+                       free((void *)pTap->dotted_name);
+                       free(pTap);
                        return e;
                }
                LOG_DEBUG("Processing option: %s", n->name);
@@ -265,12 +274,16 @@ static int jim_newtap_cmd(Jim_GetOptInfo *goi)
                        e = Jim_GetOpt_Wide(goi, &w);
                        if (e != JIM_OK) {
                                Jim_SetResult_sprintf(goi->interp, "option: %s bad parameter", n->name);
+                               free((void *)pTap->dotted_name);
+                               free(pTap);
                                return e;
                        }
 
                        new_expected_ids = malloc(sizeof(uint32_t) * (pTap->expected_ids_cnt + 1));
                        if (new_expected_ids == NULL) {
                                Jim_SetResult_sprintf(goi->interp, "no memory");
+                               free((void *)pTap->dotted_name);
+                               free(pTap);
                                return JIM_ERR;
                        }
 
@@ -289,6 +302,8 @@ static int jim_newtap_cmd(Jim_GetOptInfo *goi)
                        e = Jim_GetOpt_Wide(goi, &w);
                        if (e != JIM_OK) {
                                Jim_SetResult_sprintf(goi->interp, "option: %s bad parameter", n->name);
+                               free((void *)pTap->dotted_name);
+                               free(pTap);
                                return e;
                        }
                        switch (n->value) {
@@ -302,6 +317,8 @@ static int jim_newtap_cmd(Jim_GetOptInfo *goi)
                                if (is_bad_irval(pTap->ir_length, w)) {
                                        LOG_ERROR("IR mask %x too big",
                                                        (int) w);
+                                       free((void *)pTap->dotted_name);
+                                       free(pTap);
                                        return ERROR_FAIL;
                                }
                                pTap->ir_capture_mask = w;
@@ -311,6 +328,8 @@ static int jim_newtap_cmd(Jim_GetOptInfo *goi)
                                if (is_bad_irval(pTap->ir_length, w)) {
                                        LOG_ERROR("IR capture %x too big",
                                                        (int) w);
+                                       free((void *)pTap->dotted_name);
+                                       free(pTap);
                                        return ERROR_FAIL;
                                }
                                pTap->ir_capture_value = w;
@@ -360,7 +379,8 @@ static void jtag_tap_handle_event(jtag_tap_t *tap, enum jtag_event e)
                                 * can't fail.  That presumes later code
                                 * will be verifying the scan chains ...
                                 */
-                               tap->enabled = (e == JTAG_TAP_EVENT_ENABLE);
+                               if (e == JTAG_TAP_EVENT_ENABLE)
+                                       tap->enabled = true;
                        }
                }
 
@@ -577,6 +597,8 @@ int jtag_register_commands(struct command_context_s *cmd_ctx)
        register_command(cmd_ctx, NULL, "jtag_khz", handle_jtag_khz_command,
                COMMAND_ANY, "set maximum jtag speed (if supported); "
                "parameter is maximum khz, or 0 for adaptive clocking (RTCK).");
+       register_command(cmd_ctx, NULL, "jtag_rclk", handle_jtag_rclk_command,
+               COMMAND_ANY, "fallback_speed_khz - set JTAG speed to RCLK or use fallback speed");
        register_command(cmd_ctx, NULL, "jtag_device", handle_jtag_device_command,
                COMMAND_CONFIG, "(DEPRECATED) jtag_device <ir_length> <ir_expected> <ir_mask>");
        register_command(cmd_ctx, NULL, "reset_config", handle_reset_config_command,
@@ -955,7 +977,7 @@ static int handle_jtag_speed_command(struct command_context_s *cmd_ctx, char *cm
                int retval = parse_uint(args[0], &cur_speed);
                if (ERROR_OK != retval)
                        return retval;
-               retval = jtag_set_speed(cur_speed);
+               retval = jtag_config_speed(cur_speed);
 
        }
        command_print(cmd_ctx, "jtag_speed: %d", jtag_get_speed());
@@ -993,6 +1015,36 @@ static int handle_jtag_khz_command(struct command_context_s *cmd_ctx, char *cmd,
        return retval;
 }
 
+static int handle_jtag_rclk_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+{
+       if (argc > 1)
+               return ERROR_COMMAND_SYNTAX_ERROR;
+
+       int retval = ERROR_OK;
+       if (argc == 1)
+       {
+               unsigned khz = 0;
+               int retval = parse_uint(args[0], &khz);
+               if (ERROR_OK != retval)
+                       return retval;
+               retval = jtag_config_rclk(khz);
+               if (ERROR_OK != retval)
+                       return retval;
+       }
+
+       int cur_khz = jtag_get_speed_khz();
+       retval = jtag_get_speed_readable(&cur_khz);
+       if (ERROR_OK != retval)
+               return retval;
+
+       if (cur_khz)
+               command_print(cmd_ctx, "RCLK not supported - fallback to %d kHz", cur_khz);
+       else
+               command_print(cmd_ctx, "RCLK - adaptive");
+
+       return retval;
+}
+
 static int handle_jtag_reset_command(struct command_context_s *cmd_ctx,
                char *cmd, char **args, int argc)
 {
@@ -1111,7 +1163,12 @@ static int handle_irscan_command(struct command_context_s *cmd_ctx, char *cmd, c
                tap = jtag_tap_by_string(args[i*2]);
                if (tap == NULL)
                {
+                       int j;
+                       for (j = 0; j < i; j++)
+                               free(fields[j].out_value);
+                        free(fields);
                        command_print(cmd_ctx, "Tap: %s unknown", args[i*2]);
+
                        return ERROR_FAIL;
                }
                int field_size = tap->ir_length;
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)