Cortex-M3: cleanup

[openocd.git] / src / ecosboard.c

diff --git a/src/ecosboard.c b/src/ecosboard.c
index 5d93936804a4494f9d35db31e46b7612796489c1..32eb085281505a146f4c9a136e9375105114cf2a 100644 (file)
--- a/src/ecosboard.c
+++ b/src/ecosboard.c
@@ -22,20 +22,17 @@
 #endif
 
 #include <helper/types.h>
-#include "jtag.h"
+#include <jtag/jtag.h>
 #include <helper/ioutil.h>
 #include <helper/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 <server/server.h>
+#include <server/telnet_server.h>
+#include <server/gdb_server.h>
+#include <openocd.h>
+
+#include <helper/time_support.h>
 
-#include <time_support.h>
 #include <sys/time.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -57,31 +54,12 @@
 #include <cyg/athttpd/cgi.h>
 #include <cyg/athttpd/forms.h>
 #include <cyg/discover/discover.h>
-#include <cyg/hal/hal_diag.h>
-#include <cyg/kernel/kapi.h>
-#include <cyg/io/serialio.h>
 #include <cyg/io/io.h>
+#include <cyg/io/serialio.h>
 #include <netinet/tcp.h>
-#include "rom.h"
-#include <sys/ioctl.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <net/if.h>
-#include <arpa/inet.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netdb.h>
-#include <netinet/in.h>
-#include <unistd.h>
-#include <arpa/inet.h>
-#include <stdio.h>
-#include <ifaddrs.h>
-#include <string.h>
-
-#include <unistd.h>
-#include <stdio.h>
+#include <cyg/hal/hal_diag.h>
 
-#include <openocd.h>
+#include "rom.h"
 
 #ifdef CYGPKG_HAL_NIOS2
 #define ZY1000_SER_DEV "/dev/uart_0"
@@ -253,11 +231,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;
 }
 
@@ -1083,8 +1071,8 @@ int main(int argc, char *argv[])
                return EXIT_FAILURE;
 
 #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);