rtos: remove config.h includes from stackings headers

[openocd.git] / src / openocd.c

diff --git a/src/openocd.c b/src/openocd.c
index 2c94666243d724e8961d30b4e5f6b711a1c23e13..875da5a62cf0aef1a0cc48a7367e0e54fb6bfbb1 100644 (file)
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 /***************************************************************************
  *   Copyright (C) 2005 by Dominic Rath                                    *
  *   Dominic.Rath@gmx.de                                                   *
@@ -7,19 +9,6 @@
  *                                                                         *
  *   Copyright (C) 2008 Richard Missenden                                  *
  *   richard.missenden@googlemail.com                                      *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
@@ -27,7 +16,7 @@
 #endif
 
 #include "openocd.h"
-#include <jtag/driver.h>
+#include <jtag/adapter.h>
 #include <jtag/jtag.h>
 #include <transport/transport.h>
 #include <helper/util.h>
@@ -130,6 +119,8 @@ COMMAND_HANDLER(handle_init_command)
 
        initialized = 1;
 
+       bool save_poll_mask = jtag_poll_mask();
+
        retval = command_run_line(CMD_CTX, "target init");
        if (retval != ERROR_OK)
                return ERROR_FAIL;
@@ -177,11 +168,16 @@ COMMAND_HANDLER(handle_init_command)
        if (command_run_line(CMD_CTX, "tpiu init") != ERROR_OK)
                return ERROR_FAIL;
 
+       jtag_poll_unmask(save_poll_mask);
+
        /* initialize telnet subsystem */
        gdb_target_add_all(all_targets);
 
        target_register_event_callback(log_target_callback_event_handler, CMD_CTX);
 
+       if (command_run_line(CMD_CTX, "_run_post_init_commands") != ERROR_OK)
+               return ERROR_FAIL;
+
        return ERROR_OK;
 }
 
@@ -252,7 +248,7 @@ static struct command_context *setup_command_handler(Jim_Interp *interp)
                &log_register_commands,
                &rtt_server_register_commands,
                &transport_register_commands,
-               &interface_register_commands,
+               &adapter_register_commands,
                &target_register_commands,
                &flash_register_commands,
                &nand_register_commands,
@@ -364,8 +360,8 @@ int openocd_main(int argc, char *argv[])
        help_del_all_commands(cmd_ctx);
 
        /* free all DAP and CTI objects */
-       dap_cleanup_all();
        arm_cti_cleanup_all();
+       dap_cleanup_all();
 
        adapter_quit();
 
@@ -377,6 +373,8 @@ int openocd_main(int argc, char *argv[])
        rtt_exit();
        free_config();
 
+       log_exit();
+
        if (ret == ERROR_FAIL)
                return EXIT_FAILURE;
        else if (ret != ERROR_OK)