Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
command_handler: change 'cmd_ctx' to CMD_CTX
[openocd.git] / src / jtag / tcl.c
diff --git a/src/jtag/tcl.c b/src/jtag/tcl.c
index bd3f704a89949bc8e9660b721984c75fcc49162a..96018b590ebb8b795578ff8241e92e3d6158e323 100644 (file)
--- a/src/jtag/tcl.c
+++ b/src/jtag/tcl.c
@@ -608,11 +608,11 @@ COMMAND_HANDLER(handle_interface_list_command)
        if (strcmp(CMD_NAME, "interface_list") == 0 && CMD_ARGC > 0)
                return ERROR_COMMAND_SYNTAX_ERROR;
 
-       command_print(cmd_ctx, "The following JTAG interfaces are available:");
+       command_print(CMD_CTX, "The following JTAG interfaces are available:");
        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);
+               command_print(CMD_CTX, "%u: %s", i + 1, name);
        }
 
        return ERROR_OK;
@@ -628,15 +628,15 @@ COMMAND_HANDLER(handle_interface_command)
        }
 
        /* interface name is a mandatory argument */
-       if (CMD_ARGC != 1 || args[0][0] == '\0')
+       if (CMD_ARGC != 1 || CMD_ARGV[0][0] == '\0')
                return ERROR_COMMAND_SYNTAX_ERROR;
 
        for (unsigned i = 0; NULL != jtag_interfaces[i]; i++)
        {
-               if (strcmp(args[0], jtag_interfaces[i]->name) != 0)
+               if (strcmp(CMD_ARGV[0], jtag_interfaces[i]->name) != 0)
                        continue;
 
-               int retval = jtag_interfaces[i]->register_commands(cmd_ctx);
+               int retval = jtag_interfaces[i]->register_commands(CMD_CTX);
                if (ERROR_OK != retval)
                                return retval;
 
@@ -657,7 +657,7 @@ COMMAND_HANDLER(handle_interface_command)
        /* no valid interface was found (i.e. the configuration option,
         * didn't match one of the compiled-in interfaces
         */
-       LOG_ERROR("The specified JTAG interface was not found (%s)", args[0]);
+       LOG_ERROR("The specified JTAG interface was not found (%s)", CMD_ARGV[0]);
        CALL_COMMAND_HANDLER(handle_interface_list_command);
        return ERROR_JTAG_INVALID_INTERFACE;
 }
@@ -667,8 +667,8 @@ COMMAND_HANDLER(handle_scan_chain_command)
        struct jtag_tap *tap;
 
        tap = jtag_all_taps();
-       command_print(cmd_ctx, "     TapName            | Enabled |   IdCode      Expected    IrLen IrCap  IrMask Instr     ");
-       command_print(cmd_ctx, "---|--------------------|---------|------------|------------|------|------|------|---------");
+       command_print(CMD_CTX, "     TapName            | Enabled |   IdCode      Expected    IrLen IrCap  IrMask Instr     ");
+       command_print(CMD_CTX, "---|--------------------|---------|------------|------------|------|------|------|---------");
 
        while (tap) {
                uint32_t expected, expected_mask, cur_instr, ii;
@@ -676,7 +676,7 @@ COMMAND_HANDLER(handle_scan_chain_command)
                expected_mask = buf_get_u32(tap->expected_mask, 0, tap->ir_length);
                cur_instr = buf_get_u32(tap->cur_instr, 0, tap->ir_length);
 
-               command_print(cmd_ctx,
+               command_print(CMD_CTX,
                                          "%2d | %-18s |    %c    | 0x%08x | 0x%08x | 0x%02x | 0x%02x | 0x%02x | 0x%02x",
                                          tap->abs_chain_position,
                                          tap->dotted_name,
@@ -689,7 +689,7 @@ COMMAND_HANDLER(handle_scan_chain_command)
                                          (unsigned int)(cur_instr));
 
                for (ii = 1; ii < tap->expected_ids_cnt; ii++) {
-                       command_print(cmd_ctx, "   |                    |         |            | 0x%08x |      |      |      |         ",
+                       command_print(CMD_CTX, "   |                    |         |            | 0x%08x |      |      |      |         ",
                                                  (unsigned int)(tap->expected_ids[ii]));
                }
 
@@ -711,21 +711,21 @@ COMMAND_HANDLER(handle_reset_config_command)
         * Here we don't care about the order, and only change values
         * which have been explicitly specified.
         */
-       for (; CMD_ARGC; CMD_ARGC--, args++) {
+       for (; CMD_ARGC; CMD_ARGC--, CMD_ARGV++) {
                int tmp = 0;
                int m;
 
                /* gating */
                m = RESET_SRST_NO_GATING;
-               if (strcmp(*args, "srst_gates_jtag") == 0)
+               if (strcmp(*CMD_ARGV, "srst_gates_jtag") == 0)
                        /* default: don't use JTAG while SRST asserted */;
-               else if (strcmp(*args, "srst_nogate") == 0)
+               else if (strcmp(*CMD_ARGV, "srst_nogate") == 0)
                        tmp = RESET_SRST_NO_GATING;
                else
                        m = 0;
                if (mask & m) {
                        LOG_ERROR("extra reset_config %s spec (%s)",
-                                       "gating", *args);
+                                       "gating", *CMD_ARGV);
                        return ERROR_INVALID_ARGUMENTS;
                }
                if (m)
@@ -733,19 +733,19 @@ COMMAND_HANDLER(handle_reset_config_command)
 
                /* signals */
                m = RESET_HAS_TRST | RESET_HAS_SRST;
-               if (strcmp(*args, "none") == 0)
+               if (strcmp(*CMD_ARGV, "none") == 0)
                        tmp = RESET_NONE;
-               else if (strcmp(*args, "trst_only") == 0)
+               else if (strcmp(*CMD_ARGV, "trst_only") == 0)
                        tmp = RESET_HAS_TRST;
-               else if (strcmp(*args, "srst_only") == 0)
+               else if (strcmp(*CMD_ARGV, "srst_only") == 0)
                        tmp = RESET_HAS_SRST;
-               else if (strcmp(*args, "trst_and_srst") == 0)
+               else if (strcmp(*CMD_ARGV, "trst_and_srst") == 0)
                        tmp = RESET_HAS_TRST | RESET_HAS_SRST;
                else
                        m = 0;
                if (mask & m) {
                        LOG_ERROR("extra reset_config %s spec (%s)",
-                                       "signal", *args);
+                                       "signal", *CMD_ARGV);
                        return ERROR_INVALID_ARGUMENTS;
                }
                if (m)
@@ -753,19 +753,19 @@ COMMAND_HANDLER(handle_reset_config_command)
 
                /* combination (options for broken wiring) */
                m = RESET_SRST_PULLS_TRST | RESET_TRST_PULLS_SRST;
-               if (strcmp(*args, "separate") == 0)
+               if (strcmp(*CMD_ARGV, "separate") == 0)
                        /* separate reset lines - default */;
-               else if (strcmp(*args, "srst_pulls_trst") == 0)
+               else if (strcmp(*CMD_ARGV, "srst_pulls_trst") == 0)
                        tmp |= RESET_SRST_PULLS_TRST;
-               else if (strcmp(*args, "trst_pulls_srst") == 0)
+               else if (strcmp(*CMD_ARGV, "trst_pulls_srst") == 0)
                        tmp |= RESET_TRST_PULLS_SRST;
-               else if (strcmp(*args, "combined") == 0)
+               else if (strcmp(*CMD_ARGV, "combined") == 0)
                        tmp |= RESET_SRST_PULLS_TRST | RESET_TRST_PULLS_SRST;
                else
                        m = 0;
                if (mask & m) {
                        LOG_ERROR("extra reset_config %s spec (%s)",
-                                       "combination", *args);
+                                       "combination", *CMD_ARGV);
                        return ERROR_INVALID_ARGUMENTS;
                }
                if (m)
@@ -773,15 +773,15 @@ COMMAND_HANDLER(handle_reset_config_command)
 
                /* trst_type (NOP without HAS_TRST) */
                m = RESET_TRST_OPEN_DRAIN;
-               if (strcmp(*args, "trst_open_drain") == 0)
+               if (strcmp(*CMD_ARGV, "trst_open_drain") == 0)
                        tmp |= RESET_TRST_OPEN_DRAIN;
-               else if (strcmp(*args, "trst_push_pull") == 0)
+               else if (strcmp(*CMD_ARGV, "trst_push_pull") == 0)
                        /* push/pull from adapter - default */;
                else
                        m = 0;
                if (mask & m) {
                        LOG_ERROR("extra reset_config %s spec (%s)",
-                                       "trst_type", *args);
+                                       "trst_type", *CMD_ARGV);
                        return ERROR_INVALID_ARGUMENTS;
                }
                if (m)
@@ -789,22 +789,22 @@ COMMAND_HANDLER(handle_reset_config_command)
 
                /* srst_type (NOP without HAS_SRST) */
                m |= RESET_SRST_PUSH_PULL;
-               if (strcmp(*args, "srst_push_pull") == 0)
+               if (strcmp(*CMD_ARGV, "srst_push_pull") == 0)
                        tmp |= RESET_SRST_PUSH_PULL;
-               else if (strcmp(*args, "srst_open_drain") == 0)
+               else if (strcmp(*CMD_ARGV, "srst_open_drain") == 0)
                        /* open drain from adapter - default */;
                else
                        m = 0;
                if (mask & m) {
                        LOG_ERROR("extra reset_config %s spec (%s)",
-                                       "srst_type", *args);
+                                       "srst_type", *CMD_ARGV);
                        return ERROR_INVALID_ARGUMENTS;
                }
                if (m)
                        goto next;
 
                /* caller provided nonsense; fail */
-               LOG_ERROR("unknown reset_config flag (%s)", *args);
+               LOG_ERROR("unknown reset_config flag (%s)", *CMD_ARGV);
                return ERROR_INVALID_ARGUMENTS;
 
 next:
@@ -888,7 +888,7 @@ next:
                modes[4] = "";
        }
 
-       command_print(cmd_ctx, "%s %s%s%s%s",
+       command_print(CMD_CTX, "%s %s%s%s%s",
                        modes[0], modes[1],
                        modes[2], modes[3], modes[4]);
 
@@ -902,11 +902,11 @@ COMMAND_HANDLER(handle_jtag_nsrst_delay_command)
        if (CMD_ARGC == 1)
        {
                unsigned delay;
-               COMMAND_PARSE_NUMBER(uint, args[0], delay);
+               COMMAND_PARSE_NUMBER(uint, CMD_ARGV[0], delay);
 
                jtag_set_nsrst_delay(delay);
        }
-       command_print(cmd_ctx, "jtag_nsrst_delay: %u", jtag_get_nsrst_delay());
+       command_print(CMD_CTX, "jtag_nsrst_delay: %u", jtag_get_nsrst_delay());
        return ERROR_OK;
 }
 
@@ -917,11 +917,11 @@ COMMAND_HANDLER(handle_jtag_ntrst_delay_command)
        if (CMD_ARGC == 1)
        {
                unsigned delay;
-               COMMAND_PARSE_NUMBER(uint, args[0], delay);
+               COMMAND_PARSE_NUMBER(uint, CMD_ARGV[0], delay);
 
                jtag_set_ntrst_delay(delay);
        }
-       command_print(cmd_ctx, "jtag_ntrst_delay: %u", jtag_get_ntrst_delay());
+       command_print(CMD_CTX, "jtag_ntrst_delay: %u", jtag_get_ntrst_delay());
        return ERROR_OK;
 }
 
@@ -932,11 +932,11 @@ COMMAND_HANDLER(handle_jtag_nsrst_assert_width_command)
        if (CMD_ARGC == 1)
        {
                unsigned delay;
-               COMMAND_PARSE_NUMBER(uint, args[0], delay);
+               COMMAND_PARSE_NUMBER(uint, CMD_ARGV[0], delay);
 
                jtag_set_nsrst_assert_width(delay);
        }
-       command_print(cmd_ctx, "jtag_nsrst_assert_width: %u", jtag_get_nsrst_assert_width());
+       command_print(CMD_CTX, "jtag_nsrst_assert_width: %u", jtag_get_nsrst_assert_width());
        return ERROR_OK;
 }
 
@@ -947,11 +947,11 @@ COMMAND_HANDLER(handle_jtag_ntrst_assert_width_command)
        if (CMD_ARGC == 1)
        {
                unsigned delay;
-               COMMAND_PARSE_NUMBER(uint, args[0], delay);
+               COMMAND_PARSE_NUMBER(uint, CMD_ARGV[0], delay);
 
                jtag_set_ntrst_assert_width(delay);
        }
-       command_print(cmd_ctx, "jtag_ntrst_assert_width: %u", jtag_get_ntrst_assert_width());
+       command_print(CMD_CTX, "jtag_ntrst_assert_width: %u", jtag_get_ntrst_assert_width());
        return ERROR_OK;
 }
 
@@ -964,7 +964,7 @@ COMMAND_HANDLER(handle_jtag_khz_command)
        if (CMD_ARGC == 1)
        {
                unsigned khz = 0;
-               COMMAND_PARSE_NUMBER(uint, args[0], khz);
+               COMMAND_PARSE_NUMBER(uint, CMD_ARGV[0], khz);
 
                retval = jtag_config_khz(khz);
                if (ERROR_OK != retval)
@@ -977,9 +977,9 @@ COMMAND_HANDLER(handle_jtag_khz_command)
                return retval;
 
        if (cur_speed)
-               command_print(cmd_ctx, "%d kHz", cur_speed);
+               command_print(CMD_CTX, "%d kHz", cur_speed);
        else
-               command_print(cmd_ctx, "RCLK - adaptive");
+               command_print(CMD_CTX, "RCLK - adaptive");
 
        return retval;
 }
@@ -993,7 +993,7 @@ COMMAND_HANDLER(handle_jtag_rclk_command)
        if (CMD_ARGC == 1)
        {
                unsigned khz = 0;
-               COMMAND_PARSE_NUMBER(uint, args[0], khz);
+               COMMAND_PARSE_NUMBER(uint, CMD_ARGV[0], khz);
 
                retval = jtag_config_rclk(khz);
                if (ERROR_OK != retval)
@@ -1006,9 +1006,9 @@ COMMAND_HANDLER(handle_jtag_rclk_command)
                return retval;
 
        if (cur_khz)
-               command_print(cmd_ctx, "RCLK not supported - fallback to %d kHz", cur_khz);
+               command_print(CMD_CTX, "RCLK not supported - fallback to %d kHz", cur_khz);
        else
-               command_print(cmd_ctx, "RCLK - adaptive");
+               command_print(CMD_CTX, "RCLK - adaptive");
 
        return retval;
 }
@@ -1019,22 +1019,22 @@ COMMAND_HANDLER(handle_jtag_reset_command)
                return ERROR_COMMAND_SYNTAX_ERROR;
 
        int trst = -1;
-       if (args[0][0] == '1')
+       if (CMD_ARGV[0][0] == '1')
                trst = 1;
-       else if (args[0][0] == '0')
+       else if (CMD_ARGV[0][0] == '0')
                trst = 0;
        else
                return ERROR_COMMAND_SYNTAX_ERROR;
 
        int srst = -1;
-       if (args[1][0] == '1')
+       if (CMD_ARGV[1][0] == '1')
                srst = 1;
-       else if (args[1][0] == '0')
+       else if (CMD_ARGV[1][0] == '0')
                srst = 0;
        else
                return ERROR_COMMAND_SYNTAX_ERROR;
 
-       if (jtag_interface_init(cmd_ctx) != ERROR_OK)
+       if (jtag_interface_init(CMD_CTX) != ERROR_OK)
                return ERROR_JTAG_INIT_FAILED;
 
        jtag_add_reset(trst, srst);
@@ -1047,7 +1047,7 @@ COMMAND_HANDLER(handle_runtest_command)
                return ERROR_COMMAND_SYNTAX_ERROR;
 
        unsigned num_clocks;
-       COMMAND_PARSE_NUMBER(uint, args[0], num_clocks);
+       COMMAND_PARSE_NUMBER(uint, CMD_ARGV[0], num_clocks);
 
        jtag_add_runtest(num_clocks, TAP_IDLE);
        return jtag_execute_queue();
@@ -1096,13 +1096,13 @@ COMMAND_HANDLER(handle_irscan_command)
        if (CMD_ARGC >= 4) {
                /* have at least one pair of numbers. */
                /* is last pair the magic text? */
-               if (strcmp("-endstate", args[CMD_ARGC - 2]) == 0) {
-                       endstate = tap_state_by_name(args[CMD_ARGC - 1]);
+               if (strcmp("-endstate", CMD_ARGV[CMD_ARGC - 2]) == 0) {
+                       endstate = tap_state_by_name(CMD_ARGV[CMD_ARGC - 1]);
                        if (endstate == TAP_INVALID)
                                return ERROR_COMMAND_SYNTAX_ERROR;
                        if (!scan_is_safe(endstate))
                                LOG_WARNING("unstable irscan endstate \"%s\"",
-                                               args[CMD_ARGC - 1]);
+                                               CMD_ARGV[CMD_ARGC - 1]);
                        CMD_ARGC -= 2;
                }
        }
@@ -1115,14 +1115,14 @@ COMMAND_HANDLER(handle_irscan_command)
        int retval;
        for (i = 0; i < num_fields; i++)
        {
-               tap = jtag_tap_by_string(args[i*2]);
+               tap = jtag_tap_by_string(CMD_ARGV[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]);
+                       command_print(CMD_CTX, "Tap: %s unknown", CMD_ARGV[i*2]);
 
                        return ERROR_FAIL;
                }
@@ -1132,7 +1132,7 @@ COMMAND_HANDLER(handle_irscan_command)
                fields[i].out_value = malloc(DIV_ROUND_UP(field_size, 8));
 
                uint32_t value;
-               retval = parse_u32(args[i * 2 + 1], &value);
+               retval = parse_u32(CMD_ARGV[i * 2 + 1], &value);
                if (ERROR_OK != retval)
                        goto error_return;
                buf_set_u32(fields[i].out_value, 0, field_size, value);
@@ -1357,16 +1357,16 @@ COMMAND_HANDLER(handle_verify_ircapture_command)
 
        if (CMD_ARGC == 1)
        {
-               if (strcmp(args[0], "enable") == 0)
+               if (strcmp(CMD_ARGV[0], "enable") == 0)
                        jtag_set_verify_capture_ir(true);
-               else if (strcmp(args[0], "disable") == 0)
+               else if (strcmp(CMD_ARGV[0], "disable") == 0)
                        jtag_set_verify_capture_ir(false);
                else
                        return ERROR_COMMAND_SYNTAX_ERROR;
        }
 
        const char *status = jtag_will_verify_capture_ir() ? "enabled": "disabled";
-       command_print(cmd_ctx, "verify Capture-IR is %s", status);
+       command_print(CMD_CTX, "verify Capture-IR is %s", status);
 
        return ERROR_OK;
 }
@@ -1378,16 +1378,16 @@ COMMAND_HANDLER(handle_verify_jtag_command)
 
        if (CMD_ARGC == 1)
        {
-               if (strcmp(args[0], "enable") == 0)
+               if (strcmp(CMD_ARGV[0], "enable") == 0)
                        jtag_set_verify(true);
-               else if (strcmp(args[0], "disable") == 0)
+               else if (strcmp(CMD_ARGV[0], "disable") == 0)
                        jtag_set_verify(false);
                else
                        return ERROR_COMMAND_SYNTAX_ERROR;
        }
 
        const char *status = jtag_will_verify() ? "enabled": "disabled";
-       command_print(cmd_ctx, "verify jtag capture is %s", status);
+       command_print(CMD_CTX, "verify jtag capture is %s", status);
 
        return ERROR_OK;
 }
@@ -1400,9 +1400,9 @@ COMMAND_HANDLER(handle_tms_sequence_command)
        if (CMD_ARGC == 1)
        {
                bool use_new_table;
-               if (strcmp(args[0], "short") == 0)
+               if (strcmp(CMD_ARGV[0], "short") == 0)
                        use_new_table = true;
-               else if (strcmp(args[0], "long") == 0)
+               else if (strcmp(CMD_ARGV[0], "long") == 0)
                        use_new_table = false;
                else
                        return ERROR_COMMAND_SYNTAX_ERROR;
@@ -1410,7 +1410,7 @@ COMMAND_HANDLER(handle_tms_sequence_command)
                tap_use_new_tms_table(use_new_table);
        }
 
-       command_print(cmd_ctx, "tms sequence is  %s",
+       command_print(CMD_CTX, "tms sequence is  %s",
                        tap_uses_new_tms_table() ? "short": "long");
 
        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)