X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fflash%2Fdavinci_nand.c;h=b6210b8fdffc623468f37917538556dc1070e3b5;hb=fb50efc6e712f413d109c3d77683d0358a557ed4;hp=41c2b20ab1f399f43e164efd8e6adbac96412b17;hpb=a89dd2ca6542d157890656d918d6ae2f933ab401;p=openocd

diff --git a/src/flash/davinci_nand.c b/src/flash/davinci_nand.c
index 41c2b20a..b6210b8f 100644
--- a/src/flash/davinci_nand.c
+++ b/src/flash/davinci_nand.c
@@ -638,7 +638,6 @@ static int davinci_nand_device_command(struct command_context_s *cmd_ctx,
 	unsigned long chip, aemif;
 	enum ecc eccmode;
 	int chipsel;
-	char *ep;
 
 	/* arguments:
 	 *  - "davinci"
@@ -661,8 +660,8 @@ static int davinci_nand_device_command(struct command_context_s *cmd_ctx,
 		goto fail;
 	}
 
-	chip = strtoul(argv[2], &ep, 0);
-	if (*ep || chip == 0 || chip == ULONG_MAX) {
+	COMMAND_PARSE_NUMBER(ulong, argv[2], chip);
+	if (chip == 0) {
 		LOG_ERROR("Invalid NAND chip address %s", argv[2]);
 		goto fail;
 	}
@@ -678,8 +677,8 @@ static int davinci_nand_device_command(struct command_context_s *cmd_ctx,
 		goto fail;
 	}
 
-	aemif = strtoul(argv[4], &ep, 0);
-	if (*ep || aemif == 0 || aemif == ULONG_MAX) {
+	COMMAND_PARSE_NUMBER(ulong, argv[4], aemif);
+	if (aemif == 0) {
 		LOG_ERROR("Invalid AEMIF controller address %s", argv[4]);
 		goto fail;
 	}