fix jtag run/idle state name courtesy of Jeff Williams <jeffw@gadgetworks.com> and...

[openocd.git] / src / openocd.c

diff --git a/src/openocd.c b/src/openocd.c
index e46f62d261b0c8eb644223bc8bd427648da4ce49..084b8a1d05be6361d4ec36d57fac59131ca254ad 100644 (file)
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -24,7 +24,7 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#define OPENOCD_VERSION "Open On-Chip Debugger " VERSION " (" PKGBLDDATE ") svn:" PKGBLDREV
+#define OPENOCD_VERSION "Open On-Chip Debugger " VERSION " (" PKGBLDDATE ") "RELSTR PKGBLDREV
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -35,6 +35,7 @@
 #include "jtag.h"
 #include "configuration.h"
 #include "xsvf.h"
+#include "svf.h"
 #include "target.h"
 #include "flash.h"
 #include "nand.h"
@@ -56,14 +57,6 @@
 #include <unistd.h>
 #include <errno.h>
 
-#ifdef _WIN32
-#include <malloc.h>
-#else
-#include <alloca.h>
-#endif
-
-#include "replacements.h"
-
 void print_version(void)
 {
        /* DANGER!!! make sure that the line below does not appear in a patch, do not remove */
@@ -139,13 +132,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");
@@ -216,6 +202,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);
@@ -251,6 +238,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();