From 7bb058c7bae484b7dfb75cee80e21f0c4749177e Mon Sep 17 00:00:00 2001
From: Daniel Beer <dlbeer@gmail.com>
Date: Tue, 26 Mar 2013 10:19:31 +1300
Subject: [PATCH] Add "erase segrange" for erasing contiguous sets of segments.

---
 mspdebug.man |  5 +++--
 ui/cmddb.c   |  4 +++-
 ui/devcmd.c  | 46 ++++++++++++++++++++++++++++++++++++++++++++--
 3 files changed, 50 insertions(+), 5 deletions(-)

diff --git a/mspdebug.man b/mspdebug.man
index ac0407c..dbbff05 100644
--- a/mspdebug.man
+++ b/mspdebug.man
@@ -237,14 +237,15 @@ translated into \fIsymbol\fR+\fIoffset\fR form.
 
 This command supports repeat execution. If repeated, it continues to
 disassemble another block of memory following that last printed.
-.IP "\fBerase\fR [\fBall\fR|\fBsegment\fR] [\fIaddress\fR]"
+.IP "\fBerase\fR [\fBall\fR|\fBsegment\fR|\fBsegrange\fR] [\fIaddress\fR] [\fIsize\fR] [\fIsegrange\fR]"
 Erase the device under test. With no arguments, all code memory is erased
 (but not information or boot memory). With the argument "all", a mass
 erase is performed (the results may depend on the state of the LOCKA
 bit in the flash memory controller).
 
 Specify "segment" and a memory address to erase an individual flash
-segment.
+segment. Specify "segrange", an address, size and segment size to erase
+an arbitrary set of contiguous segments.
 .IP "\fBexit\fR"
 Exit from MSPDebug.
 .IP "\fBfill\fR \fIaddress\fR \fIlength\fR \fIb0\fR [\fIb1\fR \fIb2\fR ...]
diff --git a/ui/cmddb.c b/ui/cmddb.c
index 21c2b46..645e1a6 100644
--- a/ui/cmddb.c
+++ b/ui/cmddb.c
@@ -181,9 +181,11 @@ const struct cmddb_record commands[] = {
 		.func = cmd_erase,
 		.help =
 "erase [all|segment] [address]\n"
+"erase segrange <address> <size> <seg-size>\n"
 "    Erase the device under test. With no arguments, erases all of main\n"
 "    memory. Specify arguments to perform a mass erase, or to erase\n"
-"    individual segments.\n"
+"    individual segments. The \"segrange\" mode is used to erase an\n"
+"    address range via a series of segment erases.\n"
 	},
 	{
 		.name = "step",
diff --git a/ui/devcmd.c b/ui/devcmd.c
index d442fa8..21f4d6d 100644
--- a/ui/devcmd.c
+++ b/ui/devcmd.c
@@ -147,6 +147,8 @@ int cmd_erase(char **arg)
 	const char *seg_text = get_arg(arg);
 	device_erase_type_t type = DEVICE_ERASE_MAIN;
 	address_t segment = 0;
+	address_t total_size = 0;
+	address_t segment_size = 0;
 
 	if (seg_text && expr_eval(seg_text, &segment) < 0) {
 		printc_err("erase: invalid expression: %s\n", seg_text);
@@ -163,6 +165,33 @@ int cmd_erase(char **arg)
 					   "address\n");
 				return -1;
 			}
+		} else if (!strcasecmp(type_text, "segrange")) {
+			const char *total_text = get_arg(arg);
+			const char *ss_text = get_arg(arg);
+
+			if (!(total_text && ss_text)) {
+				printc_err("erase: you must specify "
+					   "total and segment sizes\n");
+				return -1;
+			}
+
+			if (expr_eval(total_text, &total_size) < 0) {
+				printc_err("erase: invalid expression: %s\n",
+					   total_text);
+				return -1;
+			}
+
+			if (expr_eval(ss_text, &segment_size) < 0) {
+				printc_err("erase: invalid expression: %s\n",
+					   ss_text);
+				return -1;
+			}
+
+			if (segment_size > 0x200 || segment_size < 0x40) {
+				printc_err("erase: invalid segment size: "
+					   "0x%x\n", segment_size);
+				return -1;
+			}
 		} else {
 			printc_err("erase: unknown erase type: %s\n",
 				    type_text);
@@ -173,8 +202,21 @@ int cmd_erase(char **arg)
 	if (device_ctl(DEVICE_CTL_HALT) < 0)
 		return -1;
 
-	printc("Erasing...\n");
-	return device_erase(type, segment);
+	if (!segment_size) {
+		printc("Erasing...\n");
+		return device_erase(type, segment);
+	} else {
+		printc("Erasing segments...\n");
+		while (total_size >= segment_size) {
+			printc_dbg("Erasing 0x%04x...\n", segment);
+			if (device_erase(DEVICE_ERASE_SEGMENT, segment) < 0)
+				return -1;
+			total_size -= segment_size;
+			segment += segment_size;
+		}
+	}
+
+	return 0;
 }
 
 int cmd_step(char **arg)