diff options
| author | Zachary T Welch <zw@superlucidity.net> | 2009-11-15 04:57:12 -0800 |
|---|---|---|
| committer | Zachary T Welch <zw@superlucidity.net> | 2009-11-17 11:38:06 -0800 |
| commit | 7bf1a86e473a12882bf6f71cb4d0d416394b69d4 (patch) | |
| tree | 2c9c1d2138df704ac551cdafe105dbb68b8f23b8 /src/jtag/ft2232.c | |
| parent | 5b9899d6ea1e0cf763465c64c700f20eddd893f9 (diff) | |
| download | openocd+libswd-7bf1a86e473a12882bf6f71cb4d0d416394b69d4.tar.gz openocd+libswd-7bf1a86e473a12882bf6f71cb4d0d416394b69d4.tar.bz2 openocd+libswd-7bf1a86e473a12882bf6f71cb4d0d416394b69d4.tar.xz openocd+libswd-7bf1a86e473a12882bf6f71cb4d0d416394b69d4.zip | |
command_handler: change to 'argc' to CMD_ARGC
This patch converts all instances of 'argc' in COMMAND_HANDLER routines
to use CMD_ARGC.
Diffstat (limited to 'src/jtag/ft2232.c')
| -rw-r--r-- | src/jtag/ft2232.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/jtag/ft2232.c b/src/jtag/ft2232.c index 7acdf1a0..c1b3f102 100644 --- a/src/jtag/ft2232.c +++ b/src/jtag/ft2232.c @@ -2801,7 +2801,7 @@ COMMAND_HANDLER(ft2232_handle_device_desc_command) { char *cp; char buf[200]; - if (argc == 1) + if (CMD_ARGC == 1) { ft2232_device_desc = strdup(args[0]); cp = strchr(ft2232_device_desc, 0); @@ -2833,7 +2833,7 @@ COMMAND_HANDLER(ft2232_handle_device_desc_command) COMMAND_HANDLER(ft2232_handle_serial_command) { - if (argc == 1) + if (CMD_ARGC == 1) { ft2232_serial = strdup(args[0]); } @@ -2847,7 +2847,7 @@ COMMAND_HANDLER(ft2232_handle_serial_command) COMMAND_HANDLER(ft2232_handle_layout_command) { - if (argc == 0) + if (CMD_ARGC == 0) return ERROR_OK; ft2232_layout = malloc(strlen(args[0]) + 1); @@ -2858,23 +2858,23 @@ COMMAND_HANDLER(ft2232_handle_layout_command) COMMAND_HANDLER(ft2232_handle_vid_pid_command) { - if (argc > MAX_USB_IDS * 2) + if (CMD_ARGC > MAX_USB_IDS * 2) { LOG_WARNING("ignoring extra IDs in ft2232_vid_pid " "(maximum is %d pairs)", MAX_USB_IDS); - argc = MAX_USB_IDS * 2; + CMD_ARGC = MAX_USB_IDS * 2; } - if (argc < 2 || (argc & 1)) + if (CMD_ARGC < 2 || (CMD_ARGC & 1)) { LOG_WARNING("incomplete ft2232_vid_pid configuration directive"); - if (argc < 2) + if (CMD_ARGC < 2) return ERROR_COMMAND_SYNTAX_ERROR; /* remove the incomplete trailing id */ - argc -= 1; + CMD_ARGC -= 1; } unsigned i; - for (i = 0; i < argc; i += 2) + 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]); @@ -2891,7 +2891,7 @@ COMMAND_HANDLER(ft2232_handle_vid_pid_command) COMMAND_HANDLER(ft2232_handle_latency_command) { - if (argc == 1) + if (CMD_ARGC == 1) { ft2232_latency = atoi(args[0]); } |