X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fopenocd.c;h=86b8aaf27ff384e6dd57b0ea9756e3e677490907;hp=226a7310ad6fd1b3b6f266bd908c2b9861228845;hb=b1f7b35983eade493bfadd9e5abee4ae3dab630d;hpb=6cacbd9575e03c37057719a97bf260217c4e275f

diff --git a/src/openocd.c b/src/openocd.c
index 226a7310ad..86b8aaf27f 100644
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -2,7 +2,7 @@
  *   Copyright (C) 2005 by Dominic Rath                                    *
  *   Dominic.Rath@gmx.de                                                   *
  *                                                                         *
- *   Copyright (C) 2007,2008 Øyvind Harboe                                 *
+ *   Copyright (C) 2007,2008 Øyvind Harboe                                 *
  *   oyvind.harboe@zylin.com                                               *
  *                                                                         *
  *   Copyright (C) 2008 Richard Missenden                                  *
@@ -28,8 +28,6 @@
 #include "config.h"
 #endif
 
-#include "log.h"
-#include "types.h"
 #include "jtag.h"
 #include "configuration.h"
 #include "xsvf.h"
@@ -40,24 +38,18 @@
 #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>
+#endif
 
 
 #define OPENOCD_VERSION \
-		"Open On-Chip Debugger " VERSION " (" PKGBLDDATE ") " RELSTR PKGBLDREV
+		"Open On-Chip Debugger " VERSION RELSTR " (" PKGBLDDATE ")"
 
 static void print_version(void)
 {
@@ -77,7 +69,7 @@ static void print_version(void)
 /* Give TELNET a way to find out what version this is */
 static int handle_version_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
 {
-	if (argc!=0)
+	if (argc != 0)
 		return ERROR_COMMAND_SYNTAX_ERROR;
 
 	command_print(cmd_ctx, OPENOCD_VERSION);
@@ -87,9 +79,7 @@ static int handle_version_command(struct command_context_s *cmd_ctx, char *cmd,
 
 static void exit_handler(void)
 {
-	/* close JTAG interface */
-	if (jtag && jtag->quit)
-		jtag->quit();
+	jtag_interface_quit();
 }
 
 static int log_target_callback_event_handler(struct target_s *target, enum target_event event, void *priv)
@@ -97,10 +87,10 @@ static int log_target_callback_event_handler(struct target_s *target, enum targe
 	switch (event)
 	{
 		case TARGET_EVENT_GDB_START:
-			target->display=0;
+			target->display = 0;
 			break;
 		case TARGET_EVENT_GDB_END:
-			target->display=1;
+			target->display = 1;
 			break;
 		case TARGET_EVENT_HALTED:
 			if (target->display)
@@ -122,15 +112,15 @@ int ioutil_init(struct command_context_s *cmd_ctx);
 static int handle_init_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
 {
 
-	if (argc!=0)
+	if (argc != 0)
 		return ERROR_COMMAND_SYNTAX_ERROR;
 
 	int retval;
-	static int initialized=0;
+	static int initialized = 0;
 	if (initialized)
 		return ERROR_OK;
 
-	initialized=1;
+	initialized = 1;
 
 	atexit(exit_handler);
 
@@ -138,7 +128,7 @@ static int handle_init_command(struct command_context_s *cmd_ctx, char *cmd, cha
 		return ERROR_FAIL;
 	LOG_DEBUG("target init complete");
 
-	if ((retval=jtag_interface_init(cmd_ctx)) != ERROR_OK)
+	if ((retval = jtag_interface_init(cmd_ctx)) != ERROR_OK)
 	{
 		/* we must be able to set up the jtag interface */
 		return retval;
@@ -187,7 +177,8 @@ static int handle_init_command(struct command_context_s *cmd_ctx, char *cmd, cha
 
 command_context_t *global_cmd_ctx;
 
-static command_context_t *setup_command_handler(void)
+/* 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;
 
@@ -217,7 +208,7 @@ static command_context_t *setup_command_handler(void)
 	}
 	LOG_DEBUG("log init complete");
 
-	LOG_OUTPUT( OPENOCD_VERSION "\n" );
+	LOG_OUTPUT(OPENOCD_VERSION "\n");
 
 	register_command(cmd_ctx, NULL, "init", handle_init_command,
 					 COMMAND_ANY, "initializes target and servers - nop on subsequent invocations");
@@ -229,7 +220,7 @@ int httpd_start(void);
 void httpd_stop(void);
 
 
-#if !BUILD_HTTPD
+#if !BUILD_HTTPD && !BUILD_ECOSBOARD
 /* implementations of OpenOCD that uses multithreading needs to know when
  * OpenOCD is sleeping. No-op in vanilla OpenOCD
  */
@@ -262,10 +253,11 @@ int openocd_main(int argc, char *argv[])
 	}
 #endif
 
-	LOG_OUTPUT("\n\nBUGS? Read http://svn.berlios.de/svnroot/repos/openocd/trunk/BUGS\n\n\n");
-
 	print_version();
 
+	LOG_OUTPUT("For bug reports, read http://svn.berlios.de/svnroot/repos/openocd/trunk/BUGS\n");
+
+
 	command_context_mode(cmd_ctx, COMMAND_CONFIG);
 	command_set_output_handler(cmd_ctx, configuration_output_handler, NULL);
 
@@ -273,18 +265,18 @@ int openocd_main(int argc, char *argv[])
 		return EXIT_FAILURE;
 
 	ret = parse_config_file(cmd_ctx);
-	if ( (ret != ERROR_OK) && (ret != ERROR_COMMAND_CLOSE_CONNECTION) )
+	if ((ret != ERROR_OK) && (ret != ERROR_COMMAND_CLOSE_CONNECTION))
 		return EXIT_FAILURE;
 
 #if BUILD_HTTPD
-	if (httpd_start()!=ERROR_OK)
+	if (httpd_start() != ERROR_OK)
 		return EXIT_FAILURE;
 #endif
 
 	if (ret != ERROR_COMMAND_CLOSE_CONNECTION)
 	{
 		command_context_mode(cmd_ctx, COMMAND_EXEC);
-		if (command_run_line(cmd_ctx, "init")!=ERROR_OK)
+		if (command_run_line(cmd_ctx, "init") != ERROR_OK)
 			return EXIT_FAILURE;
 
 		/* handle network connections */