diff options
| author | Zachary T Welch <zw@superlucidity.net> | 2009-11-22 06:24:19 -0800 |
|---|---|---|
| committer | Zachary T Welch <zw@superlucidity.net> | 2009-11-24 21:37:35 -0800 |
| commit | 90d09e35e4be6f0b35899238b253154249f85cb6 (patch) | |
| tree | aecc837b38ec8386d7ff889f7ca1abc54cbac5a4 /src/flash/nand.c | |
| parent | ad090413a8dfacccc993ff15b8376e0f2bd56712 (diff) | |
| download | openocd+libswd-90d09e35e4be6f0b35899238b253154249f85cb6.tar.gz openocd+libswd-90d09e35e4be6f0b35899238b253154249f85cb6.tar.bz2 openocd+libswd-90d09e35e4be6f0b35899238b253154249f85cb6.tar.xz openocd+libswd-90d09e35e4be6f0b35899238b253154249f85cb6.zip | |
remove nand_controller->register_callbacks
Replace flash_driver callback with pointer to command_registration.
Eliminates all related routines and allows drivers to omit commands.
Diffstat (limited to 'src/flash/nand.c')
| -rw-r--r-- | src/flash/nand.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/flash/nand.c b/src/flash/nand.c index bc0e3505..1e28ba26 100644 --- a/src/flash/nand.c +++ b/src/flash/nand.c @@ -214,11 +214,12 @@ COMMAND_HANDLER(handle_nand_list_drivers) static COMMAND_HELPER(create_nand_device, const char *bank_name, struct nand_flash_controller *controller) { - int retval = controller->register_commands(CMD_CTX); - if (ERROR_OK != retval) + if (NULL != controller->commands) { - LOG_ERROR("couldn't register '%s' commands", controller->name); - return retval; + int retval = register_commands(CMD_CTX, NULL, + controller->commands); + if (ERROR_OK != retval) + return retval; } struct nand_device *c = malloc(sizeof(struct nand_device)); @@ -233,7 +234,7 @@ static COMMAND_HELPER(create_nand_device, const char *bank_name, c->use_raw = 0; c->next = NULL; - retval = CALL_COMMAND_HANDLER(controller->nand_device_command, c); + int retval = CALL_COMMAND_HANDLER(controller->nand_device_command, c); if (ERROR_OK != retval) { LOG_ERROR("'%s' driver rejected nand flash", controller->name); |