zcy
/
tinyriscv-openocd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pld: use static registration instead of callback 

Remove register_callbacks from pld_device structure, using an array
of command_registration records instead.
__archive__
Zachary T Welch 2009-11-23 09:30:02 -08:00
parent 76b89755c9
commit e2f23c5437
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/pld/pld.c
View File

@ -74,17 +74,22 @@ COMMAND_HANDLER(handle_pld_device_command)
struct pld_device *p, *c; struct pld_device *p, *c;
/* register pld specific commands */ /* register pld specific commands */
if (pld_drivers[i]->register_commands(CMD_CTX) != ERROR_OK) int retval;
{ if (pld_drivers[i]->commands) {
LOG_ERROR("couldn't register '%s' commands", CMD_ARGV[0]); retval = register_commands(CMD_CTX, NULL,
exit(-1); 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 = malloc(sizeof(struct pld_device));
c->driver = pld_drivers[i]; c->driver = pld_drivers[i];
c->next = NULL; 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) if (ERROR_OK != retval)
{ {
LOG_ERROR("'%s' driver rejected pld device", CMD_ARGV[0]); LOG_ERROR("'%s' driver rejected pld device", CMD_ARGV[0]);

2
src/pld/pld.h
View File

@ -31,7 +31,7 @@ struct pld_driver
{ {
char *name; char *name;
__PLD_DEVICE_COMMAND((*pld_device_command)); __PLD_DEVICE_COMMAND((*pld_device_command));
int (*register_commands)(struct command_context *cmd_ctx); const struct command_registration *commands;
int (*load)(struct pld_device *pld_device, const char *filename); int (*load)(struct pld_device *pld_device, const char *filename);
}; };

7
src/pld/virtex2.c
View File

@ -253,14 +253,9 @@ static const struct command_registration virtex2_command_handler[] = {
COMMAND_REGISTRATION_DONE COMMAND_REGISTRATION_DONE
}; };
static int virtex2_register_commands(struct command_context *cmd_ctx)
{
return register_commands(cmd_ctx, NULL, virtex2_command_handler);
}
struct pld_driver virtex2_pld = { struct pld_driver virtex2_pld = {
.name = "virtex2", .name = "virtex2",
.register_commands = &virtex2_register_commands, .commands = virtex2_command_handler,
.pld_device_command = &virtex2_pld_device_command, .pld_device_command = &virtex2_pld_device_command,
.load = &virtex2_load, .load = &virtex2_load,
}; };