pld: factor init to 'pld init'

Split PLD initialization into 'pld init', which gets called from 'init'.

diff --git a/src/openocd.c b/src/openocd.c
index 44e029251aa6c05eafd0a148c2631e3800989a3b..777e630664a883792781713ec7e946b4b513f5d5 100644 (file)
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -147,9 +147,10 @@ COMMAND_HANDLER(handle_init_command)
                return ERROR_FAIL;
        LOG_DEBUG("NAND init complete");
 
-       if (pld_init(CMD_CTX) != ERROR_OK)
+       command_context_mode(CMD_CTX, COMMAND_CONFIG);
+       if (command_run_line(CMD_CTX, "pld init") != ERROR_OK)
                return ERROR_FAIL;
-       LOG_DEBUG("pld init complete");
+       command_context_mode(CMD_CTX, COMMAND_EXEC);
 
        /* initialize telnet subsystem */
        gdb_target_add_all(all_targets);

diff --git a/src/pld/pld.c b/src/pld/pld.c
index 24afd07a38e8dca6e3ffca5236412001d08d6e67..df7ac0de09cfad98cb680aa7f3f010d7258b3f8a 100644 (file)
--- a/src/pld/pld.c
+++ b/src/pld/pld.c
@@ -213,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",
@@ -221,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[] = {