X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fflash%2Fmflash.c;h=6aeeabc670bd8f1367072d57155860eeff23cb82;hp=029178d12c7bd67a21f5b1d5be26c87046d722b0;hb=7bf1a86e473a12882bf6f71cb4d0d416394b69d4;hpb=98723c4ecdbe06f90c66f3abec27b792c3b38e34

diff --git a/src/flash/mflash.c b/src/flash/mflash.c
index 029178d12c..6aeeabc670 100644
--- a/src/flash/mflash.c
+++ b/src/flash/mflash.c
@@ -22,6 +22,7 @@
 #endif
 
 #include "mflash.h"
+#include "target.h"
 #include "time_support.h"
 #include "fileio.h"
 #include "log.h"
@@ -32,7 +33,7 @@ static int s3c2440_set_gpio_output_val (struct mflash_gpio_num gpio, uint8_t val
 static int pxa270_set_gpio_to_output (struct mflash_gpio_num gpio);
 static int pxa270_set_gpio_output_val (struct mflash_gpio_num gpio, uint8_t val);
 
-static command_t *mflash_cmd;
+static struct command *mflash_cmd;
 
 static struct mflash_bank *mflash_bank;
 
@@ -704,12 +705,12 @@ 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;
 	}
 
@@ -731,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)
@@ -749,7 +751,7 @@ COMMAND_HANDLER(mg_write_cmd)
 
 	if (duration_measure(&bench) == ERROR_OK)
 	{
-		command_print(cmd_ctx, "wrote %lli byte from file %s "
+		command_print(cmd_ctx, "wrote %zu byte from file %s "
 				"in %fs (%0.3f kB/s)", fileio.size, args[1],
 				duration_elapsed(&bench), duration_kbps(&bench, fileio.size));
 	}
@@ -768,12 +770,12 @@ 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;
 	}
 
@@ -796,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;
@@ -1220,7 +1223,7 @@ 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"))
 				return mg_boot_config();
@@ -1285,7 +1288,7 @@ COMMAND_HANDLER(mg_bank_cmd)
 	struct target *target;
 	int i;
 
-	if (argc < 4)
+	if (CMD_ARGC < 4)
 	{
 		return ERROR_COMMAND_SYNTAX_ERROR;
 	}