X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fflash%2Fnand.c;h=9231b9adaa69b28963346e9e794d56d325d2b70c;hp=46ac72867f5cb4f96c99fe6b7963473d5b435956;hb=7bf1a86e473a12882bf6f71cb4d0d416394b69d4;hpb=555757175eb344d11f3c0123f2f83460ef6ca67b

diff --git a/src/flash/nand.c b/src/flash/nand.c
index 46ac72867f..9231b9adaa 100644
--- a/src/flash/nand.c
+++ b/src/flash/nand.c
@@ -210,7 +210,7 @@ COMMAND_HANDLER(handle_nand_device_command)
 	int i;
 	int retval;
 
-	if (argc < 1)
+	if (CMD_ARGC < 1)
 	{
 		LOG_WARNING("incomplete flash device nand configuration");
 		return ERROR_FLASH_BANK_INVALID;
@@ -304,9 +304,10 @@ struct nand_device *get_nand_device_by_num(int num)
 	return NULL;
 }
 
-int nand_command_get_device_by_num(struct command_context *cmd_ctx,
-		const char *str, struct nand_device **nand)
+COMMAND_HELPER(nand_command_get_device_by_num, unsigned name_index,
+		struct nand_device **nand)
 {
+	const char *str = args[name_index];
 	unsigned num;
 	COMMAND_PARSE_NUMBER(uint, str, num);
 	*nand = get_nand_device_by_num(num);
@@ -1077,11 +1078,11 @@ COMMAND_HANDLER(handle_nand_info_command)
 	int last = -1;
 
 	struct nand_device *p;
-	int retval = nand_command_get_device_by_num(cmd_ctx, args[0], &p);
+	int retval = CALL_COMMAND_HANDLER(nand_command_get_device_by_num, 0, &p);
 	if (ERROR_OK != retval)
 		return retval;
 
-	switch (argc) {
+	switch (CMD_ARGC) {
 	default:
 		return ERROR_COMMAND_SYNTAX_ERROR;
 	case 1:
@@ -1146,13 +1147,13 @@ COMMAND_HANDLER(handle_nand_info_command)
 
 COMMAND_HANDLER(handle_nand_probe_command)
 {
-	if (argc != 1)
+	if (CMD_ARGC != 1)
 	{
 		return ERROR_COMMAND_SYNTAX_ERROR;
 	}
 
 	struct nand_device *p;
-	int retval = nand_command_get_device_by_num(cmd_ctx, args[0], &p);
+	int retval = CALL_COMMAND_HANDLER(nand_command_get_device_by_num, 0, &p);
 	if (ERROR_OK != retval)
 		return retval;
 
@@ -1174,14 +1175,14 @@ COMMAND_HANDLER(handle_nand_probe_command)
 
 COMMAND_HANDLER(handle_nand_erase_command)
 {
-	if (argc != 1 && argc != 3)
+	if (CMD_ARGC != 1 && CMD_ARGC != 3)
 	{
 		return ERROR_COMMAND_SYNTAX_ERROR;
 
 	}
 
 	struct nand_device *p;
-	int retval = nand_command_get_device_by_num(cmd_ctx, args[0], &p);
+	int retval = CALL_COMMAND_HANDLER(nand_command_get_device_by_num, 0, &p);
 	if (ERROR_OK != retval)
 		return retval;
 
@@ -1189,7 +1190,7 @@ COMMAND_HANDLER(handle_nand_erase_command)
 	unsigned long length;
 
 	/* erase specified part of the chip; or else everything */
-	if (argc == 3) {
+	if (CMD_ARGC == 3) {
 		unsigned long size = p->erase_size * p->num_blocks;
 
 		COMMAND_PARSE_NUMBER(ulong, args[1], offset);
@@ -1233,18 +1234,18 @@ COMMAND_HANDLER(handle_nand_check_bad_blocks_command)
 	int first = -1;
 	int last = -1;
 
-	if ((argc < 1) || (argc > 3) || (argc == 2))
+	if ((CMD_ARGC < 1) || (CMD_ARGC > 3) || (CMD_ARGC == 2))
 	{
 		return ERROR_COMMAND_SYNTAX_ERROR;
 
 	}
 
 	struct nand_device *p;
-	int retval = nand_command_get_device_by_num(cmd_ctx, args[0], &p);
+	int retval = CALL_COMMAND_HANDLER(nand_command_get_device_by_num, 0, &p);
 	if (ERROR_OK != retval)
 		return retval;
 
-	if (argc == 3)
+	if (CMD_ARGC == 3)
 	{
 		unsigned long offset;
 		unsigned long length;
@@ -1388,11 +1389,11 @@ static COMMAND_HELPER(nand_fileio_parse_args, struct nand_fileio_state *state,
 	nand_fileio_init(state);
 
 	unsigned minargs = need_size ? 4 : 3;
-	if (argc < minargs)
+	if (CMD_ARGC < minargs)
 		return ERROR_COMMAND_SYNTAX_ERROR;
 
 	struct nand_device *nand;
-	int retval = nand_command_get_device_by_num(cmd_ctx, args[0], &nand);
+	int retval = CALL_COMMAND_HANDLER(nand_command_get_device_by_num, 0, &nand);
 	if (ERROR_OK != retval)
 		return retval;
 
@@ -1413,9 +1414,9 @@ static COMMAND_HELPER(nand_fileio_parse_args, struct nand_fileio_state *state,
 			}
 	}
 
-	if (argc > minargs)
+	if (CMD_ARGC > minargs)
 	{
-		for (unsigned i = minargs; i < argc; i++)
+		for (unsigned i = minargs; i < CMD_ARGC; i++)
 		{
 			if (!strcmp(args[i], "oob_raw"))
 				state->oob_format |= NAND_OOB_RAW;
@@ -1452,8 +1453,8 @@ static COMMAND_HELPER(nand_fileio_parse_args, struct nand_fileio_state *state,
 static int nand_fileio_read(struct nand_device *nand,
 		struct nand_fileio_state *s)
 {
-	uint32_t total_read = 0;
-	uint32_t one_read;
+	size_t total_read = 0;
+	size_t one_read;
 
 	if (NULL != s->page)
 	{
@@ -1615,7 +1616,7 @@ COMMAND_HANDLER(handle_nand_dump_command)
 
 	while (s.size > 0)
 	{
-		uint32_t size_written;
+		size_t size_written;
 		int retval = nand_read_page(nand, s.address / nand->page_size,
 				s.page, s.page_size, s.oob, s.oob_size);
 		if (ERROR_OK != retval)
@@ -1636,7 +1637,7 @@ COMMAND_HANDLER(handle_nand_dump_command)
 
 	if (nand_fileio_finish(&s) == ERROR_OK)
 	{
-		command_print(cmd_ctx, "dumped %lld byte in %fs (%0.3f kb/s)", 
+		command_print(cmd_ctx, "dumped %zu bytes in %fs (%0.3f kb/s)", 
 				s.fileio.size, duration_elapsed(&s.bench),
 				duration_kbps(&s.bench, s.fileio.size));
 	}
@@ -1645,13 +1646,13 @@ COMMAND_HANDLER(handle_nand_dump_command)
 
 COMMAND_HANDLER(handle_nand_raw_access_command)
 {
-	if ((argc < 1) || (argc > 2))
+	if ((CMD_ARGC < 1) || (CMD_ARGC > 2))
 	{
 		return ERROR_COMMAND_SYNTAX_ERROR;
 	}
 
 	struct nand_device *p;
-	int retval = nand_command_get_device_by_num(cmd_ctx, args[0], &p);
+	int retval = CALL_COMMAND_HANDLER(nand_command_get_device_by_num, 0, &p);
 	if (ERROR_OK != retval)
 		return retval;
 
@@ -1661,7 +1662,7 @@ COMMAND_HANDLER(handle_nand_raw_access_command)
 		return ERROR_OK;
 	}
 
-	if (argc == 2)
+	if (CMD_ARGC == 2)
 	{
 		if (strcmp("enable", args[1]) == 0)
 			p->use_raw = 1;