X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fflash%2Fnor%2Fatsamv.c;h=a64c2b4cc64be4f428fec7001aef54eb96c1f1dd;hb=28c24a5c41c47a66e9310912f88148814f730a25;hp=13d1d263f852790347a43953c149dd37bd83d6d4;hpb=ef14384b681af4f731f768bb866457832af6925f;p=openocd.git

diff --git a/src/flash/nor/atsamv.c b/src/flash/nor/atsamv.c
index 13d1d263f8..a64c2b4cc6 100644
--- a/src/flash/nor/atsamv.c
+++ b/src/flash/nor/atsamv.c
@@ -25,7 +25,7 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
-/* Some of the the lower level code was based on code supplied by
+/* Some of the lower level code was based on code supplied by
  * ATMEL under this copyright. */
 
 /* BEGIN ATMEL COPYRIGHT */
@@ -97,7 +97,7 @@
 extern const struct flash_driver atsamv_flash;
 
 struct samv_flash_bank {
-	int      probed;
+	bool      probed;
 	unsigned size_bytes;
 	unsigned gpnvm[SAMV_NUM_GPNVM_BITS];
 };
@@ -379,7 +379,7 @@ static int samv_probe(struct flash_bank *bank)
 
 	struct samv_flash_bank *samv_info = bank->driver_priv;
 	samv_info->size_bytes = bank->size;
-	samv_info->probed = 1;
+	samv_info->probed = true;
 
 	bank->base = SAMV_FLASH_BASE;
 	bank->num_sectors = bank->size / SAMV_SECTOR_SIZE;
@@ -607,15 +607,15 @@ static int samv_write(struct flash_bank *bank, const uint8_t *buffer,
 	return ERROR_OK;
 }
 
-static int samv_get_info(struct flash_bank *bank, char *buf, int buf_size)
+static int samv_get_info(struct flash_bank *bank, struct command_invocation *cmd)
 {
 	struct samv_flash_bank *samv_info = bank->driver_priv;
 	if (!samv_info->probed) {
 		int r = samv_probe(bank);
-		if (ERROR_OK != r)
+		if (r != ERROR_OK)
 			return r;
 	}
-	snprintf(buf, buf_size, "Cortex-M7 detected with %d kB flash",
+	command_print_sameline(cmd, "Cortex-M7 detected with %" PRIu32 " kB flash\n",
 			bank->size / 1024);
 	return ERROR_OK;
 }
@@ -661,7 +661,7 @@ COMMAND_HANDLER(samv_handle_gpnvm_command)
 			return ERROR_COMMAND_SYNTAX_ERROR;
 	}
 
-	uint32_t v;
+	unsigned v;
 	if (!strcmp("show", CMD_ARGV[0])) {
 		if (who == -1) {
 showall:
@@ -676,6 +676,9 @@ showall:
 		}
 		if ((who >= 0) && (((unsigned)who) < SAMV_NUM_GPNVM_BITS)) {
 			r = samv_get_gpnvm(target, who, &v);
+			if (r != ERROR_OK)
+				return r;
+
 			command_print(CMD, "samv-gpnvm%u: %u", who, v);
 			return r;
 		} else {