Revive tclapi.c from r1650:

[openocd.git] / src / openocd.c

diff --git a/src/openocd.c b/src/openocd.c
index 56576ee351fff82e970564c77e150dbbbf699d07..4d76fd6c514e66944a9a92d926aec16f320adcd7 100644 (file)
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -41,6 +41,7 @@
 #include "mflash.h"
 
 #include "command.h"
+#include "tclapi.h"
 #include "server.h"
 #include "telnet_server.h"
 #include "gdb_server.h"
@@ -59,8 +60,7 @@
 #define OPENOCD_VERSION \
                "Open On-Chip Debugger " VERSION " (" PKGBLDDATE ") " RELSTR PKGBLDREV
 
-
-void print_version(void)
+static void print_version(void)
 {
        /* DANGER!!! make sure that the line below does not appear in a patch, do not remove */
        /* DANGER!!! make sure that the line below does not appear in a patch, do not remove */
@@ -76,7 +76,7 @@ void print_version(void)
 }
 
 /* Give TELNET a way to find out what version this is */
-int handle_version_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+static int handle_version_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
 {
        if (argc!=0)
                return ERROR_COMMAND_SYNTAX_ERROR;
@@ -86,7 +86,7 @@ int handle_version_command(struct command_context_s *cmd_ctx, char *cmd, char **
        return ERROR_OK;
 }
 
-void exit_handler(void)
+static void exit_handler(void)
 {
        /* close JTAG interface */
        if (jtag && jtag->quit)
@@ -120,7 +120,7 @@ static int log_target_callback_event_handler(struct target_s *target, enum targe
 int ioutil_init(struct command_context_s *cmd_ctx);
 
 /* OpenOCD can't really handle failure of this command. Patches welcome! :-) */
-int handle_init_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+static int handle_init_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
 {
 
        if (argc!=0)
@@ -188,6 +188,7 @@ int handle_init_command(struct command_context_s *cmd_ctx, char *cmd, char **arg
 
 command_context_t *global_cmd_ctx;
 
+/* NB! this fn can be invoked outside this file for non PC hosted builds */
 command_context_t *setup_command_handler(void)
 {
        command_context_t *cmd_ctx;
@@ -202,6 +203,7 @@ command_context_t *setup_command_handler(void)
        telnet_register_commands(cmd_ctx);
        gdb_register_commands(cmd_ctx);
        tcl_register_commands(cmd_ctx); /* tcl server commands */
+       tclapi_register_commands(cmd_ctx); /* misc tcl commands */
        log_register_commands(cmd_ctx);
        jtag_register_commands(cmd_ctx);
        xsvf_register_commands(cmd_ctx);
@@ -229,6 +231,21 @@ command_context_t *setup_command_handler(void)
 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
+ */
+void openocd_sleep_prelude(void)
+{
+}
+
+void openocd_sleep_postlude(void)
+{
+}
+#endif
+
+
 /* normally this is the main() function entry, but if OpenOCD is linked
  * into application, then this fn will not be invoked, but rather that
  * application will have it's own implementation of main(). */