arm_cti: add cti command group

[openocd] / src / openocd.c

diff --git a/src/openocd.c b/src/openocd.c
index d06e2c56e5258a09d09cad9f794794defaaf8a43..b97df378415e34ae7ccc18906ea8d3dc7cf1f312 100644 (file)
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -19,9 +19,7 @@
  *   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, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
@@ -39,6 +37,7 @@
 #include <flash/nand/core.h>
 #include <pld/pld.h>
 #include <flash/mflash.h>
+#include <target/arm_cti.h>
 
 #include <server/server.h>
 #include <server/gdb_server.h>
@@ -47,8 +46,18 @@
 #include <strings.h>
 #endif
 
+#ifdef PKGBLDDATE
 #define OPENOCD_VERSION        \
        "Open On-Chip Debugger " VERSION RELSTR " (" PKGBLDDATE ")"
+#else
+#define OPENOCD_VERSION        \
+       "Open On-Chip Debugger " VERSION RELSTR
+#endif
+
+static const char openocd_startup_tcl[] = {
+#include "startup_tcl.inc"
+0 /* Terminate with zero */
+};
 
 /* Give scripts and TELNET a way to find out what version this is */
 static int jim_version_command(Jim_Interp *interp, int argc,
@@ -228,8 +237,7 @@ struct command_context *setup_command_handler(Jim_Interp *interp)
        log_init();
        LOG_DEBUG("log_init: complete");
 
-       const char *startup = openocd_startup_tcl;
-       struct command_context *cmd_ctx = command_init(startup, interp);
+       struct command_context *cmd_ctx = command_init(openocd_startup_tcl, interp);
 
        /* register subsystem commands */
        typedef int (*command_registrant_t)(struct command_context *cmd_ctx_value);
@@ -245,6 +253,7 @@ struct command_context *setup_command_handler(Jim_Interp *interp)
                &nand_register_commands,
                &pld_register_commands,
                &mflash_register_commands,
+               &cti_register_commands,
                NULL
        };
        for (unsigned i = 0; NULL != command_registrants[i]; i++) {
@@ -273,32 +282,41 @@ static int openocd_thread(int argc, char *argv[], struct command_context *cmd_ct
        int ret;
 
        if (parse_cmdline_args(cmd_ctx, argc, argv) != ERROR_OK)
-               return EXIT_FAILURE;
+               return ERROR_FAIL;
 
        if (server_preinit() != ERROR_OK)
-               return EXIT_FAILURE;
+               return ERROR_FAIL;
 
        ret = parse_config_file(cmd_ctx);
-       if (ret == ERROR_OK_EXIT)
+       if (ret == ERROR_COMMAND_CLOSE_CONNECTION) {
+               server_quit(); /* gdb server may be initialized by -c init */
                return ERROR_OK;
-       if (ret != ERROR_OK)
-               return EXIT_FAILURE;
+       } else if (ret != ERROR_OK) {
+               server_quit(); /* gdb server may be initialized by -c init */
+               return ERROR_FAIL;
+       }
 
        ret = server_init(cmd_ctx);
        if (ERROR_OK != ret)
-               return EXIT_FAILURE;
+               return ERROR_FAIL;
 
        if (init_at_startup) {
                ret = command_run_line(cmd_ctx, "init");
-               if (ERROR_OK != ret)
-                       return EXIT_FAILURE;
+               if (ERROR_OK != ret) {
+                       server_quit();
+                       return ERROR_FAIL;
+               }
        }
 
-       server_loop(cmd_ctx);
+       ret = server_loop(cmd_ctx);
 
-       server_quit();
+       int last_signal = server_quit();
+       if (last_signal != ERROR_OK)
+               return last_signal;
 
-       return ret;
+       if (ret != ERROR_OK)
+               return ERROR_FAIL;
+       return ERROR_OK;
 }
 
 /* normally this is the main() function entry, but if OpenOCD is linked
@@ -320,7 +338,7 @@ int openocd_main(int argc, char *argv[])
                return EXIT_FAILURE;
 
        LOG_OUTPUT("For bug reports, read\n\t"
-               "http://openocd.sourceforge.net/doc/doxygen/bugs.html"
+               "http://openocd.org/doc/doxygen/bugs.html"
                "\n");
 
        command_context_mode(cmd_ctx, COMMAND_CONFIG);
@@ -329,12 +347,22 @@ 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);
 
+       gdb_service_free();
+       server_free();
+
        unregister_all_commands(cmd_ctx, NULL);
 
-       /* free commandline interface */
-       command_done(cmd_ctx);
+       /* Shutdown commandline interface */
+       command_exit(cmd_ctx);
 
        adapter_quit();
 
+       free_config();
+
+       if (ERROR_FAIL == ret)
+               return EXIT_FAILURE;
+       else if (ERROR_OK != ret)
+               exit_on_signal(ret);
+
        return ret;
 }