minidummy: fix compilation error

[fw/openocd] / src / openocd.c

diff --git a/src/openocd.c b/src/openocd.c
index 1a43b3c07c6b7246a71ad9bec810b0efc63a22a2..629d50ae890bff1d9f73298d250c6d423a1fd524 100644 (file)
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -28,6 +28,7 @@
 #include "config.h"
 #endif
 
+#include "openocd.h"
 #include "jtag.h"
 #include "configuration.h"
 #include "xsvf.h"
@@ -40,6 +41,7 @@
 #include "telnet_server.h"
 #include "gdb_server.h"
 #include "tcl_server.h"
+#include "httpd.h"
 
 #ifdef HAVE_STRINGS_H
 #include <strings.h>
@@ -55,7 +57,7 @@ COMMAND_HANDLER(handle_version_command)
        if (CMD_ARGC != 0)
                return ERROR_COMMAND_SYNTAX_ERROR;
 
-       command_print(cmd_ctx, OPENOCD_VERSION);
+       command_print(CMD_CTX, OPENOCD_VERSION);
 
        return ERROR_OK;
 }
@@ -107,11 +109,11 @@ COMMAND_HANDLER(handle_init_command)
 
        atexit(exit_handler);
 
-       if (target_init(cmd_ctx) != ERROR_OK)
+       if (target_init(CMD_CTX) != ERROR_OK)
                return ERROR_FAIL;
        LOG_DEBUG("target init complete");
 
-       if ((retval = jtag_interface_init(cmd_ctx)) != ERROR_OK)
+       if ((retval = jtag_interface_init(CMD_CTX)) != ERROR_OK)
        {
                /* we must be able to set up the jtag interface */
                return retval;
@@ -120,7 +122,7 @@ COMMAND_HANDLER(handle_init_command)
 
        /* Try to initialize & examine the JTAG chain at this point, but
         * continue startup regardless */
-       if (jtag_init(cmd_ctx) == ERROR_OK)
+       if (jtag_init(CMD_CTX) == ERROR_OK)
        {
                LOG_DEBUG("jtag init complete");
                if (target_examine() == ERROR_OK)
@@ -129,19 +131,19 @@ COMMAND_HANDLER(handle_init_command)
                }
        }
 
-       if (flash_init_drivers(cmd_ctx) != ERROR_OK)
+       if (flash_init_drivers(CMD_CTX) != ERROR_OK)
                return ERROR_FAIL;
        LOG_DEBUG("flash init complete");
 
-       if (mflash_init_drivers(cmd_ctx) != ERROR_OK)
+       if (mflash_init_drivers(CMD_CTX) != ERROR_OK)
                return ERROR_FAIL;
        LOG_DEBUG("mflash init complete");
 
-       if (nand_init(cmd_ctx) != ERROR_OK)
+       if (nand_init(CMD_CTX) != ERROR_OK)
                return ERROR_FAIL;
        LOG_DEBUG("NAND init complete");
 
-       if (pld_init(cmd_ctx) != ERROR_OK)
+       if (pld_init(CMD_CTX) != ERROR_OK)
                return ERROR_FAIL;
        LOG_DEBUG("pld init complete");
 
@@ -153,28 +155,42 @@ COMMAND_HANDLER(handle_init_command)
        gdb_init();
        tcl_init(); /* allows tcl to just connect without going thru telnet */
 
-       target_register_event_callback(log_target_callback_event_handler, cmd_ctx);
+       target_register_event_callback(log_target_callback_event_handler, CMD_CTX);
 
        return ERROR_OK;
 }
 
-struct command_context *global_cmd_ctx;
+static const struct command_registration openocd_command_handlers[] = {
+       {
+               .name = "version",
+               .handler = &handle_version_command,
+               .mode = COMMAND_EXEC,
+               .help = "show program version",
+       },
+       {
+               .name = "init",
+               .handler = &handle_init_command,
+               .mode = COMMAND_ANY,
+               .help = "Initializes configured targets and servers.  "
+                       "If called more than once, does nothing.",
+       },
+       COMMAND_REGISTRATION_DONE
+};
 
-/// src/hello.c gives a simple example for writing new command modules
-int hello_register_commands(struct command_context *cmd_ctx);
+struct command_context *global_cmd_ctx;
 
 /* NB! this fn can be invoked outside this file for non PC hosted builds */
 struct command_context *setup_command_handler(void)
 {
-       struct command_context *cmd_ctx;
+       log_init();
+       LOG_DEBUG("log_init: complete");
 
-       global_cmd_ctx = cmd_ctx = command_init();
+       struct command_context *cmd_ctx;
 
-       register_command(cmd_ctx, NULL, "version", handle_version_command,
-                                        COMMAND_EXEC, "show OpenOCD version");
+       global_cmd_ctx = cmd_ctx = command_init(openocd_startup_tcl);
 
+       register_commands(cmd_ctx, NULL, openocd_command_handlers);
        /* register subsystem commands */
-       hello_register_commands(cmd_ctx);
        server_register_commands(cmd_ctx);
        telnet_register_commands(cmd_ctx);
        gdb_register_commands(cmd_ctx);
@@ -189,24 +205,13 @@ struct command_context *setup_command_handler(void)
        pld_register_commands(cmd_ctx);
        mflash_register_commands(cmd_ctx);
 
-       if (log_init(cmd_ctx) != ERROR_OK)
-       {
-               exit(-1);
-       }
-       LOG_DEBUG("log init complete");
+       LOG_DEBUG("command registration: complete");
 
        LOG_OUTPUT(OPENOCD_VERSION "\n");
 
-       register_command(cmd_ctx, NULL, "init", handle_init_command,
-                                        COMMAND_ANY, "initializes target and servers - nop on subsequent invocations");
-
        return cmd_ctx;
 }
 
-int httpd_start(void);
-void httpd_stop(void);
-
-
 #if !BUILD_HTTPD && !BUILD_ECOSBOARD
 /* implementations of OpenOCD that uses multithreading needs to know when
  * OpenOCD is sleeping. No-op in vanilla OpenOCD
@@ -256,7 +261,7 @@ int openocd_main(int argc, char *argv[])
                return EXIT_FAILURE;
 
 #if BUILD_HTTPD
-       if (httpd_start() != ERROR_OK)
+       if (httpd_start(cmd_ctx) != ERROR_OK)
                return EXIT_FAILURE;
 #endif
 
@@ -277,7 +282,7 @@ int openocd_main(int argc, char *argv[])
        httpd_stop();
 #endif
 
-       unregister_all_commands(cmd_ctx);
+       unregister_all_commands(cmd_ctx, NULL);
 
        /* free commandline interface */
        command_done(cmd_ctx);