X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fecosboard.c;h=cfb57655a47f946891d2e8fbb7649b4a57566f52;hb=879a04cc6bc2bdf62b19b974524e1f15f2c9da8e;hp=120b3f91e796cf97bc4d08b886dec87326c8f594;hpb=741cd3c3ab172e6231fc5ed2d099993d59315f74;p=openocd.git

diff --git a/src/ecosboard.c b/src/ecosboard.c
index 120b3f91e7..cfb57655a4 100644
--- a/src/ecosboard.c
+++ b/src/ecosboard.c
@@ -23,6 +23,7 @@
 
 #include "types.h"
 #include "jtag.h"
+#include "ioutil.h"
 #include "configuration.h"
 #include "xsvf.h"
 #include "svf.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",
@@ -845,21 +845,25 @@ void startUart(void)
 	cyg_thread_resume(zylinjtag_uart_thread_handle);
 }
 
-int handle_uart_command(struct command_context *cmd_ctx, char *cmd,
-		char **args, int argc)
+static int zylinjtag_Jim_Command_uart(Jim_Interp *interp, int argc,
+		Jim_Obj * const *argv)
 {
 	static int current_baud = 38400;
-	if (argc == 0)
+	if (argc == 1)
 	{
 		command_print(cmd_ctx, "%d", current_baud);
-		return ERROR_OK;
+		return JIM_OK;
 	}
-	else if (argc != 1)
+	else if (argc != 2)
 	{
-		return ERROR_INVALID_ARGUMENTS;
+		return JIM_ERR;
 	}
 
-	current_baud = atol(args[0]);
+	long new_baudrate;
+	if (Jim_GetLong(interp, argv[1], &new_baudrate) != JIM_OK)
+		return JIM_ERR;
+
+	current_baud = new_baudrate;
 
 	int baud;
 	switch (current_baud)
@@ -898,7 +902,7 @@ int handle_uart_command(struct command_context *cmd_ctx, char *cmd,
 	if (err != ENOERR)
 	{
 		LOG_ERROR("Could not open serial port\n");
-		return ERROR_FAIL;
+		return JIM_ERR;
 	}
 
 	err = cyg_io_get_config(serial_handle,
@@ -907,8 +911,8 @@ int handle_uart_command(struct command_context *cmd_ctx, char *cmd,
 			&len);
 	if (err != ENOERR)
 	{
-		command_print(cmd_ctx, "Failed to get serial port settings %d", err);
-		return ERROR_OK;
+		LOG_ERROR("Failed to get serial port settings %d", err);
+		return JIM_ERR;
 	}
 	buf.baud = baud;
 
@@ -916,11 +920,11 @@ int handle_uart_command(struct command_context *cmd_ctx, char *cmd,
 			&len);
 	if (err != ENOERR)
 	{
-		command_print(cmd_ctx, "Failed to set serial port settings %d", err);
-		return ERROR_OK;
+		LOG_ERROR("Failed to set serial port settings %d", err);
+		return JIM_ERR;
 	}
 
-	return ERROR_OK;
+	return JIM_OK;
 }
 
 bool logAllToSerial = false;
@@ -929,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)
@@ -941,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
@@ -1074,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
 
-	register_command(cmd_ctx, NULL, "uart", handle_uart_command, COMMAND_ANY,
-			"uart <baud>  - forward uart on port 5555");
+	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);
 
@@ -1117,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");