X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fopenocd.c;h=57d2dc4bae04d329cf4668ccda002d7698860ce9;hb=20e4e77cdf366dedac21ff5670c54291feadfc05;hp=9e71dbeb20ca6333e4afbb3845ec65e21237d70d;hpb=1960973baf8022b4525e3ac94aed8dace7f9b478;p=openocd.git

diff --git a/src/openocd.c b/src/openocd.c
index 9e71dbeb20..57d2dc4bae 100644
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -18,10 +18,10 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#define OPENOCD_VERSION "Open On-Chip Debugger (2006-06-25 23:00 CEST)"
+#define OPENOCD_VERSION "Open On-Chip Debugger (2007-07-31 19:00 CEST)"
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif
 
 #include "log.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"
@@ -40,13 +42,9 @@
 
 #include <sys/time.h>
 #include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/poll.h>
 #include <strings.h>
-#include <netinet/in.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <signal.h>
 #include <string.h>
 #include <unistd.h>
 #include <errno.h>
@@ -59,6 +57,12 @@ 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 */
@@ -78,6 +82,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;
@@ -97,6 +103,10 @@ 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");
@@ -109,6 +119,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();
 	
@@ -119,6 +137,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);