X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fopenocd.c;h=656644649e94f865e46c55a776a7847f06be980b;hb=624aa80f8478a9beb3ee9497a535a80ec2d42638;hp=df4f8a9fc38fc11e0e57d3bee073ef7fe82223e0;hpb=59ff8d24d84ad734ca470aa37e9516be806499c9;p=openocd.git

diff --git a/src/openocd.c b/src/openocd.c
index df4f8a9fc3..656644649e 100644
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -24,47 +24,34 @@
  *   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
 
-#include "log.h"
-#include "types.h"
 #include "jtag.h"
 #include "configuration.h"
 #include "xsvf.h"
+#include "svf.h"
 #include "target.h"
 #include "flash.h"
 #include "nand.h"
 #include "pld.h"
 #include "mflash.h"
 
-#include "command.h"
 #include "server.h"
 #include "telnet_server.h"
 #include "gdb_server.h"
 #include "tcl_server.h"
 
-#include <sys/time.h>
-#include <sys/types.h>
+#ifdef HAVE_STRINGS_H
 #include <strings.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <errno.h>
-
-#ifdef _WIN32
-#include <malloc.h>
-#else
-#include <alloca.h>
 #endif
 
-#include "replacements.h"
 
-void print_version(void)
+#define OPENOCD_VERSION \
+		"Open On-Chip Debugger " VERSION " (" PKGBLDDATE ") " RELSTR PKGBLDREV
+
+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,7 +67,7 @@ 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;
@@ -90,7 +77,7 @@ int handle_version_command(struct command_context_s *cmd_ctx, char *cmd, char **
 	return ERROR_OK;
 }
 
-void exit_handler(void)
+static void exit_handler(void)
 {
 	/* close JTAG interface */
 	if (jtag && jtag->quit)
@@ -124,7 +111,7 @@ 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)
@@ -192,6 +179,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 +197,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 +221,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(). */