Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
command_handler: change 'cmd_ctx' to CMD_CTX
[openocd.git] / src / flash / flash.c
diff --git a/src/flash/flash.c b/src/flash/flash.c
index adc1411958a1c1385cc70ff176f6491a923ae47e..2c63b827c9d7f81527d14e935a9cd480b589b452 100644 (file)
--- a/src/flash/flash.c
+++ b/src/flash/flash.c
@@ -201,14 +201,14 @@ struct flash_bank *get_flash_bank_by_num(int num)
 COMMAND_HELPER(flash_command_get_bank_by_num,
        unsigned name_index, struct flash_bank **bank)
 {
+       const char *name = CMD_ARGV[name_index];
        unsigned bank_num;
-       COMMAND_PARSE_NUMBER(uint, args[name_index], bank_num);
+       COMMAND_PARSE_NUMBER(uint, name, bank_num);
 
        *bank = get_flash_bank_by_num(bank_num);
        if (!*bank)
        {
-               command_print(cmd_ctx,
-                       "flash bank '#%u' not found", bank_num);
+               command_print(CMD_CTX, "flash bank '%s' not found", name);
                return ERROR_INVALID_ARGUMENTS;
        }
        return ERROR_OK;
@@ -222,28 +222,28 @@ COMMAND_HANDLER(handle_flash_bank_command)
        int found = 0;
        struct target *target;
 
-       if (argc < 6)
+       if (CMD_ARGC < 6)
        {
                return ERROR_COMMAND_SYNTAX_ERROR;
        }
 
-       if ((target = get_target(args[5])) == NULL)
+       if ((target = get_target(CMD_ARGV[5])) == NULL)
        {
-               LOG_ERROR("target '%s' not defined", args[5]);
+               LOG_ERROR("target '%s' not defined", CMD_ARGV[5]);
                return ERROR_FAIL;
        }
 
        for (i = 0; flash_drivers[i]; i++)
        {
-               if (strcmp(args[0], flash_drivers[i]->name) != 0)
+               if (strcmp(CMD_ARGV[0], flash_drivers[i]->name) != 0)
                        continue;
 
                struct flash_bank *p, *c;
 
                /* register flash specific commands */
-               if (flash_drivers[i]->register_commands(cmd_ctx) != ERROR_OK)
+               if (flash_drivers[i]->register_commands(CMD_CTX) != ERROR_OK)
                {
-                       LOG_ERROR("couldn't register '%s' commands", args[0]);
+                       LOG_ERROR("couldn't register '%s' commands", CMD_ARGV[0]);
                        return ERROR_FAIL;
                }
 
@@ -251,10 +251,10 @@ COMMAND_HANDLER(handle_flash_bank_command)
                c->target = target;
                c->driver = flash_drivers[i];
                c->driver_priv = NULL;
-               COMMAND_PARSE_NUMBER(u32, args[1], c->base);
-               COMMAND_PARSE_NUMBER(u32, args[2], c->size);
-               COMMAND_PARSE_NUMBER(int, args[3], c->chip_width);
-               COMMAND_PARSE_NUMBER(int, args[4], c->bus_width);
+               COMMAND_PARSE_NUMBER(u32, CMD_ARGV[1], c->base);
+               COMMAND_PARSE_NUMBER(u32, CMD_ARGV[2], c->size);
+               COMMAND_PARSE_NUMBER(int, CMD_ARGV[3], c->chip_width);
+               COMMAND_PARSE_NUMBER(int, CMD_ARGV[4], c->bus_width);
                c->num_sectors = 0;
                c->sectors = NULL;
                c->next = NULL;
@@ -262,7 +262,7 @@ COMMAND_HANDLER(handle_flash_bank_command)
                retval = CALL_COMMAND_HANDLER(flash_drivers[i]->flash_bank_command, c);
                if (ERROR_OK != retval)
                {
-                       LOG_ERROR("'%s' driver rejected flash bank at 0x%8.8" PRIx32 , args[0], c->base);
+                       LOG_ERROR("'%s' driver rejected flash bank at 0x%8.8" PRIx32 , CMD_ARGV[0], c->base);
                        free(c);
                        return retval;
                }
@@ -289,7 +289,7 @@ COMMAND_HANDLER(handle_flash_bank_command)
        /* no matching flash driver found */
        if (!found)
        {
-               LOG_ERROR("flash driver '%s' not found", args[0]);
+               LOG_ERROR("flash driver '%s' not found", CMD_ARGV[0]);
                return ERROR_FAIL;
        }
 
@@ -303,11 +303,11 @@ COMMAND_HANDLER(handle_flash_info_command)
        int j = 0;
        int retval;
 
-       if (argc != 1)
+       if (CMD_ARGC != 1)
                return ERROR_COMMAND_SYNTAX_ERROR;
 
        unsigned bank_nr;
-       COMMAND_PARSE_NUMBER(uint, args[0], bank_nr);
+       COMMAND_PARSE_NUMBER(uint, CMD_ARGV[0], bank_nr);
 
        for (p = flash_banks; p; p = p->next, i++)
        {
@@ -320,7 +320,7 @@ COMMAND_HANDLER(handle_flash_info_command)
                if ((retval = p->driver->auto_probe(p)) != ERROR_OK)
                        return retval;
 
-               command_print(cmd_ctx,
+               command_print(CMD_CTX,
                              "#%" PRIi32 " : %s at 0x%8.8" PRIx32 ", size 0x%8.8" PRIx32 ", buswidth %i, chipwidth %i",
                              i,
                              p->driver->name,
@@ -339,7 +339,7 @@ COMMAND_HANDLER(handle_flash_info_command)
                        else
                                protect_state = "protection state unknown";
 
-                       command_print(cmd_ctx,
+                       command_print(CMD_CTX,
                                      "\t#%3i: 0x%8.8" PRIx32 " (0x%" PRIx32 " %" PRIi32 "kB) %s",
                                      j,
                                      p->sectors[j].offset,
@@ -350,7 +350,7 @@ COMMAND_HANDLER(handle_flash_info_command)
 
                *buf = '\0'; /* initialize buffer, otherwise it migh contain garbage if driver function fails */
                retval = p->driver->info(p, buf, sizeof(buf));
-               command_print(cmd_ctx, "%s", buf);
+               command_print(CMD_CTX, "%s", buf);
                if (retval != ERROR_OK)
                        LOG_ERROR("error retrieving flash info (%d)", retval);
        }
@@ -362,34 +362,34 @@ COMMAND_HANDLER(handle_flash_probe_command)
 {
        int retval;
 
-       if (argc != 1)
+       if (CMD_ARGC != 1)
        {
                return ERROR_COMMAND_SYNTAX_ERROR;
        }
 
        unsigned bank_nr;
-       COMMAND_PARSE_NUMBER(uint, args[0], bank_nr);
+       COMMAND_PARSE_NUMBER(uint, CMD_ARGV[0], bank_nr);
        struct flash_bank *p = get_flash_bank_by_num_noprobe(bank_nr);
        if (p)
        {
                if ((retval = p->driver->probe(p)) == ERROR_OK)
                {
-                       command_print(cmd_ctx, "flash '%s' found at 0x%8.8" PRIx32, p->driver->name, p->base);
+                       command_print(CMD_CTX, "flash '%s' found at 0x%8.8" PRIx32, p->driver->name, p->base);
                }
                else if (retval == ERROR_FLASH_BANK_INVALID)
                {
-                       command_print(cmd_ctx, "probing failed for flash bank '#%s' at 0x%8.8" PRIx32,
-                                                 args[0], p->base);
+                       command_print(CMD_CTX, "probing failed for flash bank '#%s' at 0x%8.8" PRIx32,
+                                                 CMD_ARGV[0], p->base);
                }
                else
                {
-                       command_print(cmd_ctx, "unknown error when probing flash bank '#%s' at 0x%8.8" PRIx32,
-                                                 args[0], p->base);
+                       command_print(CMD_CTX, "unknown error when probing flash bank '#%s' at 0x%8.8" PRIx32,
+                                                 CMD_ARGV[0], p->base);
                }
        }
        else
        {
-               command_print(cmd_ctx, "flash bank '#%s' is out of bounds", args[0]);
+               command_print(CMD_CTX, "flash bank '#%s' is out of bounds", CMD_ARGV[0]);
        }
 
        return ERROR_OK;
@@ -397,7 +397,7 @@ COMMAND_HANDLER(handle_flash_probe_command)
 
 COMMAND_HANDLER(handle_flash_erase_check_command)
 {
-       if (argc != 1)
+       if (CMD_ARGC != 1)
        {
                return ERROR_COMMAND_SYNTAX_ERROR;
        }
@@ -410,12 +410,12 @@ COMMAND_HANDLER(handle_flash_erase_check_command)
        int j;
        if ((retval = p->driver->erase_check(p)) == ERROR_OK)
        {
-               command_print(cmd_ctx, "successfully checked erase state");
+               command_print(CMD_CTX, "successfully checked erase state");
        }
        else
        {
-               command_print(cmd_ctx, "unknown error when checking erase state of flash bank #%s at 0x%8.8" PRIx32,
-                       args[0], p->base);
+               command_print(CMD_CTX, "unknown error when checking erase state of flash bank #%s at 0x%8.8" PRIx32,
+                       CMD_ARGV[0], p->base);
        }
 
        for (j = 0; j < p->num_sectors; j++)
@@ -429,7 +429,7 @@ COMMAND_HANDLER(handle_flash_erase_check_command)
                else
                        erase_state = "erase state unknown";
 
-               command_print(cmd_ctx,
+               command_print(CMD_CTX,
                              "\t#%3i: 0x%8.8" PRIx32 " (0x%" PRIx32 " %" PRIi32 "kB) %s",
                              j,
                              p->sectors[j].offset,
@@ -448,16 +448,16 @@ COMMAND_HANDLER(handle_flash_erase_address_command)
        int address;
        int length;
 
-       struct target *target = get_current_target(cmd_ctx);
+       struct target *target = get_current_target(CMD_CTX);
 
-       if (argc != 2)
+       if (CMD_ARGC != 2)
                return ERROR_COMMAND_SYNTAX_ERROR;
 
-       COMMAND_PARSE_NUMBER(int, args[0], address);
-       COMMAND_PARSE_NUMBER(int, args[1], length);
+       COMMAND_PARSE_NUMBER(int, CMD_ARGV[0], address);
+       COMMAND_PARSE_NUMBER(int, CMD_ARGV[1], length);
        if (length <= 0)
        {
-               command_print(cmd_ctx, "Length must be >0");
+               command_print(CMD_CTX, "Length must be >0");
                return ERROR_COMMAND_SYNTAX_ERROR;
        }
 
@@ -477,7 +477,7 @@ COMMAND_HANDLER(handle_flash_erase_address_command)
 
        if ((ERROR_OK == retval) && (duration_measure(&bench) == ERROR_OK))
        {
-               command_print(cmd_ctx, "erased address 0x%8.8x (length %i)"
+               command_print(CMD_CTX, "erased address 0x%8.8x (length %i)"
                                " in %fs (%0.3f kb/s)", address, length,
                                duration_elapsed(&bench), duration_kbps(&bench, length));
        }
@@ -487,7 +487,7 @@ COMMAND_HANDLER(handle_flash_erase_address_command)
 
 COMMAND_HANDLER(handle_flash_protect_check_command)
 {
-       if (argc != 1)
+       if (CMD_ARGC != 1)
                return ERROR_COMMAND_SYNTAX_ERROR;
 
        struct flash_bank *p;
@@ -497,15 +497,15 @@ COMMAND_HANDLER(handle_flash_protect_check_command)
 
        if ((retval = p->driver->protect_check(p)) == ERROR_OK)
        {
-               command_print(cmd_ctx, "successfully checked protect state");
+               command_print(CMD_CTX, "successfully checked protect state");
        }
        else if (retval == ERROR_FLASH_OPERATION_FAILED)
        {
-               command_print(cmd_ctx, "checking protection state failed (possibly unsupported) by flash #%s at 0x%8.8" PRIx32, args[0], p->base);
+               command_print(CMD_CTX, "checking protection state failed (possibly unsupported) by flash #%s at 0x%8.8" PRIx32, CMD_ARGV[0], p->base);
        }
        else
        {
-               command_print(cmd_ctx, "unknown error when checking protection state of flash bank '#%s' at 0x%8.8" PRIx32, args[0], p->base);
+               command_print(CMD_CTX, "unknown error when checking protection state of flash bank '#%s' at 0x%8.8" PRIx32, CMD_ARGV[0], p->base);
        }
 
        return ERROR_OK;
@@ -531,26 +531,26 @@ static int flash_check_sector_parameters(struct command_context *cmd_ctx,
 
 COMMAND_HANDLER(handle_flash_erase_command)
 {
-       if (argc != 2)
+       if (CMD_ARGC != 2)
                return ERROR_COMMAND_SYNTAX_ERROR;
 
        uint32_t bank_nr;
        uint32_t first;
        uint32_t last;
 
-       COMMAND_PARSE_NUMBER(u32, args[0], bank_nr);
+       COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], bank_nr);
        struct flash_bank *p = get_flash_bank_by_num(bank_nr);
        if (!p)
                return ERROR_OK;
 
-       COMMAND_PARSE_NUMBER(u32, args[1], first);
-       if (strcmp(args[2], "last") == 0)
+       COMMAND_PARSE_NUMBER(u32, CMD_ARGV[1], first);
+       if (strcmp(CMD_ARGV[2], "last") == 0)
                last = p->num_sectors - 1;
        else
-               COMMAND_PARSE_NUMBER(u32, args[2], last);
+               COMMAND_PARSE_NUMBER(u32, CMD_ARGV[2], last);
 
        int retval;
-       if ((retval = flash_check_sector_parameters(cmd_ctx,
+       if ((retval = flash_check_sector_parameters(CMD_CTX,
                        first, last, p->num_sectors)) != ERROR_OK)
                return retval;
 
@@ -561,7 +561,7 @@ COMMAND_HANDLER(handle_flash_erase_command)
 
        if ((ERROR_OK == retval) && (duration_measure(&bench) == ERROR_OK))
        {
-               command_print(cmd_ctx, "erased sectors %" PRIu32 " "
+               command_print(CMD_CTX, "erased sectors %" PRIu32 " "
                                "through %" PRIu32" on flash bank %" PRIu32 " "
                                "in %fs", first, last, bank_nr, duration_elapsed(&bench));
        }
@@ -571,7 +571,7 @@ COMMAND_HANDLER(handle_flash_erase_command)
 
 COMMAND_HANDLER(handle_flash_protect_command)
 {
-       if (argc != 3)
+       if (CMD_ARGC != 3)
                return ERROR_COMMAND_SYNTAX_ERROR;
 
        uint32_t bank_nr;
@@ -579,32 +579,32 @@ COMMAND_HANDLER(handle_flash_protect_command)
        uint32_t last;
        int set;
 
-       COMMAND_PARSE_NUMBER(u32, args[0], bank_nr);
+       COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], bank_nr);
        struct flash_bank *p = get_flash_bank_by_num(bank_nr);
        if (!p)
                return ERROR_OK;
 
-       COMMAND_PARSE_NUMBER(u32, args[1], first);
-       if (strcmp(args[2], "last") == 0)
+       COMMAND_PARSE_NUMBER(u32, CMD_ARGV[1], first);
+       if (strcmp(CMD_ARGV[2], "last") == 0)
                last = p->num_sectors - 1;
        else
-               COMMAND_PARSE_NUMBER(u32, args[2], last);
+               COMMAND_PARSE_NUMBER(u32, CMD_ARGV[2], last);
 
-       if (strcmp(args[3], "on") == 0)
+       if (strcmp(CMD_ARGV[3], "on") == 0)
                set = 1;
-       else if (strcmp(args[3], "off") == 0)
+       else if (strcmp(CMD_ARGV[3], "off") == 0)
                set = 0;
        else
                return ERROR_COMMAND_SYNTAX_ERROR;
 
        int retval;
-       if ((retval = flash_check_sector_parameters(cmd_ctx,
+       if ((retval = flash_check_sector_parameters(CMD_CTX,
                        first, last, p->num_sectors)) != ERROR_OK)
                return retval;
 
        retval = flash_driver_protect(p, set, first, last);
        if (retval == ERROR_OK) {
-               command_print(cmd_ctx, "%s protection for sectors %i "
+               command_print(CMD_CTX, "%s protection for sectors %i "
                                "through %i on flash bank %i",
                        (set) ? "set" : "cleared", (int) first,
                        (int) last, (int) bank_nr);
@@ -615,14 +615,14 @@ COMMAND_HANDLER(handle_flash_protect_command)
 
 COMMAND_HANDLER(handle_flash_write_image_command)
 {
-       struct target *target = get_current_target(cmd_ctx);
+       struct target *target = get_current_target(CMD_CTX);
 
        struct image image;
        uint32_t written;
 
        int retval;
 
-       if (argc < 1)
+       if (CMD_ARGC < 1)
        {
                return ERROR_COMMAND_SYNTAX_ERROR;
        }
@@ -633,25 +633,25 @@ COMMAND_HANDLER(handle_flash_write_image_command)
 
        for (;;)
        {
-               if (strcmp(args[0], "erase") == 0)
+               if (strcmp(CMD_ARGV[0], "erase") == 0)
                {
                        auto_erase = 1;
-                       args++;
-                       argc--;
-                       command_print(cmd_ctx, "auto erase enabled");
-               } else if (strcmp(args[0], "unlock") == 0)
+                       CMD_ARGV++;
+                       CMD_ARGC--;
+                       command_print(CMD_CTX, "auto erase enabled");
+               } else if (strcmp(CMD_ARGV[0], "unlock") == 0)
                {
                        auto_unlock = true;
-                       args++;
-                       argc--;
-                       command_print(cmd_ctx, "auto unlock enabled");
+                       CMD_ARGV++;
+                       CMD_ARGC--;
+                       command_print(CMD_CTX, "auto unlock enabled");
                } else
                {
                        break;
                }
        }
 
-       if (argc < 1)
+       if (CMD_ARGC < 1)
        {
                return ERROR_COMMAND_SYNTAX_ERROR;
        }
@@ -665,10 +665,10 @@ COMMAND_HANDLER(handle_flash_write_image_command)
        struct duration bench;
        duration_start(&bench);
 
-       if (argc >= 2)
+       if (CMD_ARGC >= 2)
        {
                image.base_address_set = 1;
-               COMMAND_PARSE_NUMBER(int, args[1], image.base_address);
+               COMMAND_PARSE_NUMBER(int, CMD_ARGV[1], image.base_address);
        }
        else
        {
@@ -678,7 +678,7 @@ COMMAND_HANDLER(handle_flash_write_image_command)
 
        image.start_address_set = 0;
 
-       retval = image_open(&image, args[0], (argc == 3) ? args[2] : NULL);
+       retval = image_open(&image, CMD_ARGV[0], (CMD_ARGC == 3) ? CMD_ARGV[2] : NULL);
        if (retval != ERROR_OK)
        {
                return retval;
@@ -693,8 +693,8 @@ COMMAND_HANDLER(handle_flash_write_image_command)
 
        if ((ERROR_OK == retval) && (duration_measure(&bench) == ERROR_OK))
        {
-               command_print(cmd_ctx, "wrote %" PRIu32 " byte from file %s "
-                               "in %fs (%0.3f kb/s)", written, args[0],
+               command_print(CMD_CTX, "wrote %" PRIu32 " byte from file %s "
+                               "in %fs (%0.3f kb/s)", written, CMD_ARGV[0],
                                duration_elapsed(&bench), duration_kbps(&bench, written));
        }
 
@@ -714,16 +714,16 @@ COMMAND_HANDLER(handle_flash_fill_command)
        uint32_t wrote = 0;
        uint32_t cur_size = 0;
        uint32_t chunk_count;
-       struct target *target = get_current_target(cmd_ctx);
+       struct target *target = get_current_target(CMD_CTX);
        uint32_t i;
        uint32_t wordsize;
 
-       if (argc != 3)
+       if (CMD_ARGC != 3)
                return ERROR_COMMAND_SYNTAX_ERROR;
 
-       COMMAND_PARSE_NUMBER(u32, args[0], address);
-       COMMAND_PARSE_NUMBER(u32, args[1], pattern);
-       COMMAND_PARSE_NUMBER(u32, args[2], count);
+       COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], address);
+       COMMAND_PARSE_NUMBER(u32, CMD_ARGV[1], pattern);
+       COMMAND_PARSE_NUMBER(u32, CMD_ARGV[2], count);
 
        if (count == 0)
                return ERROR_OK;
@@ -800,7 +800,7 @@ COMMAND_HANDLER(handle_flash_fill_command)
 
        if (duration_measure(&bench) == ERROR_OK)
        {
-               command_print(cmd_ctx, "wrote %" PRIu32 " bytes to 0x%8.8" PRIx32 
+               command_print(CMD_CTX, "wrote %" PRIu32 " bytes to 0x%8.8" PRIx32
                                " in %fs (%0.3f kb/s)", wrote, address,
                                duration_elapsed(&bench), duration_kbps(&bench, wrote));
        }
@@ -813,7 +813,7 @@ COMMAND_HANDLER(handle_flash_write_bank_command)
        uint8_t *buffer;
        struct fileio fileio;
 
-       if (argc != 3)
+       if (CMD_ARGC != 3)
                return ERROR_COMMAND_SYNTAX_ERROR;
 
        struct duration bench;
@@ -824,9 +824,9 @@ COMMAND_HANDLER(handle_flash_write_bank_command)
        if (ERROR_OK != retval)
                return retval;
 
-       COMMAND_PARSE_NUMBER(u32, args[2], offset);
+       COMMAND_PARSE_NUMBER(u32, CMD_ARGV[2], offset);
 
-       if (fileio_open(&fileio, args[1], FILEIO_READ, FILEIO_BINARY) != ERROR_OK)
+       if (fileio_open(&fileio, CMD_ARGV[1], FILEIO_READ, FILEIO_BINARY) != ERROR_OK)
        {
                return ERROR_OK;
        }
@@ -847,9 +847,9 @@ COMMAND_HANDLER(handle_flash_write_bank_command)
 
        if ((ERROR_OK == retval) && (duration_measure(&bench) == ERROR_OK))
        {
-               command_print(cmd_ctx, "wrote %zu byte from file %s to flash bank %u"
+               command_print(CMD_CTX, "wrote %zu byte from file %s to flash bank %u"
                                " at offset 0x%8.8" PRIx32 " in %fs (%0.3f kb/s)",
-                               fileio.size, args[1], p->bank_number, offset,
+                               fileio.size, CMD_ARGV[1], p->bank_number, offset,
                                duration_elapsed(&bench), duration_kbps(&bench, fileio.size));
        }
 
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)