X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fopenocd.c;h=fa2d2c6127a59953867621e9322d2417e60d52ae;hp=b0d0a844e92937654bbf54622fab2a319b0adda5;hb=769fa69b9ada68df69b5ca5c1139fda32940bf80;hpb=335f667d4433e8ca3a57e813fd128b78d8b364d2;ds=sidebyside

diff --git a/src/openocd.c b/src/openocd.c
index b0d0a844e9..fa2d2c6127 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 " VERSION " (" PKGBLDDATE ") svn:" PKGBLDREV
+
 #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,23 +42,48 @@
 
 #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;
+}
+
+void exit_handler(void)
+{
+	/* close JTAG interface */
+	if (jtag && jtag->quit)
+		jtag->quit();
+}
+
+/* implementations of OpenOCD that uses multithreading needs to lock OpenOCD while calling
+ * OpenOCD fn's. No-op in vanilla OpenOCD
+ */
+void lockBigLock()
+{
+}
+void unlockBigLock()
+{
+}
+
+
 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);
 	telnet_register_commands(cmd_ctx);
@@ -65,12 +94,27 @@ 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");
+	LOG_DEBUG("log init complete");
+	
+	LOG_OUTPUT( OPENOCD_VERSION "\n" );
 	
-	INFO("Open On-Chip Debugger (Revision 65)");
+	
+	/* DANGER!!! make sure that the line below does not appear in a patch, do not remove */
+	/* DANGER!!! make sure that the line below does not appear in a patch, do not remove */
+	/* DANGER!!! make sure that the line below does not appear in a patch, do not remove */
+	/* DANGER!!! make sure that the line below does not appear in a patch, do not remove */
+	/* DANGER!!! make sure that the line below does not appear in a patch, do not remove */
+	LOG_OUTPUT( "$URL$\n");
+	/* DANGER!!! make sure that the line above does not appear in a patch, do not remove */
+	/* DANGER!!! make sure that the line above does not appear in a patch, do not remove */
+	/* DANGER!!! make sure that the line above does not appear in a patch, do not remove */
+	/* DANGER!!! make sure that the line above does not appear in a patch, do not remove */
+	/* DANGER!!! make sure that the line above does not appear in a patch, do not remove */
 
 	cfg_cmd_ctx = copy_command_context(cmd_ctx);
 	cfg_cmd_ctx->mode = COMMAND_CONFIG;
@@ -84,30 +128,51 @@ 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");
+	LOG_DEBUG("jtag init complete");
 
 	if (target_init(cmd_ctx) != ERROR_OK)
 		return EXIT_FAILURE;
-	DEBUG("target init complete");
+	LOG_DEBUG("target init complete");
+
+	if (flash_init_drivers(cmd_ctx) != ERROR_OK)
+		return EXIT_FAILURE;
+	LOG_DEBUG("flash init complete");
 
-	if (flash_init(cmd_ctx) != ERROR_OK)
+	if (nand_init(cmd_ctx) != ERROR_OK)
 		return EXIT_FAILURE;
-	DEBUG("flash init complete");
+	LOG_DEBUG("NAND init complete");
+
+	if (pld_init(cmd_ctx) != ERROR_OK)
+		return EXIT_FAILURE;
+	LOG_DEBUG("pld init complete");
 
 	/* initialize tcp server */
 	server_init();
-	
+
 	/* 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;
+	LOG_DEBUG("target init reset complete");
+
 	/* handle network connections */
 	server_loop(cmd_ctx);
-	
+
+	/* shut server down */
+	server_quit();
+
 	/* free commandline interface */
 	command_done(cmd_ctx);
-	
+
 	return EXIT_SUCCESS;
 }
+