X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fopenocd.c;h=63ce65c12300ce577b8e326d9f4fd1423696ede9;hb=04dc98916d9acb57e0f5595534151a24ba4dc684;hp=71b111a0306131de94d6089747b5b3f37fe4ed77;hpb=8b4e882a1630d63bbc9840fa3f968e36b6ac3702;p=openocd

diff --git a/src/openocd.c b/src/openocd.c
index 71b111a0..63ce65c1 100644
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -18,8 +18,10 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
+#define OPENOCD_VERSION "Open On-Chip Debugger (2007-04-11 16:20 CEST)"
+
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif
 
 #include "log.h"
@@ -30,6 +32,8 @@
 #include "xsvf.h"
 #include "target.h"
 #include "flash.h"
+#include "nand.h"
+#include "pld.h"
 
 #include "command.h"
 #include "server.h"
@@ -38,22 +42,29 @@
 
 #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>
 
+/* Give TELNET a way to find out what version this is */
+int handle_version_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+{
+	command_print(cmd_ctx, OPENOCD_VERSION);
+
+	return ERROR_OK;
+}
+
 int main(int argc, char *argv[])
 {
 	/* initialize commandline interface */
 	command_context_t *cmd_ctx, *cfg_cmd_ctx;
 	cmd_ctx = command_init();
+
+	register_command(cmd_ctx, NULL, "version", handle_version_command,
+					 COMMAND_EXEC, "show OpenOCD version");
 	
 	/* register subsystem commands */
 	server_register_commands(cmd_ctx);
@@ -65,12 +76,14 @@ 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;
 	DEBUG("log init complete");
 	
-	INFO("Open On-Chip Debugger (Revision 63)");
+	INFO( OPENOCD_VERSION );
 
 	cfg_cmd_ctx = copy_command_context(cmd_ctx);
 	cfg_cmd_ctx->mode = COMMAND_CONFIG;
@@ -84,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");
@@ -96,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();
 	
@@ -106,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);