command_handler: change 'cmd_ctx' to CMD_CTX

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

diff --git a/src/flash/str7x.c b/src/flash/str7x.c
index d8510511087911479e99d3232d06ed2ac8cbd86b..da1899d50bc864223c6f2be3fd961be6daa25ff2 100644 (file)
--- a/src/flash/str7x.c
+++ b/src/flash/str7x.c
@@ -114,7 +114,7 @@ FLASH_BANK_COMMAND_HANDLER(str7x_flash_bank_command)
 {
        struct str7x_flash_bank *str7x_info;
 
-       if (argc < 7)
+       if (CMD_ARGC < 7)
        {
                LOG_WARNING("incomplete flash_bank str7x configuration");
                return ERROR_FLASH_BANK_INVALID;
@@ -127,23 +127,23 @@ FLASH_BANK_COMMAND_HANDLER(str7x_flash_bank_command)
        str7x_info->busy_bits = (FLASH_LOCK | FLASH_BSYA1 | FLASH_BSYA0);
        str7x_info->disable_bit = (1 << 1);
 
-       if (strcmp(args[6], "STR71x") == 0)
+       if (strcmp(CMD_ARGV[6], "STR71x") == 0)
        {
                str7x_info->register_base = 0x40100000;
        }
-       else if (strcmp(args[6], "STR73x") == 0)
+       else if (strcmp(CMD_ARGV[6], "STR73x") == 0)
        {
                str7x_info->register_base = 0x80100000;
                str7x_info->busy_bits = (FLASH_LOCK | FLASH_BSYA0);
        }
-       else if (strcmp(args[6], "STR75x") == 0)
+       else if (strcmp(CMD_ARGV[6], "STR75x") == 0)
        {
                str7x_info->register_base = 0x20100000;
                str7x_info->disable_bit = (1 << 0);
        }
        else
        {
-               LOG_ERROR("unknown STR7x variant: '%s'", args[6]);
+               LOG_ERROR("unknown STR7x variant: '%s'", CMD_ARGV[6]);
                free(str7x_info);
                return ERROR_FLASH_BANK_INVALID;
        }
@@ -611,9 +611,9 @@ COMMAND_HANDLER(str7x_handle_disable_jtag_command)
        uint16_t ProtectionLevel = 0;
        uint16_t ProtectionRegs;
 
-       if (argc < 1)
+       if (CMD_ARGC < 1)
        {
-               command_print(cmd_ctx, "str7x disable_jtag <bank>");
+               command_print(CMD_CTX, "str7x disable_jtag <bank>");
                return ERROR_OK;
        }