flash/at91sam4: run probe just once

[openocd] / src / openocd.c

diff --git a/src/openocd.c b/src/openocd.c
index b97df378415e34ae7ccc18906ea8d3dc7cf1f312..f084dd4522d6294e027578982f803d9c9b86927b 100644 (file)
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -38,6 +38,7 @@
 #include <pld/pld.h>
 #include <flash/mflash.h>
 #include <target/arm_cti.h>
+#include <target/arm_adi_v5.h>
 
 #include <server/server.h>
 #include <server/gdb_server.h>
@@ -86,13 +87,13 @@ static int log_target_callback_event_handler(struct target *target,
 {
        switch (event) {
                case TARGET_EVENT_GDB_START:
-                       target->display = 0;
+                       target->verbose_halt_msg = false;
                        break;
                case TARGET_EVENT_GDB_END:
-                       target->display = 1;
+                       target->verbose_halt_msg = true;
                        break;
                case TARGET_EVENT_HALTED:
-                       if (target->display) {
+                       if (target->verbose_halt_msg) {
                                /* do not display information when debugger caused the halt */
                                target_arch_state(target);
                        }
@@ -151,6 +152,10 @@ COMMAND_HANDLER(handle_init_command)
        if (ERROR_OK != retval)
                return ERROR_FAIL;
 
+       retval = command_run_line(CMD_CTX, "dap init");
+       if (ERROR_OK != retval)
+               return ERROR_FAIL;
+
        LOG_DEBUG("Examining targets...");
        if (target_examine() != ERROR_OK)
                LOG_DEBUG("target examination failed");
@@ -254,6 +259,7 @@ struct command_context *setup_command_handler(Jim_Interp *interp)
                &pld_register_commands,
                &mflash_register_commands,
                &cti_register_commands,
+               &dap_register_commands,
                NULL
        };
        for (unsigned i = 0; NULL != command_registrants[i]; i++) {
@@ -347,16 +353,21 @@ int openocd_main(int argc, char *argv[])
        /* Start the executable meat that can evolve into thread in future. */
        ret = openocd_thread(argc, argv, cmd_ctx);
 
+       flash_free_all_banks();
        gdb_service_free();
        server_free();
 
        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();
 
+       /* Shutdown commandline interface */
+       command_exit(cmd_ctx);
+
        free_config();
 
        if (ERROR_FAIL == ret)