fix a few compilation problems.

[openocd.git] / src / openocd.c

diff --git a/src/openocd.c b/src/openocd.c
index b6b217df3cef91cd3b75a1bb7a6641ed8f394069..197c2e32f1359523255d1b1319b07ac850b7b9f5 100644 (file)
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -143,6 +143,7 @@ int handle_init_command(struct command_context_s *cmd_ctx, char *cmd, char **arg
        /* initialize telnet subsystem */
        telnet_init("Open On-Chip Debugger");
        gdb_init();
+       tcl_init(); /* allows tcl to just connect without going thru telnet */
 
        return ERROR_OK;
 }
@@ -624,7 +625,12 @@ void initJim(void)
        interp->cb_fgets      = openocd_jim_fgets;
 }
 
-int main(int argc, char *argv[])
+/*
+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().
+*/
+int openocd_main(int argc, char *argv[])
 {
        initJim();
        
@@ -641,6 +647,7 @@ int main(int argc, char *argv[])
        server_register_commands(cmd_ctx);
        telnet_register_commands(cmd_ctx);
        gdb_register_commands(cmd_ctx);
+       tcl_register_commands(cmd_ctx); /* tcl server commands */
        log_register_commands(cmd_ctx);
        jtag_register_commands(cmd_ctx);
        interpreter_register_commands(cmd_ctx);