imi415
/
openocd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

flash: introduce .usage field for nand and nor flash driver structure 

Change-Id: I47e7ec8fa8c70d2addc3aa52d7c97e9e1e7bb662
Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
Reviewed-on: http://openocd.zylin.com/301
Tested-by: jenkins
Reviewed-by: Øyvind Harboe <oyvindharboe@gmail.com>
Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>
This commit is contained in:
Øyvind Harboe 2011-12-28 13:10:52 +01:00 committed by Spencer Oliver
parent 4668bd264c
commit ae7ab8b09d
3 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/flash/nand/driver.h
View File

@ -37,6 +37,9 @@ struct nand_flash_controller
/** Driver name that is used to select it from configuration files. */
const char *name;
/** Usage of flash command registration. */
const char *usage;
const struct command_registration *commands;
/** NAND device command called when driver is instantiated during configuration. */

13
src/flash/nand/tcl.c
View File

@ -544,8 +544,7 @@ static COMMAND_HELPER(create_nand_device, const char *bank_name,
if (CMD_ARGC < 2)
{
LOG_ERROR("missing target");
return ERROR_COMMAND_ARGUMENT_INVALID;
return ERROR_COMMAND_SYNTAX_ERROR;
}
target = get_target(CMD_ARGV[1]);
if (!target) {
@ -582,9 +581,12 @@ static COMMAND_HELPER(create_nand_device, const char *bank_name,
retval = CALL_COMMAND_HANDLER(controller->nand_device_command, c);
if (ERROR_OK != retval)
{
LOG_ERROR("'%s' driver rejected nand flash", controller->name);
assert(controller->usage != NULL);
LOG_ERROR("'%s' driver rejected nand flash. Usage: %s",
controller->name,
controller->usage);
free(c);
return ERROR_OK;
return retval;
}
nand_device_add(c);
@ -596,8 +598,7 @@ COMMAND_HANDLER(handle_nand_device_command)
{
if (CMD_ARGC < 2)
{
LOG_ERROR("incomplete nand device configuration");
return ERROR_FLASH_BANK_INVALID;
return ERROR_COMMAND_SYNTAX_ERROR;
}
// save name and increment (for compatibility) with drivers

5
src/flash/nor/driver.h
View File

@ -56,6 +56,11 @@ struct flash_driver
*/
const char *name;
/**
* Gives a human-readable description of arguments.
*/
const char *usage;
/**
* An array of driver-specific commands to register. When called
* during the "flash bank" command, the driver can register addition