X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fpld%2Fpld.c;h=b2623613e02bdeef5ca180e8f36707af872878d4;hp=f5f3303a5a5b280aa30217ef6b73f58af64b47b5;hb=16b6b5e7a86353dbc0c4823fe3d772c0faca7c1c;hpb=98723c4ecdbe06f90c66f3abec27b792c3b38e34 diff --git a/src/pld/pld.c b/src/pld/pld.c index f5f3303a5a..b2623613e0 100644 --- a/src/pld/pld.c +++ b/src/pld/pld.c @@ -22,8 +22,8 @@ #endif #include "pld.h" -#include "log.h" -#include "time_support.h" +#include +#include /* pld drivers @@ -37,7 +37,6 @@ static struct pld_driver *pld_drivers[] = }; static struct pld_device *pld_devices; -static command_t *pld_cmd; struct pld_device *get_pld_device_by_num(int num) { @@ -62,33 +61,39 @@ COMMAND_HANDLER(handle_pld_device_command) int i; int found = 0; - if (argc < 1) + if (CMD_ARGC < 1) { - LOG_WARNING("incomplete 'pld device' command"); - return ERROR_OK; + return ERROR_COMMAND_SYNTAX_ERROR; } for (i = 0; pld_drivers[i]; i++) { - if (strcmp(args[0], pld_drivers[i]->name) == 0) + if (strcmp(CMD_ARGV[0], pld_drivers[i]->name) == 0) { 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", args[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", args[0]); + LOG_ERROR("'%s' driver rejected pld device", + CMD_ARGV[0]); free(c); return ERROR_OK; } @@ -113,7 +118,7 @@ COMMAND_HANDLER(handle_pld_device_command) /* no matching pld driver found */ if (!found) { - LOG_ERROR("pld driver '%s' not found", args[0]); + LOG_ERROR("pld driver '%s' not found", CMD_ARGV[0]); exit(-1); } @@ -127,13 +132,13 @@ COMMAND_HANDLER(handle_pld_devices_command) if (!pld_devices) { - command_print(cmd_ctx, "no pld devices configured"); + command_print(CMD_CTX, "no pld devices configured"); return ERROR_OK; } for (p = pld_devices; p; p = p->next) { - command_print(cmd_ctx, "#%i: %s", i++, p->driver->name); + command_print(CMD_CTX, "#%i: %s", i++, p->driver->name); } return ERROR_OK; @@ -147,25 +152,24 @@ COMMAND_HANDLER(handle_pld_load_command) gettimeofday(&start, NULL); - if (argc < 2) + if (CMD_ARGC < 2) { - command_print(cmd_ctx, "usage: pld load "); - return ERROR_OK; + return ERROR_COMMAND_SYNTAX_ERROR; } unsigned dev_id; - COMMAND_PARSE_NUMBER(uint, args[0], dev_id); + COMMAND_PARSE_NUMBER(uint, CMD_ARGV[0], dev_id); p = get_pld_device_by_num(dev_id); if (!p) { - command_print(cmd_ctx, "pld device '#%s' is out of bounds", args[0]); + command_print(CMD_CTX, "pld device '#%s' is out of bounds", CMD_ARGV[0]); return ERROR_OK; } - if ((retval = p->driver->load(p, args[1])) != ERROR_OK) + if ((retval = p->driver->load(p, CMD_ARGV[1])) != ERROR_OK) { - command_print(cmd_ctx, "failed loading file %s to pld device %u", - args[1], dev_id); + command_print(CMD_CTX, "failed loading file %s to pld device %u", + CMD_ARGV[1], dev_id); switch (retval) { } @@ -176,34 +180,83 @@ COMMAND_HANDLER(handle_pld_load_command) gettimeofday(&end, NULL); timeval_subtract(&duration, &end, &start); - command_print(cmd_ctx, "loaded file %s to pld device %u in %jis %jius", - args[1], dev_id, + command_print(CMD_CTX, "loaded file %s to pld device %u in %jis %jius", + CMD_ARGV[1], dev_id, (intmax_t)duration.tv_sec, (intmax_t)duration.tv_usec); } return ERROR_OK; } -int pld_init(struct command_context *cmd_ctx) +static const struct command_registration pld_exec_command_handlers[] = { + { + .name = "devices", + .handler = handle_pld_devices_command, + .mode = COMMAND_EXEC, + .help = "list configured pld devices", + }, + { + .name = "load", + .handler = handle_pld_load_command, + .mode = COMMAND_EXEC, + .help = "load configuration file into PLD", + .usage = "pld_num filename", + }, + COMMAND_REGISTRATION_DONE +}; + +static int pld_init(struct command_context *cmd_ctx) { if (!pld_devices) return ERROR_OK; - register_command(cmd_ctx, pld_cmd, "devices", - handle_pld_devices_command, COMMAND_EXEC, - "list configured pld devices"); - register_command(cmd_ctx, pld_cmd, "load", - handle_pld_load_command, COMMAND_EXEC, - "load configuration into programmable logic device"); - - return ERROR_OK; + struct command *parent = command_find_in_context(cmd_ctx, "pld"); + return register_commands(cmd_ctx, parent, pld_exec_command_handlers); } -int pld_register_commands(struct command_context *cmd_ctx) +COMMAND_HANDLER(handle_pld_init_command) { - pld_cmd = register_command(cmd_ctx, NULL, "pld", NULL, COMMAND_ANY, "programmable logic device commands"); + if (CMD_ARGC != 0) + return ERROR_COMMAND_SYNTAX_ERROR; - register_command(cmd_ctx, pld_cmd, "device", handle_pld_device_command, COMMAND_CONFIG, NULL); + static bool pld_initialized = false; + if (pld_initialized) + { + LOG_INFO("'pld init' has already been called"); + return ERROR_OK; + } + pld_initialized = true; - return ERROR_OK; + LOG_DEBUG("Initializing PLDs..."); + return pld_init(CMD_CTX); +} + +static const struct command_registration pld_config_command_handlers[] = { + { + .name = "device", + .mode = COMMAND_CONFIG, + .handler = handle_pld_device_command, + .help = "configure a PLD device", + .usage = "driver_name [driver_args ... ]", + }, + { + .name = "init", + .mode = COMMAND_CONFIG, + .handler = handle_pld_init_command, + .help = "initialize PLD devices", + }, + COMMAND_REGISTRATION_DONE +}; +static const struct command_registration pld_command_handler[] = { + { + .name = "pld", + .mode = COMMAND_ANY, + .help = "programmable logic device commands", + .chain = pld_config_command_handlers, + }, + COMMAND_REGISTRATION_DONE +}; +int pld_register_commands(struct command_context *cmd_ctx) +{ + return register_commands(cmd_ctx, NULL, pld_command_handler); }