ARMv7-M: make DAP commands verify target is an ARMv7-M

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

diff --git a/src/flash/mflash.c b/src/flash/mflash.c
index 63e71db1cc26b4538f98db5df478bc5d603247ef..289fe5ebb6af0e8a8e0e891ead178bae85fe8d3f 100644 (file)
--- a/src/flash/mflash.c
+++ b/src/flash/mflash.c
@@ -22,7 +22,7 @@
 #endif
 
 #include "mflash.h"
-#include "target.h"
+#include <target/target.h>
 #include <helper/time_support.h>
 #include <helper/fileio.h>
 #include <helper/log.h>
@@ -342,7 +342,8 @@ static int mg_dsk_drv_info(void)
        if ((ret =  mg_dsk_io_cmd(0, 1, mg_io_cmd_identify)) != ERROR_OK)
                return ret;
 
-       if ((ret = mg_dsk_wait(mg_io_wait_drq, MG_OEM_DISK_WAIT_TIME_NORMAL)) != ERROR_OK)
+       ret = mg_dsk_wait(mg_io_wait_drq, MG_OEM_DISK_WAIT_TIME_NORMAL);
+       if (ret != ERROR_OK)
                return ret;
 
        LOG_INFO("mflash: read drive info");
@@ -350,7 +351,8 @@ static int mg_dsk_drv_info(void)
        if (! mflash_bank->drv_info)
                mflash_bank->drv_info = malloc(sizeof(struct mg_drv_info));
 
-       target_read_memory(target, mg_buff, 2, sizeof(mg_io_type_drv_info) >> 1,
+       ret = target_read_memory(target, mg_buff, 2,
+                       sizeof(mg_io_type_drv_info) >> 1,
                        (uint8_t *)&mflash_bank->drv_info->drv_id);
        if (ret != ERROR_OK)
                return ret;
@@ -749,8 +751,8 @@ COMMAND_HANDLER(mg_write_cmd)
 
        if (duration_measure(&bench) == ERROR_OK)
        {
-               command_print(CMD_CTX, "wrote %zu byte from file %s "
-                               "in %fs (%0.3f kB/s)", fileio.size, CMD_ARGV[1],
+               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));
        }
 
@@ -760,7 +762,7 @@ COMMAND_HANDLER(mg_write_cmd)
        return ERROR_OK;
 
 mg_write_cmd_err:
-       free(buffer);
+       free(buffer);
        fileio_close(&fileio);
 
        return ret;
@@ -827,7 +829,7 @@ COMMAND_HANDLER(mg_dump_cmd)
        return ERROR_OK;
 
 mg_dump_cmd_err:
-       free(buffer);
+       free(buffer);
        fileio_close(&fileio);
 
        return ret;
@@ -1269,30 +1271,33 @@ 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
 };
@@ -1343,7 +1348,8 @@ COMMAND_HANDLER(mg_bank_cmd)
        char *str;
        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->rst_pin.port[0] = (uint16_t)
+                               tolower((unsigned)str[0]);
 
        mflash_bank->target = target;
 
@@ -1364,15 +1370,15 @@ 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",
        },
        COMMAND_REGISTRATION_DONE