X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fopenocd.c;h=839a6bb10d1a07052f6158c35916493044768c6d;hp=471a097a4bf09307704c7883e6b96dbc2d3883fc;hb=7c7fed0283e5c6e434de94af443218ef78175e87;hpb=0fc19255c365a59acf4683d177bacf662e84d4f1

diff --git a/src/openocd.c b/src/openocd.c
index 471a097a4b..839a6bb10d 100644
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -24,8 +24,6 @@
  *   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"
 #endif
@@ -35,6 +33,7 @@
 #include "jtag.h"
 #include "configuration.h"
 #include "xsvf.h"
+#include "svf.h"
 #include "target.h"
 #include "flash.h"
 #include "nand.h"
@@ -48,7 +47,6 @@
 #include "tcl_server.h"
 
 #include <sys/time.h>
-#include <sys/types.h>
 #include <strings.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -56,15 +54,11 @@
 #include <unistd.h>
 #include <errno.h>
 
-#ifdef _WIN32
-#include <malloc.h>
-#else
-#include <alloca.h>
-#endif
 
-#include "replacements.h"
+#define OPENOCD_VERSION \
+		"Open On-Chip Debugger " VERSION " (" PKGBLDDATE ") " RELSTR PKGBLDREV
 
-void print_version(void)
+static void print_version(void)
 {
 	/* 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 */
@@ -80,14 +74,17 @@ void print_version(void)
 }
 
 /* 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)
+static int handle_version_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
 {
+	if (argc!=0)
+		return ERROR_COMMAND_SYNTAX_ERROR;
+
 	command_print(cmd_ctx, OPENOCD_VERSION);
 
 	return ERROR_OK;
 }
 
-void exit_handler(void)
+static void exit_handler(void)
 {
 	/* close JTAG interface */
 	if (jtag && jtag->quit)
@@ -121,8 +118,12 @@ static int log_target_callback_event_handler(struct target_s *target, enum targe
 int ioutil_init(struct command_context_s *cmd_ctx);
 
 /* OpenOCD can't really handle failure of this command. Patches welcome! :-) */
-int handle_init_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+static int handle_init_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
 {
+
+	if (argc!=0)
+		return ERROR_COMMAND_SYNTAX_ERROR;
+
 	int retval;
 	static int initialized=0;
 	if (initialized)
@@ -132,13 +133,6 @@ int handle_init_command(struct command_context_s *cmd_ctx, char *cmd, char **arg
 
 	atexit(exit_handler);
 
-#if BUILD_IOUTIL
-	if (ioutil_init(cmd_ctx) != ERROR_OK)
-	{
-		return ERROR_FAIL;
-	}
-#endif
-
 	if (target_init(cmd_ctx) != ERROR_OK)
 		return ERROR_FAIL;
 	LOG_DEBUG("target init complete");
@@ -192,6 +186,7 @@ int handle_init_command(struct command_context_s *cmd_ctx, char *cmd, char **arg
 
 command_context_t *global_cmd_ctx;
 
+/* NB! this fn can be invoked outside this file for non PC hosted builds */
 command_context_t *setup_command_handler(void)
 {
 	command_context_t *cmd_ctx;
@@ -209,6 +204,7 @@ command_context_t *setup_command_handler(void)
 	log_register_commands(cmd_ctx);
 	jtag_register_commands(cmd_ctx);
 	xsvf_register_commands(cmd_ctx);
+	svf_register_commands(cmd_ctx);
 	target_register_commands(cmd_ctx);
 	flash_register_commands(cmd_ctx);
 	nand_register_commands(cmd_ctx);
@@ -232,6 +228,21 @@ command_context_t *setup_command_handler(void)
 int httpd_start(void);
 void httpd_stop(void);
 
+
+#if !BUILD_HTTPD && !BUILD_ECOSBOARD
+/* implementations of OpenOCD that uses multithreading needs to know when
+ * OpenOCD is sleeping. No-op in vanilla OpenOCD
+ */
+void openocd_sleep_prelude(void)
+{
+}
+
+void openocd_sleep_postlude(void)
+{
+}
+#endif
+
+
 /* normally this is the main() function entry, but if OpenOCD is linked
  * into application, then this fn will not be invoked, but rather that
  * application will have it's own implementation of main(). */
@@ -244,6 +255,13 @@ int openocd_main(int argc, char *argv[])
 
 	cmd_ctx = setup_command_handler();
 
+#if BUILD_IOUTIL
+	if (ioutil_init(cmd_ctx) != ERROR_OK)
+	{
+		return EXIT_FAILURE;
+	}
+#endif
+
 	LOG_OUTPUT("\n\nBUGS? Read http://svn.berlios.de/svnroot/repos/openocd/trunk/BUGS\n\n\n");
 
 	print_version();