cmd: add missing usage vars

[fw/openocd] / src / flash / mflash.c

diff --git a/src/flash/mflash.c b/src/flash/mflash.c
index 04f5c7751ab3455b4e636bd3abf4153b1345d934..4a3f8fe21fade48d580813959235ac2ac3c07d40 100644 (file)
--- a/src/flash/mflash.c
+++ b/src/flash/mflash.c
@@ -141,7 +141,7 @@ static int s3c2440_set_gpio_to_output (struct mflash_gpio_num gpio)
                gpio_con = S3C2440_GPJCON;
        } else {
                LOG_ERROR("mflash: invalid port %d%s", gpio.num, gpio.port);
-               return ERROR_INVALID_ARGUMENTS;
+               return ERROR_COMMAND_SYNTAX_ERROR;
        }
 
        ret = target_read_u32(target, gpio_con, &data);
@@ -173,7 +173,7 @@ static int s3c2440_set_gpio_output_val (struct mflash_gpio_num gpio, uint8_t val
                gpio_dat = S3C2440_GPJDAT;
        } else {
                LOG_ERROR("mflash: invalid port %d%s", gpio.num, gpio.port);
-               return ERROR_INVALID_ARGUMENTS;
+               return ERROR_COMMAND_SYNTAX_ERROR;
        }
 
        ret = target_read_u32(target, gpio_dat, &data);
@@ -209,7 +209,7 @@ static int mg_init_gpio (void)
        return ret;
 }
 
-static int mg_dsk_wait(mg_io_type_wait wait, uint32_t time)
+static int mg_dsk_wait(mg_io_type_wait wait_local, uint32_t time_var)
 {
        uint8_t status, error;
        struct target *target = mflash_bank->target;
@@ -220,7 +220,7 @@ static int mg_dsk_wait(mg_io_type_wait wait, uint32_t time)
        struct duration bench;
        duration_start(&bench);
 
-       while (time) {
+       while (time_var) {
 
                ret = target_read_u8(target, mg_task_reg + MG_REG_STATUS, &status);
                if (ret != ERROR_OK)
@@ -228,10 +228,10 @@ static int mg_dsk_wait(mg_io_type_wait wait, uint32_t time)
 
                if (status & mg_io_rbit_status_busy)
                {
-                       if (wait == mg_io_wait_bsy)
+                       if (wait_local == mg_io_wait_bsy)
                                return ERROR_OK;
                } else {
-                       switch (wait)
+                       switch (wait_local)
                        {
                                case mg_io_wait_not_bsy:
                                        return ERROR_OK;
@@ -259,7 +259,7 @@ static int mg_dsk_wait(mg_io_type_wait wait, uint32_t time)
                                return ERROR_MG_IO;
                        }
 
-                       switch (wait)
+                       switch (wait_local)
                        {
                                case mg_io_wait_rdy:
                                        if (status & mg_io_rbit_status_ready)
@@ -280,7 +280,7 @@ static int mg_dsk_wait(mg_io_type_wait wait, uint32_t time)
                else
                        LOG_ERROR("mflash: duration measurement failed: %d", ret);
 
-               if (t > time)
+               if (t > time_var)
                        break;
        }
 
@@ -720,14 +720,20 @@ COMMAND_HANDLER(mg_write_cmd)
        if (ret != ERROR_OK)
                return ret;
 
+       int filesize;
        buffer = malloc(MG_FILEIO_CHUNK);
        if (!buffer) {
                fileio_close(&fileio);
                return ERROR_FAIL;
        }
+       int retval = fileio_size(&fileio, &filesize);
+       if (retval != ERROR_OK) {
+               fileio_close(&fileio);
+               return retval;
+       }
 
-       cnt = fileio.size / MG_FILEIO_CHUNK;
-       res = fileio.size % MG_FILEIO_CHUNK;
+       cnt = filesize / MG_FILEIO_CHUNK;
+       res = filesize % MG_FILEIO_CHUNK;
 
        struct duration bench;
        duration_start(&bench);
@@ -752,8 +758,8 @@ COMMAND_HANDLER(mg_write_cmd)
        if (duration_measure(&bench) == ERROR_OK)
        {
                command_print(CMD_CTX, "wrote %ld bytes from file %s "
-                               "in %fs (%0.3f kB/s)", (long)fileio.size, CMD_ARGV[1],
-                               duration_elapsed(&bench), duration_kbps(&bench, fileio.size));
+                               "in %fs (%0.3f kB/s)", (long)filesize, CMD_ARGV[1],
+                               duration_elapsed(&bench), duration_kbps(&bench, filesize));
        }
 
        free(buffer);
@@ -762,7 +768,7 @@ COMMAND_HANDLER(mg_write_cmd)
        return ERROR_OK;
 
 mg_write_cmd_err:
-       free(buffer);
+       free(buffer);
        fileio_close(&fileio);
 
        return ret;
@@ -829,7 +835,7 @@ COMMAND_HANDLER(mg_dump_cmd)
        return ERROR_OK;
 
 mg_dump_cmd_err:
-       free(buffer);
+       free(buffer);
        fileio_close(&fileio);
 
        return ret;
@@ -1121,7 +1127,7 @@ static int mg_storage_config(void)
                        != ERROR_OK)
                return ret;
 
-       mg_gen_ataid((mg_io_type_drv_info *)buff);
+       mg_gen_ataid((mg_io_type_drv_info *)(void *)buff);
 
        if ((ret = mg_mflash_do_write_sects(buff, 0, 1, mg_vcmd_update_stgdrvinfo))
                        != ERROR_OK)
@@ -1149,7 +1155,7 @@ static int mg_boot_config(void)
        buff[0] = mg_op_mode_snd;               /* operation mode */
        buff[1] = MG_UNLOCK_OTP_AREA;
        buff[2] = 4;                            /* boot size */
-       *((uint32_t *)(buff + 4)) = 0;          /* XIP size */
+       *((uint32_t *)(void *)(buff + 4)) = 0;          /* XIP size */
 
        if ((ret = mg_mflash_do_write_sects(buff, 0, 1, mg_vcmd_update_xipinfo))
                        != ERROR_OK)
@@ -1271,35 +1277,38 @@ COMMAND_HANDLER(mg_config_cmd)
 static const struct command_registration mflash_exec_command_handlers[] = {
        {
                .name = "probe",
-               .handler = &mg_probe_cmd,
+               .handler = mg_probe_cmd,
                .mode = COMMAND_EXEC,
                .help = "Detect bank configuration information",
        },
        {
                .name = "write",
-               .handler = &mg_write_cmd,
+               .handler = mg_write_cmd,
                .mode = COMMAND_EXEC,
-               .usage = "<num> <file> <address>",
-               .help = "Write a file at the specified address",
+               /* FIXME bank_num is unused */
+               .usage = "bank_num filename address",
+               .help = "Write binary file at the specified address.",
        },
        {
                .name = "dump",
-               .handler = &mg_dump_cmd,
+               .handler = mg_dump_cmd,
                .mode = COMMAND_EXEC,
-               .usage = "<num> <file> <address> <size>",
-               .help = "Dump to a file from the specified address",
+               /* FIXME bank_num is unused */
+               .usage = "bank_num filename address size",
+               .help = "Write specified number of bytes from a binary file "
+                       "to the specified, address.",
        },
        {
                .name = "config",
-               .handler = &mg_config_cmd,
+               .handler = mg_config_cmd,
                .mode = COMMAND_EXEC,
-               .usage = "<num> <stage>",
-               .help = "Dump to a file from the specified address",
+               .help = "Configure MFLASH options.",
+               .usage = "('boot'|'storage'|'pll' frequency)",
        },
        COMMAND_REGISTRATION_DONE
 };
 
-int mflash_init_drivers(struct command_context *cmd_ctx)
+static int mflash_init_drivers(struct command_context *cmd_ctx)
 {
        if (!mflash_bank)
                return ERROR_OK;
@@ -1367,16 +1376,17 @@ COMMAND_HANDLER(mg_bank_cmd)
 static const struct command_registration mflash_config_command_handlers[] = {
        {
                .name = "bank",
-               .handler = &mg_bank_cmd,
+               .handler = mg_bank_cmd,
                .mode = COMMAND_CONFIG,
                .help = "configure a mflash device bank",
-               .usage = "<soc> <base> <RST pin> <target #>",
+               .usage = "soc_type base_addr pin_id target",
        },
        {
                .name = "init",
                .mode = COMMAND_CONFIG,
-               .handler = &handle_mflash_init_command,
+               .handler = handle_mflash_init_command,
                .help = "initialize mflash devices",
+               .usage = ""
        },
        COMMAND_REGISTRATION_DONE
 };
@@ -1385,6 +1395,7 @@ static const struct command_registration mflash_command_handler[] = {
                .name = "mflash",
                .mode = COMMAND_ANY,
                .help = "mflash command group",
+               .usage = "",
                .chain = mflash_config_command_handlers,
        },
        COMMAND_REGISTRATION_DONE