nand: factor init to 'nand init'

[openocd.git] / src / ecosboard.c

diff --git a/src/ecosboard.c b/src/ecosboard.c
index 5588934ace90285dcfa93d9e318b08a7b0ac3710..dcd497ce9e943516e825cd6e227a87900ab2638d 100644 (file)
--- a/src/ecosboard.c
+++ b/src/ecosboard.c
@@ -80,6 +80,7 @@
 #include <unistd.h>
 #include <stdio.h>
 
+#include <openocd.h>
 
 #ifdef CYGPKG_HAL_NIOS2
 #define ZY1000_SER_DEV "/dev/uart_0"
@@ -505,8 +506,6 @@ static void zylinjtag_startNetwork(void)
 
        cyg_httpd_init_tcl_interpreter();
 
-       interp = httpstate.jim_interp;
-
        Jim_CreateCommand(httpstate.jim_interp, "log", zylinjtag_Jim_Command_log,
                        NULL, NULL);
        Jim_CreateCommand(httpstate.jim_interp, "zy1000_reboot",
@@ -933,8 +932,6 @@ bool logAllToSerial = false;
 int boolParam(char *var);
 
 
-struct command_context *setup_command_handler(void);
-
 static const char *zylin_config_dir="/config/settings";
 
 static int add_default_dirs(void)
@@ -1078,7 +1075,8 @@ int main(int argc, char *argv[])
 
        /* initialize commandline interface */
        struct command_context * cmd_ctx;
-       cmd_ctx = setup_command_handler();
+       struct command_context *setup_command_handler(Jim_Interp *interp);
+       cmd_ctx = setup_command_handler(httpstate.jim_interp);
        command_set_output_handler(cmd_ctx, configuration_output_handler, NULL);
        command_context_mode(cmd_ctx, COMMAND_CONFIG);
 
@@ -1095,7 +1093,7 @@ int main(int argc, char *argv[])
                        COMMAND_ANY, NULL);
 #endif
 
-       Jim_CreateCommand(interp, "uart", zylinjtag_Jim_Command_uart, NULL, NULL);
+       Jim_CreateCommand(httpstate.jim_interp, "uart", zylinjtag_Jim_Command_uart, NULL, NULL);
 
 
        log_init();
@@ -1115,6 +1113,11 @@ int main(int argc, char *argv[])
 
        command_run_linef(cmd_ctx, "script /rom/openocd.cfg");
 
+       int ret;
+       ret = server_init(cmd_ctx);
+       if (ERROR_OK != ret)
+               return EXIT_FAILURE;
+
        /* we MUST always run the init command as it will launch telnet sessions */
        command_run_line(cmd_ctx, "init");