From: Eric Wetzel <thewetzel@gmail.com>
Date: Thu, 26 Nov 2009 15:54:45 +0000 (-0800)
Subject: fix 'flash protect' and 'flash erase_sector'
X-Git-Tag: v0.4.0-rc1~318
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=3f8aa3cb035a97988fd38dfb08db5a4224f4b591;p=openocd

fix 'flash protect' and 'flash erase_sector'

Command upgrading introduced two off-by-one bugs in the flash commands.
This patch fixes the 'flash {protect,erase_sector}' commands to check
that they have been passed the correct number of arguments.

Ammended during commit to fix help text for 'erase_address' too.
---

diff --git a/src/flash/flash.c b/src/flash/flash.c
index bbdbaa8d..7023ef97 100644
--- a/src/flash/flash.c
+++ b/src/flash/flash.c
@@ -559,7 +559,7 @@ static int flash_check_sector_parameters(struct command_context *cmd_ctx,
 
 COMMAND_HANDLER(handle_flash_erase_command)
 {
-	if (CMD_ARGC != 2)
+	if (CMD_ARGC != 3)
 		return ERROR_COMMAND_SYNTAX_ERROR;
 
 	uint32_t bank_nr;
@@ -599,7 +599,7 @@ COMMAND_HANDLER(handle_flash_erase_command)
 
 COMMAND_HANDLER(handle_flash_protect_command)
 {
-	if (CMD_ARGC != 3)
+	if (CMD_ARGC != 4)
 		return ERROR_COMMAND_SYNTAX_ERROR;
 
 	uint32_t bank_nr;
@@ -1316,7 +1316,7 @@ static const struct command_registration flash_exec_command_handlers[] = {
 		.name = "erase_address",
 		.handler = &handle_flash_erase_address_command,
 		.mode = COMMAND_EXEC,
-		.usage = "<bank> <address> <length>",
+		.usage = "<address> <length>",
 		.help = "erase address range",
 
 	},