initial "transport" framework

[fw/openocd] / src / openocd.c

diff --git a/src/openocd.c b/src/openocd.c
index b6dc010e5844f3f27a4239ce19d3a7390db62db9..bba1e0bf9cbc28c4cd629277e014410a7961f102 100644 (file)
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -29,13 +29,13 @@
 #endif
 
 #include "openocd.h"
+#include <jtag/driver.h>
 #include <jtag/jtag.h>
+#include <jtag/transport.h>
 #include <helper/ioutil.h>
 #include <helper/configuration.h>
-#include <xsvf/xsvf.h>
-#include <svf/svf.h>
-#include <flash/flash.h>
-#include <flash/nand.h>
+#include <flash/nor/core.h>
+#include <flash/nand/core.h>
 #include <pld/pld.h>
 #include <flash/mflash.h>
 
@@ -62,7 +62,6 @@ COMMAND_HANDLER(handle_version_command)
        return ERROR_OK;
 }
 
-
 static int log_target_callback_event_handler(struct target *target, enum target_event event, void *priv)
 {
        switch (event)
@@ -115,27 +114,29 @@ COMMAND_HANDLER(handle_init_command)
        if (ERROR_OK != retval)
                return ERROR_FAIL;
 
-       if ((retval = jtag_interface_init(CMD_CTX)) != ERROR_OK)
+       if ((retval = adapter_init(CMD_CTX)) != ERROR_OK)
        {
-               /* we must be able to set up the jtag interface */
+               /* we must be able to set up the debug adapter */
                return retval;
        }
-       LOG_DEBUG("jtag interface init complete");
 
-       /* Try to initialize & examine the JTAG chain at this point,
-        * but continue startup regardless.  Note that platforms
-        * need to be able to provide JTAG event handlers that use
-        * a variety of JTAG operations in order to do that...
+       LOG_DEBUG("Debug Adapter init complete");
+
+       /* "transport init" verifies the expected devices are present;
+        * for JTAG, it checks the list of configured TAPs against
+        * what's discoverable, possibly with help from the platform's
+        * JTAG event handlers.  (which require COMMAND_EXEC)
         */
        command_context_mode(CMD_CTX, COMMAND_EXEC);
-       if (command_run_line(CMD_CTX, "jtag init") == ERROR_OK)
-       {
-               LOG_DEBUG("Examining targets...");
-               if (target_examine() != ERROR_OK)
-                       LOG_DEBUG("target examination failed");
-       }
-       else
-               LOG_WARNING("jtag initialization failed; try 'jtag init' again.");
+
+       retval = command_run_line(CMD_CTX, "transport init");
+       if (ERROR_OK != retval)
+               return ERROR_FAIL;
+
+       LOG_DEBUG("Examining targets...");
+       if (target_examine() != ERROR_OK)
+               LOG_DEBUG("target examination failed");
+
        command_context_mode(CMD_CTX, COMMAND_CONFIG);
 
        if (command_run_line(CMD_CTX, "flash init") != ERROR_OK)
@@ -159,6 +160,16 @@ COMMAND_HANDLER(handle_init_command)
        return ERROR_OK;
 }
 
+COMMAND_HANDLER(handle_add_script_search_dir_command)
+{
+       if (CMD_ARGC != 1)
+               return ERROR_COMMAND_SYNTAX_ERROR;
+
+       add_script_search_dir(CMD_ARGV[0]);
+
+       return ERROR_OK;
+}
+
 static const struct command_registration openocd_command_handlers[] = {
        {
                .name = "version",
@@ -181,18 +192,27 @@ static const struct command_registration openocd_command_handlers[] = {
                        "Unless 'noinit' is called, this command is "
                        "called automatically at the end of startup.",
 
+       },
+       {
+               .name = "add_script_search_dir",
+               .handler = &handle_add_script_search_dir_command,
+               .mode = COMMAND_ANY,
+               .help = "dir to search for config files and scripts",
+
        },
        COMMAND_REGISTRATION_DONE
 };
 
-int openocd_register_commands(struct command_context *cmd_ctx)
+static int openocd_register_commands(struct command_context *cmd_ctx)
 {
        return register_commands(cmd_ctx, NULL, openocd_command_handlers);
 }
 
 struct command_context *global_cmd_ctx;
 
-/* NB! this fn can be invoked outside this file for non PC hosted builds */
+/* NB! this fn can be invoked outside this file for non PC hosted builds
+ * NB! do not change to 'static'!!!!
+ */
 struct command_context *setup_command_handler(Jim_Interp *interp)
 {
        log_init();
@@ -203,20 +223,18 @@ struct command_context *setup_command_handler(Jim_Interp *interp)
 
        /* register subsystem commands */
        typedef int (*command_registrant_t)(struct command_context *cmd_ctx);
-       command_registrant_t command_registrants[] = {
+       static const command_registrant_t command_registrants[] = {
                &openocd_register_commands,
                &server_register_commands,
                &gdb_register_commands,
                &log_register_commands,
-               &jtag_register_commands,
-               &xsvf_register_commands,
-               &svf_register_commands,
+               &transport_register_commands,
+               &interface_register_commands,
                &target_register_commands,
                &flash_register_commands,
                &nand_register_commands,
                &pld_register_commands,
                &mflash_register_commands,
-               NULL
        };
        for (unsigned i = 0; NULL != command_registrants[i]; i++)
        {
@@ -229,7 +247,8 @@ struct command_context *setup_command_handler(Jim_Interp *interp)
        }
        LOG_DEBUG("command registration: complete");
 
-       LOG_OUTPUT(OPENOCD_VERSION "\n");
+       LOG_OUTPUT(OPENOCD_VERSION "\n"
+                       "Licensed under GNU GPL v2\n");
 
        global_cmd_ctx = cmd_ctx;
 
@@ -255,13 +274,15 @@ int openocd_main(int argc, char *argv[])
                "http://openocd.berlios.de/doc/doxygen/bugs.html"
                "\n");
 
-
        command_context_mode(cmd_ctx, COMMAND_CONFIG);
        command_set_output_handler(cmd_ctx, configuration_output_handler, NULL);
 
        if (parse_cmdline_args(cmd_ctx, argc, argv) != ERROR_OK)
                return EXIT_FAILURE;
 
+       if (server_preinit() != ERROR_OK)
+               return EXIT_FAILURE;
+
        ret = parse_config_file(cmd_ctx);
        if (ret != ERROR_OK)
                return EXIT_FAILURE;
@@ -293,7 +314,7 @@ int openocd_main(int argc, char *argv[])
        /* free commandline interface */
        command_done(cmd_ctx);
 
-       jtag_interface_quit();
+       adapter_quit();
 
        return ret;
 }