PIC32: add software reset support

[fw/openocd] / src / openocd.c

diff --git a/src/openocd.c b/src/openocd.c
index e500ba6081a9182dbea9d91127e77ea28411e8f3..d376f5f8e1b1b5923419a9466349e931be483013 100644 (file)
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -29,13 +29,14 @@
 #endif
 
 #include "openocd.h"
+#include <jtag/driver.h>
 #include <jtag/jtag.h>
 #include <helper/ioutil.h>
 #include <helper/configuration.h>
 #include <xsvf/xsvf.h>
 #include <svf/svf.h>
 #include <flash/nor/core.h>
-#include <flash/nand.h>
+#include <flash/nand/core.h>
 #include <pld/pld.h>
 #include <flash/mflash.h>
 
@@ -62,7 +63,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,12 +115,12 @@ 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");
+       LOG_DEBUG("Debug Adapter init complete");
 
        /* Try to initialize & examine the JTAG chain at this point,
         * but continue startup regardless.  Note that platforms
@@ -203,11 +203,12 @@ 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,
+               &interface_register_commands,
                &jtag_register_commands,
                &xsvf_register_commands,
                &svf_register_commands,
@@ -229,7 +230,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 +257,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 +297,7 @@ int openocd_main(int argc, char *argv[])
        /* free commandline interface */
        command_done(cmd_ctx);
 
-       jtag_interface_quit();
+       adapter_quit();
 
        return ret;
 }