X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fflash%2Fnand.c;h=70b14b029a9653109a34c99ce1826d60e0c1102d;hp=ce713b9cd9a7cde34014d4187d0243cd263212ad;hb=59d4466b551e89077e41b0dba21c7a95db9c7b0a;hpb=23402315ce01071f30d7ec0c5ca7563ce41f1cc6

diff --git a/src/flash/nand.c b/src/flash/nand.c
index ce713b9cd9..70b14b029a 100644
--- a/src/flash/nand.c
+++ b/src/flash/nand.c
@@ -25,6 +25,7 @@
 #endif
 
 #include "nand.h"
+#include "common.h"
 #include "time_support.h"
 #include "fileio.h"
 
@@ -203,91 +204,108 @@ static struct nand_ecclayout nand_oob_64 = {
 		 .length = 38}}
 };
 
-/* nand device <nand_controller> [controller options]
- */
-COMMAND_HANDLER(handle_nand_device_command)
+COMMAND_HANDLER(handle_nand_list_drivers)
 {
-	int i;
-	int retval;
+	command_print(CMD_CTX, "Available NAND flash controller drivers:");
+	for (unsigned i = 0; nand_flash_controllers[i]; i++)
+		command_print(CMD_CTX, "  %s", nand_flash_controllers[i]->name);
+	return ERROR_OK;
+}
 
-	if (CMD_ARGC < 1)
+static COMMAND_HELPER(create_nand_device,
+		struct nand_flash_controller *controller)
+{
+	int retval = controller->register_commands(CMD_CTX);
+	if (ERROR_OK != retval)
 	{
-		LOG_WARNING("incomplete flash device nand configuration");
-		return ERROR_FLASH_BANK_INVALID;
+		LOG_ERROR("couldn't register '%s' commands", controller->name);
+		return retval;
 	}
 
-	for (i = 0; nand_flash_controllers[i]; i++)
-	{
-		struct nand_device *p, *c;
+	struct nand_device *c = malloc(sizeof(struct nand_device));
 
-		if (strcmp(CMD_ARGV[0], nand_flash_controllers[i]->name) == 0)
-		{
-			/* register flash specific commands */
-			if ((retval = nand_flash_controllers[i]->register_commands(cmd_ctx)) != ERROR_OK)
-			{
-				LOG_ERROR("couldn't register '%s' commands", CMD_ARGV[0]);
-				return retval;
-			}
-
-			c = malloc(sizeof(struct nand_device));
+	c->controller = controller;
+	c->controller_priv = NULL;
+	c->manufacturer = NULL;
+	c->device = NULL;
+	c->bus_width = 0;
+	c->address_cycles = 0;
+	c->page_size = 0;
+	c->use_raw = 0;
+	c->next = NULL;
 
-			c->controller = nand_flash_controllers[i];
-			c->controller_priv = NULL;
-			c->manufacturer = NULL;
-			c->device = NULL;
-			c->bus_width = 0;
-			c->address_cycles = 0;
-			c->page_size = 0;
-			c->use_raw = 0;
-			c->next = NULL;
+	retval = CALL_COMMAND_HANDLER(controller->nand_device_command, c);
+	if (ERROR_OK != retval)
+	{
+		LOG_ERROR("'%s' driver rejected nand flash", controller->name);
+		free(c);
+		return ERROR_OK;
+	}
 
-			retval = CALL_COMMAND_HANDLER(nand_flash_controllers[i]->nand_device_command, c);
-			if (ERROR_OK != retval)
-			{
-				LOG_ERROR("'%s' driver rejected nand flash", c->controller->name);
-				free(c);
-				return ERROR_OK;
-			}
+	if (nand_devices) {
+		struct nand_device *p = nand_devices;
+		while (p && p->next) p = p->next;
+		p->next = c;
+	} else
+		nand_devices = c;
 
-			/* put NAND device in linked list */
-			if (nand_devices)
-			{
-				/* find last flash device */
-				for (p = nand_devices; p && p->next; p = p->next);
-				if (p)
-					p->next = c;
-			}
-			else
-			{
-				nand_devices = c;
-			}
+	return ERROR_OK;
+}
 
-			return ERROR_OK;
-		}
+COMMAND_HANDLER(handle_nand_device_command)
+{
+	if (CMD_ARGC < 1)
+	{
+		LOG_ERROR("incomplete nand device configuration");
+		return ERROR_FLASH_BANK_INVALID;
 	}
 
-	/* no valid NAND controller was found (i.e. the configuration option,
-	 * didn't match one of the compiled-in controllers)
-	 */
-	LOG_ERROR("No valid NAND flash controller found (%s)", CMD_ARGV[0]);
-	LOG_ERROR("compiled-in NAND flash controllers:");
-	for (i = 0; nand_flash_controllers[i]; i++)
+	const char *driver_name = CMD_ARGV[0];
+	for (unsigned i = 0; nand_flash_controllers[i]; i++)
 	{
-		LOG_ERROR("%i: %s", i, nand_flash_controllers[i]->name);
+		struct nand_flash_controller *controller = nand_flash_controllers[i];
+		if (strcmp(driver_name, controller->name) != 0)
+			continue;
+
+		return CALL_COMMAND_HANDLER(create_nand_device, controller);
 	}
 
-	return ERROR_OK;
+	LOG_ERROR("No valid NAND flash driver found (%s)", driver_name);
+	return CALL_COMMAND_HANDLER(handle_nand_list_drivers);
 }
 
 int nand_register_commands(struct command_context *cmd_ctx)
 {
-	nand_cmd = register_command(cmd_ctx, NULL, "nand", NULL, COMMAND_ANY, "NAND specific commands");
+	nand_cmd = register_command(cmd_ctx, NULL, "nand",
+			NULL, COMMAND_ANY, "NAND specific commands");
 
-	register_command(cmd_ctx, nand_cmd, "device", handle_nand_device_command, COMMAND_CONFIG, NULL);
+	register_command(cmd_ctx, nand_cmd, "device",
+			&handle_nand_device_command, COMMAND_CONFIG,
+			"defines a new NAND bank");
+	register_command(cmd_ctx, nand_cmd, "drivers",
+			&handle_nand_list_drivers, COMMAND_ANY,
+			"lists available NAND drivers");
 
 	return ERROR_OK;
 }
 
+struct nand_device *get_nand_device_by_name(const char *name)
+{
+	unsigned requested = get_flash_name_index(name);
+	unsigned found = 0;
+
+	struct nand_device *nand;
+	for (nand = nand_devices; NULL != nand; nand = nand->next)
+	{
+		if (!flash_driver_name_matches(nand->controller->name, name))
+			continue;
+		if (++found < requested)
+			continue;
+		return nand;
+	}
+	return NULL;
+}
+
 struct nand_device *get_nand_device_by_num(int num)
 {
 	struct nand_device *p;
@@ -304,15 +322,19 @@ struct nand_device *get_nand_device_by_num(int num)
 	return NULL;
 }
 
-COMMAND_HELPER(nand_command_get_device_by_num, unsigned name_index,
+COMMAND_HELPER(nand_command_get_device, unsigned name_index,
 		struct nand_device **nand)
 {
 	const char *str = CMD_ARGV[name_index];
+	*nand = get_nand_device_by_name(str);
+	if (*nand)
+		return ERROR_OK;
+
 	unsigned num;
 	COMMAND_PARSE_NUMBER(uint, str, num);
 	*nand = get_nand_device_by_num(num);
 	if (!*nand) {
-		command_print(cmd_ctx, "NAND flash device '#%s' is out of bounds", str);
+		command_print(CMD_CTX, "NAND flash device '%s' not found", str);
 		return ERROR_INVALID_ARGUMENTS;
 	}
 	return ERROR_OK;
@@ -1050,21 +1072,21 @@ COMMAND_HANDLER(handle_nand_list_command)
 
 	if (!nand_devices)
 	{
-		command_print(cmd_ctx, "no NAND flash devices configured");
+		command_print(CMD_CTX, "no NAND flash devices configured");
 		return ERROR_OK;
 	}
 
 	for (p = nand_devices, i = 0; p; p = p->next, i++)
 	{
 		if (p->device)
-			command_print(cmd_ctx, "#%i: %s (%s) "
+			command_print(CMD_CTX, "#%i: %s (%s) "
 				"pagesize: %i, buswidth: %i,\n\t"
 				"blocksize: %i, blocks: %i",
 				i, p->device->name, p->manufacturer->name,
 				p->page_size, p->bus_width,
 				p->erase_size, p->num_blocks);
 		else
-			command_print(cmd_ctx, "#%i: not probed", i);
+			command_print(CMD_CTX, "#%i: not probed", i);
 	}
 
 	return ERROR_OK;
@@ -1078,7 +1100,7 @@ COMMAND_HANDLER(handle_nand_info_command)
 	int last = -1;
 
 	struct nand_device *p;
-	int retval = CALL_COMMAND_HANDLER(nand_command_get_device_by_num, 0, &p);
+	int retval = CALL_COMMAND_HANDLER(nand_command_get_device, 0, &p);
 	if (ERROR_OK != retval)
 		return retval;
 
@@ -1102,7 +1124,7 @@ COMMAND_HANDLER(handle_nand_info_command)
 
 	if (NULL == p->device)
 	{
-		command_print(cmd_ctx, "#%s: not probed", CMD_ARGV[0]);
+		command_print(CMD_CTX, "#%s: not probed", CMD_ARGV[0]);
 		return ERROR_OK;
 	}
 
@@ -1112,7 +1134,7 @@ COMMAND_HANDLER(handle_nand_info_command)
 	if (last >= p->num_blocks)
 		last = p->num_blocks - 1;
 
-	command_print(cmd_ctx, "#%i: %s (%s) pagesize: %i, buswidth: %i, erasesize: %i",
+	command_print(CMD_CTX, "#%i: %s (%s) pagesize: %i, buswidth: %i, erasesize: %i",
 		i++, p->device->name, p->manufacturer->name, p->page_size, p->bus_width, p->erase_size);
 
 	for (j = first; j <= last; j++)
@@ -1133,7 +1155,7 @@ COMMAND_HANDLER(handle_nand_info_command)
 		else
 			bad_state = " (block condition unknown)";
 
-		command_print(cmd_ctx,
+		command_print(CMD_CTX,
 			      "\t#%i: 0x%8.8" PRIx32 " (%" PRId32 "kB) %s%s",
 			      j,
 			      p->blocks[j].offset,
@@ -1153,21 +1175,21 @@ COMMAND_HANDLER(handle_nand_probe_command)
 	}
 
 	struct nand_device *p;
-	int retval = CALL_COMMAND_HANDLER(nand_command_get_device_by_num, 0, &p);
+	int retval = CALL_COMMAND_HANDLER(nand_command_get_device, 0, &p);
 	if (ERROR_OK != retval)
 		return retval;
 
 	if ((retval = nand_probe(p)) == ERROR_OK)
 	{
-		command_print(cmd_ctx, "NAND flash device '%s' found", p->device->name);
+		command_print(CMD_CTX, "NAND flash device '%s' found", p->device->name);
 	}
 	else if (retval == ERROR_NAND_OPERATION_FAILED)
 	{
-		command_print(cmd_ctx, "probing failed for NAND flash device");
+		command_print(CMD_CTX, "probing failed for NAND flash device");
 	}
 	else
 	{
-		command_print(cmd_ctx, "unknown error when probing NAND flash device");
+		command_print(CMD_CTX, "unknown error when probing NAND flash device");
 	}
 
 	return ERROR_OK;
@@ -1182,7 +1204,7 @@ COMMAND_HANDLER(handle_nand_erase_command)
 	}
 
 	struct nand_device *p;
-	int retval = CALL_COMMAND_HANDLER(nand_command_get_device_by_num, 0, &p);
+	int retval = CALL_COMMAND_HANDLER(nand_command_get_device, 0, &p);
 	if (ERROR_OK != retval)
 		return retval;
 
@@ -1212,18 +1234,18 @@ COMMAND_HANDLER(handle_nand_erase_command)
 	retval = nand_erase(p, offset, offset + length - 1);
 	if (retval == ERROR_OK)
 	{
-		command_print(cmd_ctx, "erased blocks %lu to %lu "
+		command_print(CMD_CTX, "erased blocks %lu to %lu "
 				"on NAND flash device #%s '%s'",
 				offset, offset + length,
 				CMD_ARGV[0], p->device->name);
 	}
 	else if (retval == ERROR_NAND_OPERATION_FAILED)
 	{
-		command_print(cmd_ctx, "erase failed");
+		command_print(CMD_CTX, "erase failed");
 	}
 	else
 	{
-		command_print(cmd_ctx, "unknown error when erasing NAND flash device");
+		command_print(CMD_CTX, "unknown error when erasing NAND flash device");
 	}
 
 	return ERROR_OK;
@@ -1241,7 +1263,7 @@ COMMAND_HANDLER(handle_nand_check_bad_blocks_command)
 	}
 
 	struct nand_device *p;
-	int retval = CALL_COMMAND_HANDLER(nand_command_get_device_by_num, 0, &p);
+	int retval = CALL_COMMAND_HANDLER(nand_command_get_device, 0, &p);
 	if (ERROR_OK != retval)
 		return retval;
 
@@ -1269,17 +1291,17 @@ COMMAND_HANDLER(handle_nand_check_bad_blocks_command)
 	retval = nand_build_bbt(p, first, last);
 	if (retval == ERROR_OK)
 	{
-		command_print(cmd_ctx, "checked NAND flash device for bad blocks, "
+		command_print(CMD_CTX, "checked NAND flash device for bad blocks, "
 				"use \"nand info\" command to list blocks");
 	}
 	else if (retval == ERROR_NAND_OPERATION_FAILED)
 	{
-		command_print(cmd_ctx, "error when checking for bad blocks on "
+		command_print(CMD_CTX, "error when checking for bad blocks on "
 				"NAND flash device");
 	}
 	else
 	{
-		command_print(cmd_ctx, "unknown error when checking for bad "
+		command_print(CMD_CTX, "unknown error when checking for bad "
 				"blocks on NAND flash device");
 	}
 
@@ -1393,23 +1415,23 @@ static COMMAND_HELPER(nand_fileio_parse_args, struct nand_fileio_state *state,
 		return ERROR_COMMAND_SYNTAX_ERROR;
 
 	struct nand_device *nand;
-	int retval = CALL_COMMAND_HANDLER(nand_command_get_device_by_num, 0, &nand);
+	int retval = CALL_COMMAND_HANDLER(nand_command_get_device, 0, &nand);
 	if (ERROR_OK != retval)
 		return retval;
 
 	if (NULL == nand->device)
 	{
-		command_print(cmd_ctx, "#%s: not probed", CMD_ARGV[0]);
+		command_print(CMD_CTX, "#%s: not probed", CMD_ARGV[0]);
 		return ERROR_OK;
 	}
 
 	COMMAND_PARSE_NUMBER(u32, CMD_ARGV[2], state->address);
 	if (need_size)
 	{
-			COMMAND_PARSE_NUMBER(u32, CMD_ARGV[2], state->size);
+			COMMAND_PARSE_NUMBER(u32, CMD_ARGV[3], state->size);
 			if (state->size % nand->page_size)
 			{
-				command_print(cmd_ctx, "only page-aligned sizes are supported");
+				command_print(CMD_CTX, "only page-aligned sizes are supported");
 				return ERROR_COMMAND_SYNTAX_ERROR;
 			}
 	}
@@ -1428,13 +1450,13 @@ static COMMAND_HELPER(nand_fileio_parse_args, struct nand_fileio_state *state,
 				state->oob_format |= NAND_OOB_SW_ECC_KW;
 			else
 			{
-				command_print(cmd_ctx, "unknown option: %s", CMD_ARGV[i]);
+				command_print(CMD_CTX, "unknown option: %s", CMD_ARGV[i]);
 				return ERROR_COMMAND_SYNTAX_ERROR;
 			}
 		}
 	}
 
-	retval = nand_fileio_start(cmd_ctx, nand, CMD_ARGV[1], filemode, state);
+	retval = nand_fileio_start(CMD_CTX, nand, CMD_ARGV[1], filemode, state);
 	if (ERROR_OK != retval)
 		return retval;
 
@@ -1517,7 +1539,7 @@ COMMAND_HANDLER(handle_nand_write_command)
 		int bytes_read = nand_fileio_read(nand, &s);
 		if (bytes_read <= 0)
 		{
-			command_print(cmd_ctx, "error while reading file");
+			command_print(CMD_CTX, "error while reading file");
 			return nand_fileio_cleanup(&s);
 		}
 		s.size -= bytes_read;
@@ -1526,7 +1548,7 @@ COMMAND_HANDLER(handle_nand_write_command)
 				s.page, s.page_size, s.oob, s.oob_size);
 		if (ERROR_OK != retval)
 		{
-			command_print(cmd_ctx, "failed writing file %s "
+			command_print(CMD_CTX, "failed writing file %s "
 				"to NAND flash %s at offset 0x%8.8" PRIx32,
 				CMD_ARGV[1], CMD_ARGV[0], s.address);
 			return nand_fileio_cleanup(&s);
@@ -1536,7 +1558,7 @@ COMMAND_HANDLER(handle_nand_write_command)
 
 	if (nand_fileio_finish(&s))
 	{
-		command_print(cmd_ctx, "wrote file %s to NAND flash %s up to "
+		command_print(CMD_CTX, "wrote file %s to NAND flash %s up to "
 				"offset 0x%8.8" PRIx32 " in %fs (%0.3f kb/s)",
 				CMD_ARGV[1], CMD_ARGV[0], s.address, duration_elapsed(&s.bench),
 				duration_kbps(&s.bench, total_bytes));
@@ -1558,7 +1580,7 @@ COMMAND_HANDLER(handle_nand_verify_command)
 	dev.address = file.address;
 	dev.size = file.size;
 	dev.oob_format = file.oob_format;
-	retval = nand_fileio_start(cmd_ctx, nand, NULL, FILEIO_NONE, &dev);
+	retval = nand_fileio_start(CMD_CTX, nand, NULL, FILEIO_NONE, &dev);
 	if (ERROR_OK != retval)
 		return retval;
 
@@ -1568,7 +1590,7 @@ COMMAND_HANDLER(handle_nand_verify_command)
 				dev.page, dev.page_size, dev.oob, dev.oob_size);
 		if (ERROR_OK != retval)
 		{
-			command_print(cmd_ctx, "reading NAND flash page failed");
+			command_print(CMD_CTX, "reading NAND flash page failed");
 			nand_fileio_cleanup(&dev);
 			return nand_fileio_cleanup(&file);
 		}
@@ -1576,7 +1598,7 @@ COMMAND_HANDLER(handle_nand_verify_command)
 		int bytes_read = nand_fileio_read(nand, &file);
 		if (bytes_read <= 0)
 		{
-			command_print(cmd_ctx, "error while reading file");
+			command_print(CMD_CTX, "error while reading file");
 			nand_fileio_cleanup(&dev);
 			return nand_fileio_cleanup(&file);
 		}
@@ -1584,7 +1606,7 @@ COMMAND_HANDLER(handle_nand_verify_command)
 		if ((dev.page && memcmp(dev.page, file.page, dev.page_size)) ||
 		    (dev.oob && memcmp(dev.oob, file.oob, dev.oob_size)) )
 		{
-			command_print(cmd_ctx, "NAND flash contents differ "
+			command_print(CMD_CTX, "NAND flash contents differ "
 						"at 0x%8.8" PRIx32, dev.address);
 			nand_fileio_cleanup(&dev);
 			return nand_fileio_cleanup(&file);
@@ -1596,7 +1618,7 @@ COMMAND_HANDLER(handle_nand_verify_command)
 
 	if (nand_fileio_finish(&file) == ERROR_OK)
 	{
-		command_print(cmd_ctx, "verified file %s in NAND flash %s "
+		command_print(CMD_CTX, "verified file %s in NAND flash %s "
 				"up to offset 0x%8.8" PRIx32 " in %fs (%0.3f kb/s)",
 				CMD_ARGV[1], CMD_ARGV[0], dev.address, duration_elapsed(&file.bench),
 				duration_kbps(&file.bench, dev.size));
@@ -1621,7 +1643,7 @@ COMMAND_HANDLER(handle_nand_dump_command)
 				s.page, s.page_size, s.oob, s.oob_size);
 		if (ERROR_OK != retval)
 		{
-			command_print(cmd_ctx, "reading NAND flash page failed");
+			command_print(CMD_CTX, "reading NAND flash page failed");
 			return nand_fileio_cleanup(&s);
 		}
 
@@ -1637,7 +1659,7 @@ COMMAND_HANDLER(handle_nand_dump_command)
 
 	if (nand_fileio_finish(&s) == ERROR_OK)
 	{
-		command_print(cmd_ctx, "dumped %zu bytes 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));
 	}
@@ -1652,28 +1674,21 @@ COMMAND_HANDLER(handle_nand_raw_access_command)
 	}
 
 	struct nand_device *p;
-	int retval = CALL_COMMAND_HANDLER(nand_command_get_device_by_num, 0, &p);
+	int retval = CALL_COMMAND_HANDLER(nand_command_get_device, 0, &p);
 	if (ERROR_OK != retval)
 		return retval;
 
 	if (NULL == p->device)
 	{
-		command_print(cmd_ctx, "#%s: not probed", CMD_ARGV[0]);
+		command_print(CMD_CTX, "#%s: not probed", CMD_ARGV[0]);
 		return ERROR_OK;
 	}
 
 	if (CMD_ARGC == 2)
-	{
-		if (strcmp("enable", CMD_ARGV[1]) == 0)
-			p->use_raw = 1;
-		else if (strcmp("disable", CMD_ARGV[1]) == 0)
-			p->use_raw = 0;
-		else
-			return ERROR_COMMAND_SYNTAX_ERROR;
-	}
+		COMMAND_PARSE_ENABLE(CMD_ARGV[1], p->use_raw);
 
 	const char *msg = p->use_raw ? "enabled" : "disabled";
-	command_print(cmd_ctx, "raw access is %s", msg);
+	command_print(CMD_CTX, "raw access is %s", msg);
 
 	return ERROR_OK;
 }