X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fopenocd.c;h=ac8e2fea0d1122628544fe3426658555d7f399ba;hp=e52afd34f6728f21bfbb2e6b2d8dea31e5a00b59;hb=53d1f9b2ca5718e4996e9cf3406f857d0ed26df2;hpb=82d2633b5f550115e9e7c7d0520babb6680aa38f

diff --git a/src/openocd.c b/src/openocd.c
index e52afd34f6..ac8e2fea0d 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-07-15 12:00 CEST)"
+#define OPENOCD_VERSION "Open On-Chip Debugger (2007-06-14 12:00 CEST)"
 
 #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"
@@ -74,6 +76,8 @@ 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;
@@ -93,6 +97,8 @@ int main(int argc, char *argv[])
 	
 	command_done(cfg_cmd_ctx);
 
+	command_set_output_handler(cmd_ctx, configuration_output_handler, NULL);
+
 	if (jtag_init(cmd_ctx) != ERROR_OK)
 		return EXIT_FAILURE;
 	DEBUG("jtag init complete");
@@ -105,6 +111,14 @@ int main(int argc, char *argv[])
 		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");
+
 	/* initialize tcp server */
 	server_init();
 	
@@ -115,6 +129,9 @@ int main(int argc, char *argv[])
 	/* handle network connections */
 	server_loop(cmd_ctx);
 	
+	/* shut server down */
+	server_quit();
+	
 	/* free commandline interface */
 	command_done(cmd_ctx);