X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fecosboard.c;h=2464868e73619fcfe82c5d747930346df8d4b87c;hb=2a402ae2c7bf5ce515ff5bfdd7d68f875686e289;hp=58520c33bfebb4a902470ed68e1d0fc7091b3671;hpb=5c4a73d0d89989b7fbe260ed4fa00a8259e01b03;p=openocd.git

diff --git a/src/ecosboard.c b/src/ecosboard.c
index 58520c33bf..2464868e73 100644
--- a/src/ecosboard.c
+++ b/src/ecosboard.c
@@ -21,12 +21,13 @@
 #include "config.h"
 #endif
 
-#include "types.h"
-#include "jtag.h"
-#include "configuration.h"
+#include <helper/types.h>
+#include <jtag/jtag.h>
+#include <helper/ioutil.h>
+#include <helper/configuration.h>
 #include "xsvf.h"
 #include "svf.h"
-#include "nand.h"
+#include <flash/nand.h>
 #include "pld.h"
 
 #include "server.h"
@@ -80,6 +81,7 @@
 #include <unistd.h>
 #include <stdio.h>
 
+#include <openocd.h>
 
 #ifdef CYGPKG_HAL_NIOS2
 #define ZY1000_SER_DEV "/dev/uart_0"
@@ -505,8 +507,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 +933,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)
@@ -945,8 +943,6 @@ static int add_default_dirs(void)
 	return ERROR_OK;
 }
 
-int ioutil_init(struct command_context *cmd_ctx);
-
 int main(int argc, char *argv[])
 {
 	/* ramblockdevice will be the same address every time. The deflate app uses a buffer 16mBytes out, so we
@@ -1078,33 +1074,23 @@ 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);
 
-#if BUILD_IOUTIL
 	if (ioutil_init(cmd_ctx) != ERROR_OK)
-	{
 		return EXIT_FAILURE;
-	}
-#endif
-
 
 #ifdef CYGPKG_PROFILE_GPROF
-	register_command(cmd_ctx, NULL, "ecosboard_profile", eCosBoard_handle_eCosBoard_profile_command,
+	COMMAND_REGISTER(cmd_ctx, NULL, "ecosboard_profile", eCosBoard_handle_eCosBoard_profile_command,
 			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);
 
 
-	int errVal;
-	errVal = log_init(cmd_ctx);
-	if (errVal != ERROR_OK)
-	{
-		diag_printf("log_init() failed %d\n", errVal);
-		exit(-1);
-	}
+	log_init();
 
 	set_log_output(cmd_ctx, log);
 
@@ -1121,6 +1107,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");