From: Spencer Oliver <spen@spen-soft.co.uk>
Date: Thu, 19 Jan 2012 15:08:50 +0000 (+0000)
Subject: flash: print bank usage on failure
X-Git-Tag: v0.6.0-rc1~293
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=9db465810a43e934f4f3c267ac279140c7c156dd;p=openocd

flash: print bank usage on failure

This makes use of the newly introduced usage field in the flash bank
structure.

Also remove the assertion if usage field is null and
lets print a DEBUG_LOG message instead.

Change-Id: I384bf0e2c444fcc99deef73aec9ef01149a91c76
Signed-off-by: Spencer Oliver <spen@spen-soft.co.uk>
Reviewed-on: http://openocd.zylin.com/391
Tested-by: jenkins
---

diff --git a/src/flash/nand/tcl.c b/src/flash/nand/tcl.c
index 29d4e1e1..63893779 100644
--- a/src/flash/nand/tcl.c
+++ b/src/flash/nand/tcl.c
@@ -581,7 +581,6 @@ static COMMAND_HELPER(create_nand_device, const char *bank_name,
 	retval = CALL_COMMAND_HANDLER(controller->nand_device_command, c);
 	if (ERROR_OK != retval)
 	{
-		assert(controller->usage != NULL);
 		LOG_ERROR("'%s' driver rejected nand flash. Usage: %s",
 			controller->name,
 			controller->usage);
@@ -589,6 +588,9 @@ static COMMAND_HELPER(create_nand_device, const char *bank_name,
 		return retval;
 	}
 
+	if (controller->usage == NULL)
+		LOG_DEBUG("'%s' driver usage field missing", controller->name);
+
 	nand_device_add(c);
 
 	return ERROR_OK;
diff --git a/src/flash/nor/tcl.c b/src/flash/nor/tcl.c
index 4ba5f47c..735caa8e 100644
--- a/src/flash/nor/tcl.c
+++ b/src/flash/nor/tcl.c
@@ -834,12 +834,15 @@ COMMAND_HANDLER(handle_flash_bank_command)
 	retval = CALL_COMMAND_HANDLER(driver->flash_bank_command, c);
 	if (ERROR_OK != retval)
 	{
-		LOG_ERROR("'%s' driver rejected flash bank at 0x%8.8" PRIx32,
-				driver_name, c->base);
+		LOG_ERROR("'%s' driver rejected flash bank at 0x%8.8" PRIx32 "Usage %s",
+				driver_name, c->base, driver->usage);
 		free(c);
 		return retval;
 	}
 
+	if (driver->usage == NULL)
+		LOG_DEBUG("'%s' driver usage field missing", driver_name);
+
 	flash_bank_add(c);
 
 	return ERROR_OK;