Merge pull request stlink-org#207 from jimparis/master

texane · texane · commit c84d8faf38e1 · 2014-01-31T22:35:47.000-08:00
When ignoring the end of a file, make sure we don't ignore partial words.
diff --git a/src/stlink-common.c b/src/stlink-common.c
@@ -1752,8 +1752,10 @@ int stlink_fwrite_flash(stlink_t *sl, const char* path, stm32_addr_t addr) {
 	else
 	    num_empty = 0;
     }
+    /* Round down to words */
+    num_empty -= (num_empty & 3);
     if(num_empty != 0) {
-	ILOG("Ignoring %d bytes of Zeros at end of file\n",num_empty);
+	ILOG("Ignoring %d bytes of 0x%02x at end of file\n", num_empty, erased_pattern);
 	mf.len -= num_empty;
     }
     err = stlink_write_flash(sl, addr, mf.base, mf.len);

Original file line number	Diff line number	Diff line change
`@@ -1752,8 +1752,10 @@ int stlink_fwrite_flash(stlink_t sl, const char path, stm32_addr_t addr) {`
`1752`	`1752`	`else`
`1753`	`1753`	`num_empty = 0;`
`1754`	`1754`	`}`
	`1755`	`+ /* Round down to words */`
	`1756`	`+ num_empty -= (num_empty & 3);`
`1755`	`1757`	`if(num_empty != 0) {`
`1756`		`- ILOG("Ignoring %d bytes of Zeros at end of file\n",num_empty);`
	`1758`	`+ ILOG("Ignoring %d bytes of 0x%02x at end of file\n", num_empty, erased_pattern);`
`1757`	`1759`	`mf.len -= num_empty;`
`1758`	`1760`	`}`
`1759`	`1761`	`err = stlink_write_flash(sl, addr, mf.base, mf.len);`