X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fopenocd.c;h=c68bdfa3efd783e80b11e925975264f72bd6e0d2;hp=9601b9ef1baf96969f39310d34e61a3b6709a3e1;hb=fb2c70916630d9fe9ee9d721d3af6ad865b33cc0;hpb=f94d66d7c5f3c018ba72593b720746e4c5be1a16

diff --git a/src/openocd.c b/src/openocd.c
index 9601b9ef1b..c68bdfa3ef 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 (2007-05-30 17:45 CEST)"
+#define OPENOCD_VERSION "Open On-Chip Debugger " VERSION " (" PKGBLDDATE ") svn:" PKGBLDREV
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -57,6 +57,13 @@ 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();
+}
+
 int main(int argc, char *argv[])
 {
 	/* initialize commandline interface */
@@ -65,7 +72,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);
@@ -83,7 +90,8 @@ int main(int argc, char *argv[])
 		return EXIT_FAILURE;
 	DEBUG("log init complete");
 	
-	INFO( OPENOCD_VERSION );
+	OUTPUT( OPENOCD_VERSION );
+	OUTPUT( "$URL$");
 
 	cfg_cmd_ctx = copy_command_context(cmd_ctx);
 	cfg_cmd_ctx->mode = COMMAND_CONFIG;
@@ -99,6 +107,8 @@ int main(int argc, char *argv[])
 
 	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");
@@ -107,7 +117,7 @@ int main(int argc, char *argv[])
 		return EXIT_FAILURE;
 	DEBUG("target init complete");
 
-	if (flash_init(cmd_ctx) != ERROR_OK)
+	if (flash_init_drivers(cmd_ctx) != ERROR_OK)
 		return EXIT_FAILURE;
 	DEBUG("flash init complete");
 
@@ -121,19 +131,24 @@ int main(int argc, char *argv[])
 
 	/* 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;
+	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;
 }