Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
use COMMAND_REGISTER macro
[openocd.git] / src / flash / mflash.c
diff --git a/src/flash/mflash.c b/src/flash/mflash.c
index 49dc432f36eb002c7a41c5b384264a1a5c15f23b..a4a45dca8f5a00e6bca6c63dd85a4eae8373994e 100644 (file)
--- a/src/flash/mflash.c
+++ b/src/flash/mflash.c
@@ -416,7 +416,7 @@ COMMAND_HANDLER(mg_probe_cmd)
        ret = mg_mflash_probe();
 
        if (ret == ERROR_OK) {
-               command_print(cmd_ctx, "mflash (total %" PRIu32 " sectors) found at 0x%8.8" PRIx32 "",
+               command_print(CMD_CTX, "mflash (total %" PRIu32 " sectors) found at 0x%8.8" PRIx32 "",
                                mflash_bank->drv_info->tot_sects, mflash_bank->base);
        }
 
@@ -705,18 +705,18 @@ static int mg_mflash_write(uint32_t addr, uint8_t *buff, uint32_t len)
 
 COMMAND_HANDLER(mg_write_cmd)
 {
-       uint32_t address, buf_cnt, cnt, res, i;
+       uint32_t address, cnt, res, i;
        uint8_t *buffer;
        struct fileio fileio;
        int ret;
 
-       if (argc != 3) {
+       if (CMD_ARGC != 3) {
                return ERROR_COMMAND_SYNTAX_ERROR;
        }
 
-       COMMAND_PARSE_NUMBER(u32, args[2], address);
+       COMMAND_PARSE_NUMBER(u32, CMD_ARGV[2], address);
 
-       ret = fileio_open(&fileio, args[1], FILEIO_READ, FILEIO_BINARY);
+       ret = fileio_open(&fileio, CMD_ARGV[1], FILEIO_READ, FILEIO_BINARY);
        if (ret != ERROR_OK)
                return ret;
 
@@ -732,6 +732,7 @@ COMMAND_HANDLER(mg_write_cmd)
        struct duration bench;
        duration_start(&bench);
 
+       size_t buf_cnt;
        for (i = 0; i < cnt; i++) {
                if ((ret = fileio_read(&fileio, MG_FILEIO_CHUNK, buffer, &buf_cnt)) !=
                                ERROR_OK)
@@ -750,8 +751,8 @@ COMMAND_HANDLER(mg_write_cmd)
 
        if (duration_measure(&bench) == ERROR_OK)
        {
-               command_print(cmd_ctx, "wrote %lli byte from file %s "
-                               "in %fs (%0.3f kB/s)", fileio.size, args[1],
+               command_print(CMD_CTX, "wrote %zu byte from file %s "
+                               "in %fs (%0.3f kB/s)", fileio.size, CMD_ARGV[1],
                                duration_elapsed(&bench), duration_kbps(&bench, fileio.size));
        }
 
@@ -769,19 +770,19 @@ mg_write_cmd_err:
 
 COMMAND_HANDLER(mg_dump_cmd)
 {
-       uint32_t address, size_written, size, cnt, res, i;
+       uint32_t address, size, cnt, res, i;
        uint8_t *buffer;
        struct fileio fileio;
        int ret;
 
-       if (argc != 4) {
+       if (CMD_ARGC != 4) {
                return ERROR_COMMAND_SYNTAX_ERROR;
        }
 
-       COMMAND_PARSE_NUMBER(u32, args[2], address);
-       COMMAND_PARSE_NUMBER(u32, args[3], size);
+       COMMAND_PARSE_NUMBER(u32, CMD_ARGV[2], address);
+       COMMAND_PARSE_NUMBER(u32, CMD_ARGV[3], size);
 
-       ret = fileio_open(&fileio, args[1], FILEIO_WRITE, FILEIO_BINARY);
+       ret = fileio_open(&fileio, CMD_ARGV[1], FILEIO_WRITE, FILEIO_BINARY);
        if (ret != ERROR_OK)
                return ret;
 
@@ -797,6 +798,7 @@ COMMAND_HANDLER(mg_dump_cmd)
        struct duration bench;
        duration_start(&bench);
 
+       size_t size_written;
        for (i = 0; i < cnt; i++) {
                if ((ret = mg_mflash_read(address, buffer, MG_FILEIO_CHUNK)) != ERROR_OK)
                        goto mg_dump_cmd_err;
@@ -815,9 +817,9 @@ COMMAND_HANDLER(mg_dump_cmd)
 
        if (duration_measure(&bench) == ERROR_OK)
        {
-               command_print(cmd_ctx, "dump image (address 0x%8.8" PRIx32 " "
+               command_print(CMD_CTX, "dump image (address 0x%8.8" PRIx32 " "
                                "size %" PRIu32 ") to file %s in %fs (%0.3f kB/s)",
-                               address, size, args[1],
+                               address, size, CMD_ARGV[1],
                                duration_elapsed(&bench), duration_kbps(&bench, size));
        }
 
@@ -1221,19 +1223,19 @@ COMMAND_HANDLER(mg_config_cmd)
        if ((ret = mg_mflash_rst()) != ERROR_OK)
                return ret;
 
-       switch (argc) {
+       switch (CMD_ARGC) {
                case 2:
-                       if (!strcmp(args[1], "boot"))
+                       if (!strcmp(CMD_ARGV[1], "boot"))
                                return mg_boot_config();
-                       else if (!strcmp(args[1], "storage"))
+                       else if (!strcmp(CMD_ARGV[1], "storage"))
                                return mg_storage_config();
                        else
                                return ERROR_COMMAND_NOTFOUND;
                        break;
                case 3:
-                       if (!strcmp(args[1], "pll")) {
+                       if (!strcmp(CMD_ARGV[1], "pll")) {
                                unsigned long freq;
-                               COMMAND_PARSE_NUMBER(ulong, args[2], freq);
+                               COMMAND_PARSE_NUMBER(ulong, CMD_ARGV[2], freq);
                                fin = freq;
 
                                if (fin > MG_PLL_CLK_OUT) {
@@ -1269,12 +1271,12 @@ COMMAND_HANDLER(mg_config_cmd)
 int mflash_init_drivers(struct command_context *cmd_ctx)
 {
        if (mflash_bank) {
-               register_command(cmd_ctx, mflash_cmd, "probe", mg_probe_cmd, COMMAND_EXEC, NULL);
-               register_command(cmd_ctx, mflash_cmd, "write", mg_write_cmd, COMMAND_EXEC,
+               COMMAND_REGISTER(cmd_ctx, mflash_cmd, "probe", mg_probe_cmd, COMMAND_EXEC, NULL);
+               COMMAND_REGISTER(cmd_ctx, mflash_cmd, "write", mg_write_cmd, COMMAND_EXEC,
                                "mflash write <num> <file> <address>");
-               register_command(cmd_ctx, mflash_cmd, "dump", mg_dump_cmd, COMMAND_EXEC,
+               COMMAND_REGISTER(cmd_ctx, mflash_cmd, "dump", mg_dump_cmd, COMMAND_EXEC,
                                                "mflash dump <num> <file> <address> <size>");
-               register_command(cmd_ctx, mflash_cmd, "config", mg_config_cmd,
+               COMMAND_REGISTER(cmd_ctx, mflash_cmd, "config", mg_config_cmd,
                                COMMAND_EXEC, "mflash config <num> <stage>");
        }
 
@@ -1286,35 +1288,35 @@ COMMAND_HANDLER(mg_bank_cmd)
        struct target *target;
        int i;
 
-       if (argc < 4)
+       if (CMD_ARGC < 4)
        {
                return ERROR_COMMAND_SYNTAX_ERROR;
        }
 
-       if ((target = get_target(args[3])) == NULL)
+       if ((target = get_target(CMD_ARGV[3])) == NULL)
        {
-               LOG_ERROR("target '%s' not defined", args[3]);
+               LOG_ERROR("target '%s' not defined", CMD_ARGV[3]);
                return ERROR_FAIL;
        }
 
        mflash_bank = calloc(sizeof(struct mflash_bank), 1);
-       COMMAND_PARSE_NUMBER(u32, args[1], mflash_bank->base);
+       COMMAND_PARSE_NUMBER(u32, CMD_ARGV[1], mflash_bank->base);
        /// @todo Verify how this parsing should work, then document it.
        char *str;
-       mflash_bank->rst_pin.num = strtoul(args[2], &str, 0);
+       mflash_bank->rst_pin.num = strtoul(CMD_ARGV[2], &str, 0);
        if (*str)
                mflash_bank->rst_pin.port[0] = (uint16_t)tolower(str[0]);
 
        mflash_bank->target = target;
 
        for (i = 0; mflash_gpio[i] ; i++) {
-               if (! strcmp(mflash_gpio[i]->name, args[0])) {
+               if (! strcmp(mflash_gpio[i]->name, CMD_ARGV[0])) {
                        mflash_bank->gpio_drv = mflash_gpio[i];
                }
        }
 
        if (! mflash_bank->gpio_drv) {
-               LOG_ERROR("%s is unsupported soc", args[0]);
+               LOG_ERROR("%s is unsupported soc", CMD_ARGV[0]);
                return ERROR_MG_UNSUPPORTED_SOC;
        }
 
@@ -1323,8 +1325,8 @@ COMMAND_HANDLER(mg_bank_cmd)
 
 int mflash_register_commands(struct command_context *cmd_ctx)
 {
-       mflash_cmd = register_command(cmd_ctx, NULL, "mflash", NULL, COMMAND_ANY, NULL);
-       register_command(cmd_ctx, mflash_cmd, "bank", mg_bank_cmd, COMMAND_CONFIG,
+       mflash_cmd = COMMAND_REGISTER(cmd_ctx, NULL, "mflash", NULL, COMMAND_ANY, NULL);
+       COMMAND_REGISTER(cmd_ctx, mflash_cmd, "bank", mg_bank_cmd, COMMAND_CONFIG,
                        "mflash bank <soc> <base> <RST pin> <target #>");
        return ERROR_OK;
 }
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)