X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fopenocd.c;h=3abc609e1438f838252e7c0373bd2bd2f865c125;hp=53ff45485a506d376112ab1b7b9f0922d325455c;hb=e9297b40b994f071474210e7d9e224d50e25fcaf;hpb=1341eb3b0aea74b939a5d7702f696b175d032647

diff --git a/src/openocd.c b/src/openocd.c
index 53ff45485a..3abc609e14 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-30 13:30 CEST)"
+#define OPENOCD_VERSION "Open On-Chip Debugger (2006-11-22 14:00 CEST)"
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -32,6 +32,7 @@
 #include "xsvf.h"
 #include "target.h"
 #include "flash.h"
+#include "pld.h"
 
 #include "command.h"
 #include "server.h"
@@ -74,6 +75,7 @@ int main(int argc, char *argv[])
 	xsvf_register_commands(cmd_ctx);
 	target_register_commands(cmd_ctx);
 	flash_register_commands(cmd_ctx);
+	pld_register_commands(cmd_ctx);
 	
 	if (log_init(cmd_ctx) != ERROR_OK)
 		return EXIT_FAILURE;
@@ -93,6 +95,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 +109,10 @@ int main(int argc, char *argv[])
 		return EXIT_FAILURE;
 	DEBUG("flash init complete");
 
+	if (pld_init(cmd_ctx) != ERROR_OK)
+		return EXIT_FAILURE;
+	DEBUG("pld init complete");
+
 	/* initialize tcp server */
 	server_init();
 	
@@ -115,6 +123,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);