change #include "jtag.h" to <jtag/jtag.h>

[fw/openocd] / src / openocd.c

diff --git a/src/openocd.c b/src/openocd.c
index 2a65b4d87a198f93306ffe77810d2ec53ae77a87..38eb57b0c76933151ef856a812eb91df87233ee6 100644 (file)
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -29,8 +29,9 @@
 #endif
 
 #include "openocd.h"
-#include "jtag.h"
-#include "configuration.h"
+#include <jtag/jtag.h>
+#include <helper/ioutil.h>
+#include <helper/configuration.h>
 #include "xsvf.h"
 #include "svf.h"
 #include "nand.h"
@@ -60,10 +61,6 @@ COMMAND_HANDLER(handle_version_command)
        return ERROR_OK;
 }
 
-static void exit_handler(void)
-{
-       jtag_interface_quit();
-}
 
 static int log_target_callback_event_handler(struct target *target, enum target_event event, void *priv)
 {
@@ -89,8 +86,6 @@ static int log_target_callback_event_handler(struct target *target, enum target_
        return ERROR_OK;
 }
 
-int ioutil_init(struct command_context *cmd_ctx);
-
 static bool init_at_startup = true;
 
 COMMAND_HANDLER(handle_noinit_command)
@@ -115,13 +110,9 @@ COMMAND_HANDLER(handle_init_command)
 
        initialized = 1;
 
-       atexit(exit_handler);
-
-       command_context_mode(CMD_CTX, COMMAND_EXEC);
-
-       if (target_init(CMD_CTX) != ERROR_OK)
+       retval = command_run_line(CMD_CTX, "target init");
+       if (ERROR_OK != retval)
                return ERROR_FAIL;
-       LOG_DEBUG("target init complete");
 
        if ((retval = jtag_interface_init(CMD_CTX)) != ERROR_OK)
        {
@@ -132,30 +123,29 @@ COMMAND_HANDLER(handle_init_command)
 
        /* Try to initialize & examine the JTAG chain at this point, but
         * continue startup regardless */
-       if (jtag_init(CMD_CTX) == ERROR_OK)
+       if (command_run_line(CMD_CTX, "jtag init") == ERROR_OK)
        {
-               LOG_DEBUG("jtag init complete");
-               if (target_examine() == ERROR_OK)
-               {
-                       LOG_DEBUG("jtag examine complete");
-               }
+               command_context_mode(CMD_CTX, COMMAND_EXEC);
+               LOG_DEBUG("Examining targets...");
+               if (target_examine() != ERROR_OK)
+                       LOG_DEBUG("target examination failed");
+               command_context_mode(CMD_CTX, COMMAND_CONFIG);
        }
+       else
+               LOG_WARNING("jtag initialization failed; try 'jtag init' again.");
 
-       if (flash_init_drivers(CMD_CTX) != ERROR_OK)
+       if (command_run_line(CMD_CTX, "flash init") != ERROR_OK)
                return ERROR_FAIL;
-       LOG_DEBUG("flash init complete");
 
-       if (mflash_init_drivers(CMD_CTX) != ERROR_OK)
+       if (command_run_line(CMD_CTX, "mflash init") != ERROR_OK)
                return ERROR_FAIL;
-       LOG_DEBUG("mflash init complete");
 
-       if (nand_init(CMD_CTX) != ERROR_OK)
+       if (command_run_line(CMD_CTX, "nand init") != ERROR_OK)
                return ERROR_FAIL;
-       LOG_DEBUG("NAND init complete");
 
-       if (pld_init(CMD_CTX) != ERROR_OK)
+       if (command_run_line(CMD_CTX, "pld init") != ERROR_OK)
                return ERROR_FAIL;
-       LOG_DEBUG("pld init complete");
+       command_context_mode(CMD_CTX, COMMAND_EXEC);
 
        /* initialize telnet subsystem */
        gdb_target_add_all(all_targets);
@@ -194,14 +184,14 @@ static const struct command_registration openocd_command_handlers[] = {
 struct command_context *global_cmd_ctx;
 
 /* NB! this fn can be invoked outside this file for non PC hosted builds */
-struct command_context *setup_command_handler(void)
+struct command_context *setup_command_handler(Jim_Interp *interp)
 {
        log_init();
        LOG_DEBUG("log_init: complete");
 
        struct command_context *cmd_ctx;
 
-       global_cmd_ctx = cmd_ctx = command_init(openocd_startup_tcl);
+       global_cmd_ctx = cmd_ctx = command_init(openocd_startup_tcl, interp);
 
        register_commands(cmd_ctx, NULL, openocd_command_handlers);
        /* register subsystem commands */
@@ -224,20 +214,6 @@ struct command_context *setup_command_handler(void)
        return cmd_ctx;
 }
 
-#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(). */
@@ -248,14 +224,10 @@ int openocd_main(int argc, char *argv[])
        /* initialize commandline interface */
        struct command_context *cmd_ctx;
 
-       cmd_ctx = setup_command_handler();
+       cmd_ctx = setup_command_handler(NULL);
 
-#if BUILD_IOUTIL
        if (ioutil_init(cmd_ctx) != ERROR_OK)
-       {
                return EXIT_FAILURE;
-       }
-#endif
 
        LOG_OUTPUT("For bug reports, read\n\t"
                "http://openocd.berlios.de/doc/doxygen/bugs.html"
@@ -272,12 +244,10 @@ int openocd_main(int argc, char *argv[])
        if (ret != ERROR_OK)
                return EXIT_FAILURE;
 
-#if BUILD_HTTPD
        if (httpd_start(cmd_ctx) != ERROR_OK)
                return EXIT_FAILURE;
-#endif
 
-       ret = server_init();
+       ret = server_init(cmd_ctx);
        if (ERROR_OK != ret)
                return EXIT_FAILURE;
 
@@ -294,14 +264,14 @@ int openocd_main(int argc, char *argv[])
 
        server_quit();
 
-#if BUILD_HTTPD
        httpd_stop();
-#endif
 
        unregister_all_commands(cmd_ctx, NULL);
 
        /* free commandline interface */
        command_done(cmd_ctx);
 
+       jtag_interface_quit();
+
        return ret;
 }