command_handler: change 'args' to CMD_ARGV

[openocd.git] / src / flash / str9x.c

diff --git a/src/flash/str9x.c b/src/flash/str9x.c
index 4c4d8ae7ff11ce5ab0d19087cb632532e42246a2..50cddaf2c430635b872a717ffc96df88f45842bb 100644 (file)
--- a/src/flash/str9x.c
+++ b/src/flash/str9x.c
@@ -121,7 +121,7 @@ FLASH_BANK_COMMAND_HANDLER(str9x_flash_bank_command)
 {
        struct str9x_flash_bank *str9x_info;
 
-       if (argc < 6)
+       if (CMD_ARGC < 6)
        {
                LOG_WARNING("incomplete flash_bank str9x configuration");
                return ERROR_FLASH_BANK_INVALID;
@@ -636,7 +636,7 @@ COMMAND_HANDLER(str9x_handle_flash_config_command)
        struct str9x_flash_bank *str9x_info;
        struct target *target = NULL;
 
-       if (argc < 5)
+       if (CMD_ARGC < 5)
        {
                return ERROR_COMMAND_SYNTAX_ERROR;
        }
@@ -647,10 +647,10 @@ COMMAND_HANDLER(str9x_handle_flash_config_command)
                return retval;
 
        uint32_t bbsr, nbbsr, bbadr, nbbadr;
-       COMMAND_PARSE_NUMBER(u32, args[1], bbsr);
-       COMMAND_PARSE_NUMBER(u32, args[2], nbbsr);
-       COMMAND_PARSE_NUMBER(u32, args[3], bbadr);
-       COMMAND_PARSE_NUMBER(u32, args[4], nbbadr);
+       COMMAND_PARSE_NUMBER(u32, CMD_ARGV[1], bbsr);
+       COMMAND_PARSE_NUMBER(u32, CMD_ARGV[2], nbbsr);
+       COMMAND_PARSE_NUMBER(u32, CMD_ARGV[3], bbadr);
+       COMMAND_PARSE_NUMBER(u32, CMD_ARGV[4], nbbadr);
 
        str9x_info = bank->driver_priv;