X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fopenocd.c;h=bc4dc50f3e1b1eb44d007bc145cdc9d83ae3a2d9;hb=2df3ca97a70aa600a1dd0f8be59d0ad2d359c16e;hp=1cbbb625f131a2bb329b0763fb08e246b7775501;hpb=da9eedc0f2c338b8ad136a4436a7781edc4a8884;p=openocd.git

diff --git a/src/openocd.c b/src/openocd.c
index 1cbbb625f1..bc4dc50f3e 100644
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -18,7 +18,7 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#define OPENOCD_VERSION "Open On-Chip Debugger (2006-08-20 17:00 CEST)"
+#define OPENOCD_VERSION "Open On-Chip Debugger " VERSION " (" PKGBLDDATE ") svn:" PKGBLDREV
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -32,6 +32,8 @@
 #include "xsvf.h"
 #include "target.h"
 #include "flash.h"
+#include "nand.h"
+#include "pld.h"
 
 #include "command.h"
 #include "server.h"
@@ -55,6 +57,24 @@ int handle_version_command(struct command_context_s *cmd_ctx, char *cmd, char **
 	return ERROR_OK;
 }
 
+void exit_handler(void)
+{
+	/* close JTAG interface */
+	if (jtag && jtag->quit)
+		jtag->quit();
+}
+
+/* implementations of OpenOCD that uses multithreading needs to lock OpenOCD while calling
+ * OpenOCD fn's. No-op in vanilla OpenOCD
+ */
+void lockBigLock()
+{
+}
+void unlockBigLock()
+{
+}
+
+
 int main(int argc, char *argv[])
 {
 	/* initialize commandline interface */
@@ -63,7 +83,7 @@ int main(int argc, char *argv[])
 
 	register_command(cmd_ctx, NULL, "version", handle_version_command,
 					 COMMAND_EXEC, "show OpenOCD version");
-	
+
 	/* register subsystem commands */
 	server_register_commands(cmd_ctx);
 	telnet_register_commands(cmd_ctx);
@@ -74,12 +94,15 @@ int main(int argc, char *argv[])
 	xsvf_register_commands(cmd_ctx);
 	target_register_commands(cmd_ctx);
 	flash_register_commands(cmd_ctx);
+	nand_register_commands(cmd_ctx);
+	pld_register_commands(cmd_ctx);
 	
 	if (log_init(cmd_ctx) != ERROR_OK)
 		return EXIT_FAILURE;
-	DEBUG("log init complete");
+	LOG_DEBUG("log init complete");
 	
-	INFO( OPENOCD_VERSION );
+	LOG_OUTPUT( OPENOCD_VERSION "\n" );
+	LOG_OUTPUT( "$URL$\n");
 
 	cfg_cmd_ctx = copy_command_context(cmd_ctx);
 	cfg_cmd_ctx->mode = COMMAND_CONFIG;
@@ -93,33 +116,51 @@ int main(int argc, char *argv[])
 	
 	command_done(cfg_cmd_ctx);
 
+	command_set_output_handler(cmd_ctx, configuration_output_handler, NULL);
+
+	atexit(exit_handler);
+
 	if (jtag_init(cmd_ctx) != ERROR_OK)
 		return EXIT_FAILURE;
-	DEBUG("jtag init complete");
+	LOG_DEBUG("jtag init complete");
 
 	if (target_init(cmd_ctx) != ERROR_OK)
 		return EXIT_FAILURE;
-	DEBUG("target init complete");
+	LOG_DEBUG("target init complete");
+
+	if (flash_init_drivers(cmd_ctx) != ERROR_OK)
+		return EXIT_FAILURE;
+	LOG_DEBUG("flash init complete");
+
+	if (nand_init(cmd_ctx) != ERROR_OK)
+		return EXIT_FAILURE;
+	LOG_DEBUG("NAND init complete");
 
-	if (flash_init(cmd_ctx) != ERROR_OK)
+	if (pld_init(cmd_ctx) != ERROR_OK)
 		return EXIT_FAILURE;
-	DEBUG("flash init complete");
+	LOG_DEBUG("pld init complete");
 
 	/* initialize tcp server */
 	server_init();
-	
+
 	/* initialize telnet subsystem */
 	telnet_init("Open On-Chip Debugger");
 	gdb_init();
 
+	/* call any target resets */
+	if (target_init_reset(cmd_ctx) != ERROR_OK)
+		return EXIT_FAILURE;
+	LOG_DEBUG("target init reset complete");
+
 	/* handle network connections */
 	server_loop(cmd_ctx);
-	
+
 	/* shut server down */
 	server_quit();
-	
+
 	/* free commandline interface */
 	command_done(cmd_ctx);
-	
+
 	return EXIT_SUCCESS;
 }
+