X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fecosboard.c;h=2a9950d6c9f9d4ec504f007b27009f7b311e2ccf;hb=646ce814b4fb678b7d8d341afe0694c266112426;hp=36e807ef79e417f4d743c861d3760550b2dc7a8e;hpb=445da543d8db868466dcef7e23f75b3c2b54bc72;p=openocd

diff --git a/src/ecosboard.c b/src/ecosboard.c
index 36e807ef..2a9950d6 100644
--- a/src/ecosboard.c
+++ b/src/ecosboard.c
@@ -21,20 +21,17 @@
 #include "config.h"
 #endif
 
-#include "types.h"
-#include "jtag.h"
-#include "configuration.h"
-#include "xsvf.h"
-#include "svf.h"
-#include "nand.h"
-#include "pld.h"
-
-#include "server.h"
-#include "telnet_server.h"
-#include "gdb_server.h"
-#include "openocd.h"
-
-#include <time_support.h>
+#include <helper/types.h>
+#include <jtag/jtag.h>
+#include <helper/ioutil.h>
+#include <helper/configuration.h>
+
+#include <server/server.h>
+#include <server/telnet_server.h>
+#include <server/gdb_server.h>
+#include <openocd.h>
+
+#include <helper/time_support.h>
 #include <sys/time.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -252,11 +249,21 @@ int zy1000_configuration_output_handler_log(struct command_context *context,
 }
 
 #ifdef CYGPKG_PROFILE_GPROF
+//extern int64_t totaltime;
 
-int eCosBoard_handle_eCosBoard_profile_command(struct command_context *cmd_ctx, char *cmd, char **args, int argc)
+static int zylinjtag_Jim_Command_profile(Jim_Interp *interp, int argc,
+		Jim_Obj * const *argv)
 {
-	command_print(cmd_ctx, "Profiling started");
-	start_profile();
+	if ((argc == 2) && (strcmp(Jim_GetString(argv[1], NULL), "stats")==0))
+	{
+//		profile_off();
+		//LOG_USER("Stats %dms sleeping in select()", (int)totaltime);
+	} else
+	{
+		LOG_USER("Profiling started");
+		start_profile();
+		//totaltime = 0;
+	}
 	return ERROR_OK;
 }
 
@@ -942,8 +949,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
@@ -1080,17 +1085,12 @@ int main(int argc, char *argv[])
 	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
-	COMMAND_REGISTER(cmd_ctx, NULL, "ecosboard_profile", eCosBoard_handle_eCosBoard_profile_command,
-			COMMAND_ANY, NULL);
+	Jim_CreateCommand(httpstate.jim_interp, "zy1000_profile", zylinjtag_Jim_Command_profile,
+			NULL, NULL);
 #endif
 
 	Jim_CreateCommand(httpstate.jim_interp, "uart", zylinjtag_Jim_Command_uart, NULL, NULL);
@@ -1113,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");