configure.ac: add libutil to the dependency list

[openocd.git] / src / openocd.c

diff --git a/src/openocd.c b/src/openocd.c
index d5d7ebe8768211c97a81caa6320520cf73c65ee6..604b36d212a28d01ae2240a6d8c74220c47fbb69 100644 (file)
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -36,7 +36,6 @@
 #include <flash/nor/core.h>
 #include <flash/nand/core.h>
 #include <pld/pld.h>
-#include <flash/mflash.h>
 #include <target/arm_cti.h>
 #include <target/arm_adi_v5.h>
 
@@ -165,9 +164,6 @@ COMMAND_HANDLER(handle_init_command)
        if (command_run_line(CMD_CTX, "flash init") != ERROR_OK)
                return ERROR_FAIL;
 
-       if (command_run_line(CMD_CTX, "mflash init") != ERROR_OK)
-               return ERROR_FAIL;
-
        if (command_run_line(CMD_CTX, "nand init") != ERROR_OK)
                return ERROR_FAIL;
 
@@ -234,10 +230,7 @@ static int openocd_register_commands(struct command_context *cmd_ctx)
 
 struct command_context *global_cmd_ctx;
 
-/* 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)
+static struct command_context *setup_command_handler(Jim_Interp *interp)
 {
        log_init();
        LOG_DEBUG("log_init: complete");
@@ -257,7 +250,6 @@ struct command_context *setup_command_handler(Jim_Interp *interp)
                &flash_register_commands,
                &nand_register_commands,
                &pld_register_commands,
-               &mflash_register_commands,
                &cti_register_commands,
                &dap_register_commands,
                NULL
@@ -350,6 +342,8 @@ int openocd_main(int argc, char *argv[])
        command_context_mode(cmd_ctx, COMMAND_CONFIG);
        command_set_output_handler(cmd_ctx, configuration_output_handler, NULL);
 
+       server_host_os_entry();
+
        /* Start the executable meat that can evolve into thread in future. */
        ret = openocd_thread(argc, argv, cmd_ctx);
 
@@ -359,11 +353,17 @@ int openocd_main(int argc, char *argv[])
 
        unregister_all_commands(cmd_ctx, NULL);
 
-       /* Shutdown commandline interface */
-       command_exit(cmd_ctx);
+       /* free all DAP and CTI objects */
+       dap_cleanup_all();
+       arm_cti_cleanup_all();
 
        adapter_quit();
 
+       server_host_os_close();
+
+       /* Shutdown commandline interface */
+       command_exit(cmd_ctx);
+
        free_config();
 
        if (ERROR_FAIL == ret)