X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fflash%2Fmflash.c;h=4a3f8fe21fade48d580813959235ac2ac3c07d40;hb=0c2f8b6eb8f4b379aa0c78caba73ec1ebaae8414;hp=26b85b1fb3105357a732109b8c7d690d480dc677;hpb=f6a3fc818bc6a24b6c5bbcc6057f72d2b0b2e2ab;p=fw%2Fopenocd

diff --git a/src/flash/mflash.c b/src/flash/mflash.c
index 26b85b1fb..4a3f8fe21 100644
--- 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);
@@ -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);
@@ -1380,6 +1386,7 @@ static const struct command_registration mflash_config_command_handlers[] = {
 		.mode = COMMAND_CONFIG,
 		.handler = handle_mflash_init_command,
 		.help = "initialize mflash devices",
+		.usage = ""
 	},
 	COMMAND_REGISTRATION_DONE
 };
@@ -1388,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