arm_tpiu_swo: add support for independent TPIU and SWO

[openocd.git] / src / openocd.c

diff --git a/src/openocd.c b/src/openocd.c
index 902528d08b889d314a89db3f66c603b22c591547..4fec563383a3c581a66e2b8b97e6e9ecd4287410 100644 (file)
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -36,12 +36,14 @@
 #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>
+#include <target/arm_tpiu_swo.h>
+#include <rtt/rtt.h>
 
 #include <server/server.h>
 #include <server/gdb_server.h>
+#include <server/rtt_server.h>
 
 #ifdef HAVE_STRINGS_H
 #include <strings.h>
@@ -165,9 +167,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;
 
@@ -175,6 +174,10 @@ COMMAND_HANDLER(handle_init_command)
                return ERROR_FAIL;
        command_context_mode(CMD_CTX, COMMAND_EXEC);
 
+       /* in COMMAND_EXEC, after target_examine(), only tpiu or only swo */
+       if (command_run_line(CMD_CTX, "tpiu init") != ERROR_OK)
+               return ERROR_FAIL;
+
        /* initialize telnet subsystem */
        gdb_target_add_all(all_targets);
 
@@ -234,10 +237,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");
@@ -251,15 +251,16 @@ struct command_context *setup_command_handler(Jim_Interp *interp)
                &server_register_commands,
                &gdb_register_commands,
                &log_register_commands,
+               &rtt_server_register_commands,
                &transport_register_commands,
                &interface_register_commands,
                &target_register_commands,
                &flash_register_commands,
                &nand_register_commands,
                &pld_register_commands,
-               &mflash_register_commands,
                &cti_register_commands,
                &dap_register_commands,
+               &arm_tpiu_swo_register_commands,
                NULL
        };
        for (unsigned i = 0; NULL != command_registrants[i]; i++) {
@@ -343,6 +344,9 @@ int openocd_main(int argc, char *argv[])
        if (ioutil_init(cmd_ctx) != ERROR_OK)
                return EXIT_FAILURE;
 
+       if (rtt_init() != ERROR_OK)
+               return EXIT_FAILURE;
+
        LOG_OUTPUT("For bug reports, read\n\t"
                "http://openocd.org/doc/doxygen/bugs.html"
                "\n");
@@ -350,20 +354,30 @@ 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);
 
        flash_free_all_banks();
        gdb_service_free();
+       arm_tpiu_swo_cleanup_all();
        server_free();
 
        unregister_all_commands(cmd_ctx, NULL);
 
+       /* 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);
 
+       rtt_exit();
        free_config();
 
        if (ERROR_FAIL == ret)