target: add basic dsp563xx support

[openocd] / src / pld / pld.c

diff --git a/src/pld/pld.c b/src/pld/pld.c
index 421fc6171ad2c49285d0e5f900eb35e2fa799f58..6a0bd93dcc917e444a720cdadfa9c488cf9082d3 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
@@ -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]);
@@ -208,6 +213,23 @@ 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",
@@ -216,6 +238,12 @@ static const struct command_registration pld_config_command_handlers[] = {
                .help = "configure a PLD device",
                .usage = "<driver> ...",
        },
+       {
+               .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[] = {