diff options
| author | Zachary T Welch <zw@superlucidity.net> | 2009-11-23 09:30:02 -0800 |
|---|---|---|
| committer | Zachary T Welch <zw@superlucidity.net> | 2009-11-24 21:37:33 -0800 |
| commit | e2f23c54373097098ef0b59377299d7382f4c58a (patch) | |
| tree | 11fdbb5ec4a4daf6ea9c1f9fb32cd258480d3062 /src/pld/pld.c | |
| parent | 76b89755c994faa8ff0f646c722373ccb876f744 (diff) | |
| download | openocd+libswd-e2f23c54373097098ef0b59377299d7382f4c58a.tar.gz openocd+libswd-e2f23c54373097098ef0b59377299d7382f4c58a.tar.bz2 openocd+libswd-e2f23c54373097098ef0b59377299d7382f4c58a.tar.xz openocd+libswd-e2f23c54373097098ef0b59377299d7382f4c58a.zip | |
pld: use static registration instead of callback
Remove register_callbacks from pld_device structure, using an array
of command_registration records instead.
Diffstat (limited to 'src/pld/pld.c')
| -rw-r--r-- | src/pld/pld.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/pld/pld.c b/src/pld/pld.c index 421fc617..24afd07a 100644 --- a/src/pld/pld.c +++ b/src/pld/pld.c @@ -74,17 +74,22 @@ COMMAND_HANDLER(handle_pld_device_command) struct pld_device *p, *c; /* register pld specific commands */ - if (pld_drivers[i]->register_commands(CMD_CTX) != ERROR_OK) - { - LOG_ERROR("couldn't register '%s' commands", CMD_ARGV[0]); - exit(-1); + int retval; + if (pld_drivers[i]->commands) { + retval = register_commands(CMD_CTX, NULL, + pld_drivers[i]->commands); + if (ERROR_OK != retval) + { + LOG_ERROR("couldn't register '%s' commands", CMD_ARGV[0]); + return ERROR_FAIL; + } } c = malloc(sizeof(struct pld_device)); c->driver = pld_drivers[i]; c->next = NULL; - int retval = CALL_COMMAND_HANDLER(pld_drivers[i]->pld_device_command, c); + retval = CALL_COMMAND_HANDLER(pld_drivers[i]->pld_device_command, c); if (ERROR_OK != retval) { LOG_ERROR("'%s' driver rejected pld device", CMD_ARGV[0]); |