cmd: add missing usage vars

[fw/openocd] / src / pld / pld.c

diff --git a/src/pld/pld.c b/src/pld/pld.c
index 421fc6171ad2c49285d0e5f900eb35e2fa799f58..08a537c09cd3ec7448ab689835605043e2bb0813 100644 (file)
--- 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 <helper/log.h>
+#include <helper/time_support.h>
 
 
 /* pld drivers
@@ -63,8 +63,7 @@ COMMAND_HANDLER(handle_pld_device_command)
 
        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++)
@@ -74,20 +73,27 @@ 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]);
+                               LOG_ERROR("'%s' driver rejected pld device",
+                                               CMD_ARGV[0]);
                                free(c);
                                return ERROR_OK;
                        }
@@ -148,8 +154,7 @@ COMMAND_HANDLER(handle_pld_load_command)
 
        if (CMD_ARGC < 2)
        {
-               command_print(CMD_CTX, "usage: pld load <device#> <file>");
-               return ERROR_OK;
+               return ERROR_COMMAND_SYNTAX_ERROR;
        }
 
        unsigned dev_id;
@@ -186,20 +191,21 @@ COMMAND_HANDLER(handle_pld_load_command)
 static const struct command_registration pld_exec_command_handlers[] = {
        {
                .name = "devices",
-               .handler = &handle_pld_devices_command,
+               .handler = handle_pld_devices_command,
                .mode = COMMAND_EXEC,
                .help = "list configured pld devices",
        },
        {
                .name = "load",
-               .handler = &handle_pld_load_command,
+               .handler = handle_pld_load_command,
                .mode = COMMAND_EXEC,
                .help = "load configuration file into PLD",
-               .usage = "<device#> <file>",
+               .usage = "pld_num filename",
        },
        COMMAND_REGISTRATION_DONE
 };
-int pld_init(struct command_context *cmd_ctx)
+
+static int pld_init(struct command_context *cmd_ctx)
 {
        if (!pld_devices)
                return ERROR_OK;
@@ -208,13 +214,37 @@ int pld_init(struct command_context *cmd_ctx)
        return register_commands(cmd_ctx, parent, pld_exec_command_handlers);
 }
 
+COMMAND_HANDLER(handle_pld_init_command)
+{
+       if (CMD_ARGC != 0)
+               return ERROR_COMMAND_SYNTAX_ERROR;
+
+       static bool pld_initialized = false;
+       if (pld_initialized)
+       {
+               LOG_INFO("'pld init' has already been called");
+               return ERROR_OK;
+       }
+       pld_initialized = true;
+
+       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,
+               .handler = handle_pld_device_command,
                .help = "configure a PLD device",
-               .usage = "<driver> ...",
+               .usage = "driver_name [driver_args ... ]",
+       },
+       {
+               .name = "init",
+               .mode = COMMAND_CONFIG,
+               .handler = handle_pld_init_command,
+               .help = "initialize PLD devices",
+               .usage = ""
        },
        COMMAND_REGISTRATION_DONE
 };
@@ -223,7 +253,7 @@ static const struct command_registration pld_command_handler[] = {
                .name = "pld",
                .mode = COMMAND_ANY,
                .help = "programmable logic device commands",
-
+               .usage = "",
                .chain = pld_config_command_handlers,
        },
        COMMAND_REGISTRATION_DONE