Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
command_handler: change 'args' to CMD_ARGV
[openocd.git] / src / jtag / tcl.c
diff --git a/src/jtag/tcl.c b/src/jtag/tcl.c
index 75732ef0d786d73a589acc63c3084fb4cf89b06d..1eead8d939fb9f6a75111b2310e2090cb4ba422b 100644 (file)
--- a/src/jtag/tcl.c
+++ b/src/jtag/tcl.c
@@ -605,7 +605,7 @@ static int default_srst_asserted(int *srst_asserted)
 
 COMMAND_HANDLER(handle_interface_list_command)
 {
-       if (strcmp(CMD_NAME, "interface_list") == 0 && argc > 0)
+       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:");
@@ -628,12 +628,12 @@ COMMAND_HANDLER(handle_interface_command)
        }
 
        /* interface name is a mandatory argument */
-       if (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);
@@ -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;
 }
@@ -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 (; argc; 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:
@@ -897,12 +897,12 @@ next:
 
 COMMAND_HANDLER(handle_jtag_nsrst_delay_command)
 {
-       if (argc > 1)
+       if (CMD_ARGC > 1)
                return ERROR_COMMAND_SYNTAX_ERROR;
-       if (argc == 1)
+       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);
        }
@@ -912,12 +912,12 @@ COMMAND_HANDLER(handle_jtag_nsrst_delay_command)
 
 COMMAND_HANDLER(handle_jtag_ntrst_delay_command)
 {
-       if (argc > 1)
+       if (CMD_ARGC > 1)
                return ERROR_COMMAND_SYNTAX_ERROR;
-       if (argc == 1)
+       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);
        }
@@ -927,12 +927,12 @@ COMMAND_HANDLER(handle_jtag_ntrst_delay_command)
 
 COMMAND_HANDLER(handle_jtag_nsrst_assert_width_command)
 {
-       if (argc > 1)
+       if (CMD_ARGC > 1)
                return ERROR_COMMAND_SYNTAX_ERROR;
-       if (argc == 1)
+       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);
        }
@@ -942,12 +942,12 @@ COMMAND_HANDLER(handle_jtag_nsrst_assert_width_command)
 
 COMMAND_HANDLER(handle_jtag_ntrst_assert_width_command)
 {
-       if (argc > 1)
+       if (CMD_ARGC > 1)
                return ERROR_COMMAND_SYNTAX_ERROR;
-       if (argc == 1)
+       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);
        }
@@ -957,14 +957,14 @@ COMMAND_HANDLER(handle_jtag_ntrst_assert_width_command)
 
 COMMAND_HANDLER(handle_jtag_khz_command)
 {
-       if (argc > 1)
+       if (CMD_ARGC > 1)
                return ERROR_COMMAND_SYNTAX_ERROR;
 
        int retval = ERROR_OK;
-       if (argc == 1)
+       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)
@@ -986,14 +986,14 @@ COMMAND_HANDLER(handle_jtag_khz_command)
 
 COMMAND_HANDLER(handle_jtag_rclk_command)
 {
-       if (argc > 1)
+       if (CMD_ARGC > 1)
                return ERROR_COMMAND_SYNTAX_ERROR;
 
        int retval = ERROR_OK;
-       if (argc == 1)
+       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)
@@ -1015,21 +1015,21 @@ COMMAND_HANDLER(handle_jtag_rclk_command)
 
 COMMAND_HANDLER(handle_jtag_reset_command)
 {
-       if (argc != 2)
+       if (CMD_ARGC != 2)
                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;
@@ -1043,11 +1043,11 @@ COMMAND_HANDLER(handle_jtag_reset_command)
 
 COMMAND_HANDLER(handle_runtest_command)
 {
-       if (argc != 1)
+       if (CMD_ARGC != 1)
                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();
@@ -1082,7 +1082,7 @@ COMMAND_HANDLER(handle_irscan_command)
        struct jtag_tap *tap;
        tap_state_t endstate;
 
-       if ((argc < 2) || (argc % 2))
+       if ((CMD_ARGC < 2) || (CMD_ARGC % 2))
        {
                return ERROR_COMMAND_SYNTAX_ERROR;
        }
@@ -1093,21 +1093,21 @@ COMMAND_HANDLER(handle_irscan_command)
         */
        endstate = TAP_IDLE;
 
-       if (argc >= 4) {
+       if (CMD_ARGC >= 4) {
                /* have at least one pair of numbers. */
                /* is last pair the magic text? */
-               if (strcmp("-endstate", args[argc - 2]) == 0) {
-                       endstate = tap_state_by_name(args[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[argc - 1]);
-                       argc -= 2;
+                                               CMD_ARGV[CMD_ARGC - 1]);
+                       CMD_ARGC -= 2;
                }
        }
 
-       int num_fields = argc / 2;
+       int num_fields = CMD_ARGC / 2;
        size_t fields_len = sizeof(struct scan_field) * num_fields;
        fields = malloc(fields_len);
        memset(fields, 0, fields_len);
@@ -1115,24 +1115,24 @@ 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;
                }
                int field_size = tap->ir_length;
                fields[i].tap = tap;
                fields[i].num_bits = field_size;
-               fields[i].out_value = malloc(CEIL(field_size, 8));
+               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);
@@ -1257,7 +1257,7 @@ static int Jim_Command_drscan(Jim_Interp *interp, int argc, Jim_Obj *const *args
 
                fields[field_count].tap = tap;
                fields[field_count].num_bits = bits;
-               fields[field_count].out_value = malloc(CEIL(bits, 8));
+               fields[field_count].out_value = malloc(DIV_ROUND_UP(bits, 8));
                str_to_buf(str, len, fields[field_count].out_value, bits, 0);
                fields[field_count].in_value = fields[field_count].out_value;
                field_count++;
@@ -1352,14 +1352,14 @@ static int Jim_Command_flush_count(Jim_Interp *interp, int argc, Jim_Obj *const
 
 COMMAND_HANDLER(handle_verify_ircapture_command)
 {
-       if (argc > 1)
+       if (CMD_ARGC > 1)
                return ERROR_COMMAND_SYNTAX_ERROR;
 
-       if (argc == 1)
+       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;
@@ -1373,14 +1373,14 @@ COMMAND_HANDLER(handle_verify_ircapture_command)
 
 COMMAND_HANDLER(handle_verify_jtag_command)
 {
-       if (argc > 1)
+       if (CMD_ARGC > 1)
                return ERROR_COMMAND_SYNTAX_ERROR;
 
-       if (argc == 1)
+       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;
@@ -1394,15 +1394,15 @@ COMMAND_HANDLER(handle_verify_jtag_command)
 
 COMMAND_HANDLER(handle_tms_sequence_command)
 {
-       if (argc > 1)
+       if (CMD_ARGC > 1)
                return ERROR_COMMAND_SYNTAX_ERROR;
 
-       if (argc == 1)
+       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;
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)