interesting
/
riscv-openocd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

refactor handle_nand_device_command 

Move bulk of for-loop to a new static command helper function.

Adds handle_nand_list_drivers command handler, registered as
'nand drivers'.

Improves command help text and error reporting.
This commit is contained in:
Zachary T Welch 2009-11-17 15:14:03 -08:00
parent 2dfa5e9c84
commit 59d4466b55
1 changed files with 66 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
src/flash/nand.c
View File

@ -204,35 +204,27 @@ static struct nand_ecclayout nand_oob_64 = {
.length = 38}} .length = 38}}
}; };
/* nand device <nand_controller> [controller options] COMMAND_HANDLER(handle_nand_list_drivers)
*/
COMMAND_HANDLER(handle_nand_device_command)
{ {
int i; command_print(CMD_CTX, "Available NAND flash controller drivers:");
int retval; for (unsigned i = 0; nand_flash_controllers[i]; i++)
command_print(CMD_CTX, " %s", nand_flash_controllers[i]->name);
if (CMD_ARGC < 1) return ERROR_OK;
{
LOG_WARNING("incomplete flash device nand configuration");
return ERROR_FLASH_BANK_INVALID;
} }
for (i = 0; nand_flash_controllers[i]; i++) static COMMAND_HELPER(create_nand_device,
struct nand_flash_controller *controller)
{ {
struct nand_device *p, *c; int retval = controller->register_commands(CMD_CTX);
if (ERROR_OK != retval)
if (strcmp(CMD_ARGV[0], nand_flash_controllers[i]->name) == 0)
{ {
/* register flash specific commands */ LOG_ERROR("couldn't register '%s' commands", controller->name);
if ((retval = nand_flash_controllers[i]->register_commands(CMD_CTX)) != ERROR_OK)
{
LOG_ERROR("couldn't register '%s' commands", CMD_ARGV[0]);
return retval; return retval;
} }
c = malloc(sizeof(struct nand_device)); struct nand_device *c = malloc(sizeof(struct nand_device));
c->controller = nand_flash_controllers[i]; c->controller = controller;
c->controller_priv = NULL; c->controller_priv = NULL;
c->manufacturer = NULL; c->manufacturer = NULL;
c->device = NULL; c->device = NULL;
@ -242,49 +234,57 @@ COMMAND_HANDLER(handle_nand_device_command)
c->use_raw = 0; c->use_raw = 0;
c->next = NULL; c->next = NULL;
retval = CALL_COMMAND_HANDLER(nand_flash_controllers[i]->nand_device_command, c); retval = CALL_COMMAND_HANDLER(controller->nand_device_command, c);
if (ERROR_OK != retval) if (ERROR_OK != retval)
{ {
LOG_ERROR("'%s' driver rejected nand flash", c->controller->name); LOG_ERROR("'%s' driver rejected nand flash", controller->name);
free(c); free(c);
return ERROR_OK; return ERROR_OK;
} }
/* put NAND device in linked list */ if (nand_devices) {
if (nand_devices) struct nand_device *p = nand_devices;
{ while (p && p->next) p = p->next;
/* find last flash device */
for (p = nand_devices; p && p->next; p = p->next);
if (p)
p->next = c; p->next = c;
} } else
else
{
nand_devices = c; nand_devices = c;
}
return ERROR_OK; return ERROR_OK;
} }
}
/* no valid NAND controller was found (i.e. the configuration option, COMMAND_HANDLER(handle_nand_device_command)
* 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++)
{ {
LOG_ERROR("%i: %s", i, nand_flash_controllers[i]->name); if (CMD_ARGC < 1)
{
LOG_ERROR("incomplete nand device configuration");
return ERROR_FLASH_BANK_INVALID;
} }
return ERROR_OK; const char *driver_name = CMD_ARGV[0];
for (unsigned i = 0; nand_flash_controllers[i]; i++)
{
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);
}
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) 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; return ERROR_OK;
} }