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 604b36d212a28d01ae2240a6d8c74220c47fbb69..4fec563383a3c581a66e2b8b97e6e9ecd4287410 100644 (file)
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -38,9 +38,12 @@
 #include <pld/pld.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>
@@ -171,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);
 
@@ -244,6 +251,7 @@ static 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,
@@ -252,6 +260,7 @@ static struct command_context *setup_command_handler(Jim_Interp *interp)
                &pld_register_commands,
                &cti_register_commands,
                &dap_register_commands,
+               &arm_tpiu_swo_register_commands,
                NULL
        };
        for (unsigned i = 0; NULL != command_registrants[i]; i++) {
@@ -335,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");
@@ -349,6 +361,7 @@ int openocd_main(int argc, char *argv[])
 
        flash_free_all_banks();
        gdb_service_free();
+       arm_tpiu_swo_cleanup_all();
        server_free();
 
        unregister_all_commands(cmd_ctx, NULL);
@@ -364,6 +377,7 @@ int openocd_main(int argc, char *argv[])
        /* Shutdown commandline interface */
        command_exit(cmd_ctx);
 
+       rtt_exit();
        free_config();
 
        if (ERROR_FAIL == ret)