X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fopenocd.c;h=a8f12a8b93777c337853d584be414626ce36995e;hb=a29ed2421268934bb353946972584bd746c788e1;hp=502e9740e368249a572644a56ba026a145a7b53f;hpb=c7383a8bea5743ee05928c35eb7c35fd3094b225;p=openocd

diff --git a/src/openocd.c b/src/openocd.c
index 502e9740..a8f12a8b 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-01-26 13:30 CET)"
+#define OPENOCD_VERSION "Open On-Chip Debugger " VERSION " (" PKGBLDDATE ") svn:" PKGBLDREV
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -32,6 +32,7 @@
 #include "xsvf.h"
 #include "target.h"
 #include "flash.h"
+#include "nand.h"
 #include "pld.h"
 
 #include "command.h"
@@ -56,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 */
@@ -75,6 +83,7 @@ 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)
@@ -82,6 +91,7 @@ int main(int argc, char *argv[])
 	DEBUG("log init complete");
 	
 	INFO( OPENOCD_VERSION );
+	INFO( "$URL$");
 
 	cfg_cmd_ctx = copy_command_context(cmd_ctx);
 	cfg_cmd_ctx->mode = COMMAND_CONFIG;
@@ -97,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");
@@ -105,10 +117,14 @@ 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");
 
+	if (nand_init(cmd_ctx) != ERROR_OK)
+		return EXIT_FAILURE;
+	DEBUG("NAND init complete");
+
 	if (pld_init(cmd_ctx) != ERROR_OK)
 		return EXIT_FAILURE;
 	DEBUG("pld init complete");
@@ -119,7 +135,12 @@ int main(int argc, char *argv[])
 	/* 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);