X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fopenocd.c;h=3f0e14289f047d3a75e309ff5d083e5ccce999f4;hp=a5002d19268b1f58c167bc18c9acf07002816404;hb=5165afc00562d175aa3a0d752a8c709e23984ed9;hpb=3b7c9585db2dd49b48123d50e9e8af7bc527be52

diff --git a/src/openocd.c b/src/openocd.c
index a5002d1926..3f0e14289f 100644
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -31,7 +31,7 @@
 #include "openocd.h"
 #include <jtag/driver.h>
 #include <jtag/jtag.h>
-#include <jtag/transport.h>
+#include <transport/transport.h>
 #include <helper/ioutil.h>
 #include <helper/util.h>
 #include <helper/configuration.h>
@@ -47,7 +47,6 @@
 #include <strings.h>
 #endif
 
-
 #define OPENOCD_VERSION \
 		"Open On-Chip Debugger " VERSION RELSTR " (" PKGBLDDATE ")"
 
@@ -62,15 +61,15 @@ static int jim_version_command(Jim_Interp *interp, int argc,
 	const char *str = "";
 	char * version_str;
 	version_str = OPENOCD_VERSION;
-	
+
 	if (argc == 2)
 		str = Jim_GetString(argv[1], NULL);
 
 	if (strcmp("git", str) == 0)
 	{
 		version_str = GITVERSION;
-	} 
-	
+	}
+
 	Jim_SetResult(interp, Jim_NewStringObj(interp, version_str, -1));
 
 	return JIM_OK;
@@ -184,29 +183,6 @@ COMMAND_HANDLER(handle_add_script_search_dir_command)
 	return ERROR_OK;
 }
 
-
-static int jim_stacktrace_command(Jim_Interp *interp, int argc,
-		Jim_Obj * const *argv)
-{
-	if (argc != 1)
-	{
-		return JIM_ERR;
-	}
-	Jim_Obj * stacktrace = Jim_DuplicateObj(interp, interp->stackTrace);
-	
-	/* insert actual error site at beginning of list*/
-	Jim_Obj *procname = Jim_NewStringObj(interp, "", -1); /* Uhhh... don't know this one. */
-	Jim_ListInsertElements(interp, stacktrace, 0, 1, &procname);
-	Jim_Obj *filename = Jim_NewStringObj(interp, interp->errorFileName, -1);
-	Jim_ListInsertElements(interp, stacktrace, 1, 1, &filename);
-	Jim_Obj *line = Jim_NewIntObj(interp, interp->errorLine);
-	Jim_ListInsertElements(interp, stacktrace, 2, 1, &line);
-
-	Jim_SetResult(interp, stacktrace);
-
-	return JIM_OK;
-}
-
 static const struct command_registration openocd_command_handlers[] = {
 	{
 		.name = "version",
@@ -237,14 +213,6 @@ static const struct command_registration openocd_command_handlers[] = {
 		.help = "dir to search for config files and scripts",
 
 	},
-	{
-		.name = "stacktrace",
-		.jim_handler = jim_stacktrace_command,
-		.mode = COMMAND_ANY,
-		.help = "returns the stacktrace as a list of triples: proc, file, line."
-		"The stack trace is reset when a new stack trace is being built after "
-		"a new failure has occurred.",
-	},
 	COMMAND_REGISTRATION_DONE
 };
 
@@ -301,7 +269,11 @@ struct command_context *setup_command_handler(Jim_Interp *interp)
 	return cmd_ctx;
 }
 
-static int main2(int argc, char *argv[], struct command_context *cmd_ctx)
+/** OpenOCD runtime meat that can become single-thread in future. It parse
+ * commandline, reads configuration, sets up the target and starts server loop.
+ * Commandline arguments are passed into this function from openocd_main().
+ */
+static int openocd_thread(int argc, char *argv[], struct command_context *cmd_ctx)
 {
 	int ret;
 
@@ -319,10 +291,6 @@ static int main2(int argc, char *argv[], struct command_context *cmd_ctx)
 	if (ERROR_OK != ret)
 		return EXIT_FAILURE;
 
-	ret = command_run_line(cmd_ctx, "init_targets");
-	if (ERROR_OK != ret)
-		ret = EXIT_FAILURE;
-
 	if (init_at_startup)
 	{
 		ret = command_run_line(cmd_ctx, "init");
@@ -356,13 +324,14 @@ int openocd_main(int argc, char *argv[])
 		return EXIT_FAILURE;
 
 	LOG_OUTPUT("For bug reports, read\n\t"
-		"http://openocd.berlios.de/doc/doxygen/bugs.html"
+		"http://openocd.sourceforge.net/doc/doxygen/bugs.html"
 		"\n");
 
 	command_context_mode(cmd_ctx, COMMAND_CONFIG);
 	command_set_output_handler(cmd_ctx, configuration_output_handler, NULL);
 
-	ret = main2(argc, argv, cmd_ctx);
+	/* Start the executable meat that can evolve into thread in future. */
+	ret = openocd_thread(argc, argv, cmd_ctx);
 
 	unregister_all_commands(cmd_ctx, NULL);