X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fopenocd.c;h=cbb28b77ebf88d2bbd5503048fddc45d15867ee5;hp=777e630664a883792781713ec7e946b4b513f5d5;hb=c538a830cdaafa92c9e9a624d84915cc39cce05b;hpb=682910fdc24c8ae970b3cd1e5b4ff7042e0522be

diff --git a/src/openocd.c b/src/openocd.c
index 777e630664..cbb28b77eb 100644
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -29,17 +29,18 @@
 #endif
 
 #include "openocd.h"
-#include "jtag.h"
-#include "configuration.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 "mflash.h"
+#include <flash/mflash.h>
 
-#include "server.h"
-#include "gdb_server.h"
-#include "httpd.h"
+#include <server/server.h>
+#include <server/gdb_server.h>
+#include <server/httpd.h>
 
 #ifdef HAVE_STRINGS_H
 #include <strings.h>
@@ -85,8 +86,6 @@ static int log_target_callback_event_handler(struct target *target, enum target_
 	return ERROR_OK;
 }
 
-int ioutil_init(struct command_context *cmd_ctx);
-
 static bool init_at_startup = true;
 
 COMMAND_HANDLER(handle_noinit_command)
@@ -111,11 +110,9 @@ COMMAND_HANDLER(handle_init_command)
 
 	initialized = 1;
 
-	command_context_mode(CMD_CTX, COMMAND_EXEC);
-
-	if (target_init(CMD_CTX) != ERROR_OK)
+	retval = command_run_line(CMD_CTX, "target init");
+	if (ERROR_OK != retval)
 		return ERROR_FAIL;
-	LOG_DEBUG("target init complete");
 
 	if ((retval = jtag_interface_init(CMD_CTX)) != ERROR_OK)
 	{
@@ -126,28 +123,26 @@ COMMAND_HANDLER(handle_init_command)
 
 	/* Try to initialize & examine the JTAG chain at this point, but
 	 * continue startup regardless */
-	if (jtag_init(CMD_CTX) == ERROR_OK)
+	if (command_run_line(CMD_CTX, "jtag init") == ERROR_OK)
 	{
-		LOG_DEBUG("jtag init complete");
-		if (target_examine() == ERROR_OK)
-		{
-			LOG_DEBUG("jtag examine complete");
-		}
+		command_context_mode(CMD_CTX, COMMAND_EXEC);
+		LOG_DEBUG("Examining targets...");
+		if (target_examine() != ERROR_OK)
+			LOG_DEBUG("target examination failed");
+		command_context_mode(CMD_CTX, COMMAND_CONFIG);
 	}
+	else
+		LOG_WARNING("jtag initialization failed; try 'jtag init' again.");
 
-	if (flash_init_drivers(CMD_CTX) != ERROR_OK)
+	if (command_run_line(CMD_CTX, "flash init") != ERROR_OK)
 		return ERROR_FAIL;
-	LOG_DEBUG("flash init complete");
 
-	if (mflash_init_drivers(CMD_CTX) != ERROR_OK)
+	if (command_run_line(CMD_CTX, "mflash init") != ERROR_OK)
 		return ERROR_FAIL;
-	LOG_DEBUG("mflash init complete");
 
-	if (nand_init(CMD_CTX) != ERROR_OK)
+	if (command_run_line(CMD_CTX, "nand init") != ERROR_OK)
 		return ERROR_FAIL;
-	LOG_DEBUG("NAND init complete");
 
-	command_context_mode(CMD_CTX, COMMAND_CONFIG);
 	if (command_run_line(CMD_CTX, "pld init") != ERROR_OK)
 		return ERROR_FAIL;
 	command_context_mode(CMD_CTX, COMMAND_EXEC);
@@ -219,20 +214,6 @@ struct command_context *setup_command_handler(Jim_Interp *interp)
 	return cmd_ctx;
 }
 
-#if !BUILD_HTTPD && !BUILD_ECOSBOARD
-/* implementations of OpenOCD that uses multithreading needs to know when
- * OpenOCD is sleeping. No-op in vanilla OpenOCD
- */
-void openocd_sleep_prelude(void)
-{
-}
-
-void openocd_sleep_postlude(void)
-{
-}
-#endif
-
-
 /* normally this is the main() function entry, but if OpenOCD is linked
  * into application, then this fn will not be invoked, but rather that
  * application will have it's own implementation of main(). */
@@ -245,12 +226,8 @@ int openocd_main(int argc, char *argv[])
 
 	cmd_ctx = setup_command_handler(NULL);
 
-#if BUILD_IOUTIL
 	if (ioutil_init(cmd_ctx) != ERROR_OK)
-	{
 		return EXIT_FAILURE;
-	}
-#endif
 
 	LOG_OUTPUT("For bug reports, read\n\t"
 		"http://openocd.berlios.de/doc/doxygen/bugs.html"
@@ -267,10 +244,8 @@ int openocd_main(int argc, char *argv[])
 	if (ret != ERROR_OK)
 		return EXIT_FAILURE;
 
-#if BUILD_HTTPD
 	if (httpd_start(cmd_ctx) != ERROR_OK)
 		return EXIT_FAILURE;
-#endif
 
 	ret = server_init(cmd_ctx);
 	if (ERROR_OK != ret)
@@ -289,9 +264,7 @@ int openocd_main(int argc, char *argv[])
 
 	server_quit();
 
-#if BUILD_HTTPD
 	httpd_stop();
-#endif
 
 	unregister_all_commands(cmd_ctx, NULL);