From: Zachary T Welch <zw@superlucidity.net>
Date: Tue, 17 Nov 2009 22:11:24 +0000 (-0800)
Subject: add support for naming NAND banks
X-Git-Tag: v0.4.0-rc1~486
X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=commitdiff_plain;h=664ba309d5dac2532c83fed441d14f93c7381d62

add support for naming NAND banks

Requires users to name their nand banks, allowing them to be used
instead of bank numbers in script commands.
---

diff --git a/src/flash/nand.c b/src/flash/nand.c
index 70b14b029a..2085028c2d 100644
--- a/src/flash/nand.c
+++ b/src/flash/nand.c
@@ -212,7 +212,7 @@ COMMAND_HANDLER(handle_nand_list_drivers)
 	return ERROR_OK;
 }
 
-static COMMAND_HELPER(create_nand_device,
+static COMMAND_HELPER(create_nand_device, const char *bank_name,
 		struct nand_flash_controller *controller)
 {
 	int retval = controller->register_commands(CMD_CTX);
@@ -221,9 +221,9 @@ static COMMAND_HELPER(create_nand_device,
 		LOG_ERROR("couldn't register '%s' commands", controller->name);
 		return retval;
 	}
-
 	struct nand_device *c = malloc(sizeof(struct nand_device));
 
+	c->name = strdup(bank_name);
 	c->controller = controller;
 	c->controller_priv = NULL;
 	c->manufacturer = NULL;
@@ -260,6 +260,10 @@ COMMAND_HANDLER(handle_nand_device_command)
 		return ERROR_FLASH_BANK_INVALID;
 	}
 
+	// save name and increment (for compatibility) with drivers
+	const char *bank_name = *CMD_ARGV++;
+	CMD_ARGC--;
+
 	const char *driver_name = CMD_ARGV[0];
 	for (unsigned i = 0; nand_flash_controllers[i]; i++)
 	{
@@ -267,7 +271,8 @@ COMMAND_HANDLER(handle_nand_device_command)
 		if (strcmp(driver_name, controller->name) != 0)
 			continue;
 
-		return CALL_COMMAND_HANDLER(create_nand_device, controller);
+		return CALL_COMMAND_HANDLER(create_nand_device,
+				bank_name, controller);
 	}
 
 	LOG_ERROR("No valid NAND flash driver found (%s)", driver_name);
@@ -297,6 +302,8 @@ struct nand_device *get_nand_device_by_name(const char *name)
 	struct nand_device *nand;
 	for (nand = nand_devices; NULL != nand; nand = nand->next)
 	{
+		if (strcmp(nand->name, name) == 0)
+			return nand;
 		if (!flash_driver_name_matches(nand->controller->name, name))
 			continue;
 		if (++found < requested)
diff --git a/src/flash/nand.h b/src/flash/nand.h
index d38ed67ec9..af52c77097 100644
--- a/src/flash/nand.h
+++ b/src/flash/nand.h
@@ -75,6 +75,7 @@ struct nand_ecclayout {
 
 struct nand_device
 {
+	char *name;
 	struct nand_flash_controller *controller;
 	void *controller_priv;
 	struct nand_manufacturer *manufacturer;