From 23402315ce01071f30d7ec0c5ca7563ce41f1cc6 Mon Sep 17 00:00:00 2001 From: Zachary T Welch Date: Sun, 15 Nov 2009 08:15:59 -0800 Subject: command_handler: change 'args' to CMD_ARGV This patch converts all instances of 'args' in COMMAND_HANDLER routines to use CMD_ARGV macro. --- src/jtag/amt_jtagaccel.c | 4 +-- src/jtag/at91rm9200.c | 6 ++-- src/jtag/ft2232.c | 14 ++++---- src/jtag/gw16012.c | 2 +- src/jtag/jlink.c | 2 +- src/jtag/parport.c | 12 +++---- src/jtag/presto.c | 2 +- src/jtag/tcl.c | 94 ++++++++++++++++++++++++------------------------ src/jtag/vsllink.c | 16 ++++----- 9 files changed, 76 insertions(+), 76 deletions(-) (limited to 'src/jtag') diff --git a/src/jtag/amt_jtagaccel.c b/src/jtag/amt_jtagaccel.c index 949acec2..d35b0c21 100644 --- a/src/jtag/amt_jtagaccel.c +++ b/src/jtag/amt_jtagaccel.c @@ -503,7 +503,7 @@ COMMAND_HANDLER(amt_jtagaccel_handle_parport_port_command) if (amt_jtagaccel_port == 0) { uint16_t port; - COMMAND_PARSE_NUMBER(u16, args[0], port); + COMMAND_PARSE_NUMBER(u16, CMD_ARGV[0], port); amt_jtagaccel_port = port; } else @@ -527,7 +527,7 @@ COMMAND_HANDLER(amt_jtagaccel_handle_rtck_command) } else { - if (strcmp(args[0], "enabled") == 0) + if (strcmp(CMD_ARGV[0], "enabled") == 0) { rtck_enabled = 1; } diff --git a/src/jtag/at91rm9200.c b/src/jtag/at91rm9200.c index 90d94c95..8fbdf394 100644 --- a/src/jtag/at91rm9200.c +++ b/src/jtag/at91rm9200.c @@ -185,7 +185,7 @@ static int at91rm9200_speed(int speed) return ERROR_OK; } -static int at91rm9200_handle_device_command(struct command_context *cmd_ctx, char *cmd, char **args, int argc) +static int at91rm9200_handle_device_command(struct command_context *cmd_ctx, char *cmd, char **CMD_ARGV, int argc) { if (CMD_ARGC == 0) return ERROR_OK; @@ -193,8 +193,8 @@ static int at91rm9200_handle_device_command(struct command_context *cmd_ctx, cha /* only if the device name wasn't overwritten by cmdline */ if (at91rm9200_device == 0) { - at91rm9200_device = malloc(strlen(args[0]) + sizeof(char)); - strcpy(at91rm9200_device, args[0]); + at91rm9200_device = malloc(strlen(CMD_ARGV[0]) + sizeof(char)); + strcpy(at91rm9200_device, CMD_ARGV[0]); } return ERROR_OK; diff --git a/src/jtag/ft2232.c b/src/jtag/ft2232.c index c1b3f102..451da41c 100644 --- a/src/jtag/ft2232.c +++ b/src/jtag/ft2232.c @@ -2803,7 +2803,7 @@ COMMAND_HANDLER(ft2232_handle_device_desc_command) char buf[200]; if (CMD_ARGC == 1) { - ft2232_device_desc = strdup(args[0]); + ft2232_device_desc = strdup(CMD_ARGV[0]); cp = strchr(ft2232_device_desc, 0); /* under Win32, the FTD2XX driver appends an "A" to the end * of the description, this examines the given desc @@ -2835,7 +2835,7 @@ COMMAND_HANDLER(ft2232_handle_serial_command) { if (CMD_ARGC == 1) { - ft2232_serial = strdup(args[0]); + ft2232_serial = strdup(CMD_ARGV[0]); } else { @@ -2850,8 +2850,8 @@ COMMAND_HANDLER(ft2232_handle_layout_command) if (CMD_ARGC == 0) return ERROR_OK; - ft2232_layout = malloc(strlen(args[0]) + 1); - strcpy(ft2232_layout, args[0]); + ft2232_layout = malloc(strlen(CMD_ARGV[0]) + 1); + strcpy(ft2232_layout, CMD_ARGV[0]); return ERROR_OK; } @@ -2876,8 +2876,8 @@ COMMAND_HANDLER(ft2232_handle_vid_pid_command) unsigned i; for (i = 0; i < CMD_ARGC; i += 2) { - COMMAND_PARSE_NUMBER(u16, args[i], ft2232_vid[i >> 1]); - COMMAND_PARSE_NUMBER(u16, args[i + 1], ft2232_pid[i >> 1]); + COMMAND_PARSE_NUMBER(u16, CMD_ARGV[i], ft2232_vid[i >> 1]); + COMMAND_PARSE_NUMBER(u16, CMD_ARGV[i + 1], ft2232_pid[i >> 1]); } /* @@ -2893,7 +2893,7 @@ COMMAND_HANDLER(ft2232_handle_latency_command) { if (CMD_ARGC == 1) { - ft2232_latency = atoi(args[0]); + ft2232_latency = atoi(CMD_ARGV[0]); } else { diff --git a/src/jtag/gw16012.c b/src/jtag/gw16012.c index d1da2a13..d0cdde6b 100644 --- a/src/jtag/gw16012.c +++ b/src/jtag/gw16012.c @@ -548,7 +548,7 @@ COMMAND_HANDLER(gw16012_handle_parport_port_command) /* only if the port wasn't overwritten by cmdline */ if (gw16012_port == 0) { - COMMAND_PARSE_NUMBER(u16, args[0], gw16012_port); + COMMAND_PARSE_NUMBER(u16, CMD_ARGV[0], gw16012_port); } else { diff --git a/src/jtag/jlink.c b/src/jtag/jlink.c index 41b99a14..80e71502 100644 --- a/src/jtag/jlink.c +++ b/src/jtag/jlink.c @@ -632,7 +632,7 @@ COMMAND_HANDLER(jlink_handle_jlink_hw_jtag_command) command_print(cmd_ctx, "jlink hw jtag %i", jlink_hw_jtag_version); break; case 1: { - int request_version = atoi(args[0]); + int request_version = atoi(CMD_ARGV[0]); switch (request_version) { case 2: case 3: jlink_hw_jtag_version = request_version; diff --git a/src/jtag/parport.c b/src/jtag/parport.c index 52289c5e..e15c66d1 100644 --- a/src/jtag/parport.c +++ b/src/jtag/parport.c @@ -416,7 +416,7 @@ COMMAND_HANDLER(parport_handle_parport_port_command) /* only if the port wasn't overwritten by cmdline */ if (parport_port == 0) { - COMMAND_PARSE_NUMBER(u16, args[0], parport_port); + COMMAND_PARSE_NUMBER(u16, CMD_ARGV[0], parport_port); } else { @@ -438,8 +438,8 @@ COMMAND_HANDLER(parport_handle_parport_cable_command) /* only if the cable name wasn't overwritten by cmdline */ if (parport_cable == 0) { - parport_cable = malloc(strlen(args[0]) + sizeof(char)); - strcpy(parport_cable, args[0]); + parport_cable = malloc(strlen(CMD_ARGV[0]) + sizeof(char)); + strcpy(parport_cable, CMD_ARGV[0]); } return ERROR_OK; @@ -453,9 +453,9 @@ COMMAND_HANDLER(parport_handle_write_on_exit_command) return ERROR_OK; } - if (strcmp(args[0], "on") == 0) + if (strcmp(CMD_ARGV[0], "on") == 0) parport_exit = 1; - else if (strcmp(args[0], "off") == 0) + else if (strcmp(CMD_ARGV[0], "off") == 0) parport_exit = 0; return ERROR_OK; @@ -465,7 +465,7 @@ COMMAND_HANDLER(parport_handle_parport_toggling_time_command) { if (CMD_ARGC == 1) { uint32_t ns; - int retval = parse_u32(args[0], &ns); + int retval = parse_u32(CMD_ARGV[0], &ns); if (ERROR_OK != retval) return retval; diff --git a/src/jtag/presto.c b/src/jtag/presto.c index 45d99fff..1d6bc1db 100644 --- a/src/jtag/presto.c +++ b/src/jtag/presto.c @@ -756,7 +756,7 @@ COMMAND_HANDLER(presto_handle_serial_command) { if (presto_serial) free(presto_serial); - presto_serial = strdup(args[0]); + presto_serial = strdup(CMD_ARGV[0]); } else { diff --git a/src/jtag/tcl.c b/src/jtag/tcl.c index bd3f704a..1eead8d9 100644 --- a/src/jtag/tcl.c +++ b/src/jtag/tcl.c @@ -628,12 +628,12 @@ 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); @@ -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 (; 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: @@ -902,7 +902,7 @@ 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); } @@ -917,7 +917,7 @@ 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); } @@ -932,7 +932,7 @@ 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); } @@ -947,7 +947,7 @@ 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); } @@ -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) @@ -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) @@ -1019,17 +1019,17 @@ 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; @@ -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,9 +1357,9 @@ 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; @@ -1378,9 +1378,9 @@ 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; @@ -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; diff --git a/src/jtag/vsllink.c b/src/jtag/vsllink.c index cbea9956..7962249c 100644 --- a/src/jtag/vsllink.c +++ b/src/jtag/vsllink.c @@ -1329,17 +1329,17 @@ COMMAND_HANDLER(vsllink_handle_mode_command) return ERROR_FAIL; } - if (!strcmp(args[0], "normal")) + if (!strcmp(CMD_ARGV[0], "normal")) { vsllink_mode = VSLLINK_MODE_NORMAL; } - else if (!strcmp(args[0], "dma")) + else if (!strcmp(CMD_ARGV[0], "dma")) { vsllink_mode = VSLLINK_MODE_DMA; } else { - LOG_ERROR("invalid vsllink_mode: %s", args[0]); + LOG_ERROR("invalid vsllink_mode: %s", CMD_ARGV[0]); return ERROR_FAIL; } @@ -1354,7 +1354,7 @@ COMMAND_HANDLER(vsllink_handle_usb_vid_command) return ERROR_OK; } - COMMAND_PARSE_NUMBER(u16, args[0], vsllink_usb_vid); + COMMAND_PARSE_NUMBER(u16, CMD_ARGV[0], vsllink_usb_vid); return ERROR_OK; } @@ -1365,7 +1365,7 @@ COMMAND_HANDLER(vsllink_handle_usb_pid_command) LOG_ERROR("parameter error, should be one parameter for PID"); return ERROR_OK; } - COMMAND_PARSE_NUMBER(u16, args[0], vsllink_usb_pid); + COMMAND_PARSE_NUMBER(u16, CMD_ARGV[0], vsllink_usb_pid); return ERROR_OK; } @@ -1377,7 +1377,7 @@ COMMAND_HANDLER(vsllink_handle_usb_bulkin_command) return ERROR_OK; } - COMMAND_PARSE_NUMBER(u8, args[0], vsllink_usb_bulkin); + COMMAND_PARSE_NUMBER(u8, CMD_ARGV[0], vsllink_usb_bulkin); vsllink_usb_bulkin |= 0x80; @@ -1392,7 +1392,7 @@ COMMAND_HANDLER(vsllink_handle_usb_bulkout_command) return ERROR_OK; } - COMMAND_PARSE_NUMBER(u8, args[0], vsllink_usb_bulkout); + COMMAND_PARSE_NUMBER(u8, CMD_ARGV[0], vsllink_usb_bulkout); vsllink_usb_bulkout &= ~0x80; @@ -1407,7 +1407,7 @@ COMMAND_HANDLER(vsllink_handle_usb_interface_command) return ERROR_OK; } - COMMAND_PARSE_NUMBER(u8, args[0], vsllink_usb_interface); + COMMAND_PARSE_NUMBER(u8, CMD_ARGV[0], vsllink_usb_interface); return ERROR_OK; } -- cgit v1.2.3