Andreas Fritiofson <andreas.fritiofson@gmail.com> UTF8 fixes

[openocd.git] / src / openocd.c

diff --git a/src/openocd.c b/src/openocd.c
index 4d76fd6c514e66944a9a92d926aec16f320adcd7..95c2f237db33bc4a05d43200f00d9badb67096a1 100644 (file)
--- 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,21 +38,14 @@
 #include "pld.h"
 #include "mflash.h"
 
-#include "command.h"
-#include "tclapi.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 \
@@ -78,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);
@@ -88,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)
@@ -98,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)
@@ -123,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);
 
@@ -139,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;
@@ -203,7 +192,6 @@ command_context_t *setup_command_handler(void)
        telnet_register_commands(cmd_ctx);
        gdb_register_commands(cmd_ctx);
        tcl_register_commands(cmd_ctx); /* tcl server commands */
-       tclapi_register_commands(cmd_ctx); /* misc tcl commands */
        log_register_commands(cmd_ctx);
        jtag_register_commands(cmd_ctx);
        xsvf_register_commands(cmd_ctx);
@@ -220,7 +208,7 @@ 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");
@@ -265,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);
 
@@ -276,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 */