reduce patch problems by moving $xxx expansion into seperate fn
[openocd.git] / src / openocd.c
index 26a218b9d1ac6384d7d97d1e66660120da232e77..b09ef1e73053b6f9294573d4d3917819125b46a3 100644 (file)
@@ -2,6 +2,9 @@
  *   Copyright (C) 2005 by Dominic Rath                                    *
  *   Dominic.Rath@gmx.de                                                   *
  *                                                                         *
+ *   Copyright (C) 2007,2008 Ã˜yvind Harboe                                 *
+ *   oyvind.harboe@zylin.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     *
@@ -18,7 +21,7 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#define OPENOCD_VERSION "Open On-Chip Debugger (2007-08-25 12:00 CEST)"
+#define OPENOCD_VERSION "Open On-Chip Debugger " VERSION " (" PKGBLDDATE ") svn:" PKGBLDREV
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -28,7 +31,6 @@
 #include "types.h"
 #include "jtag.h"
 #include "configuration.h"
-#include "interpreter.h"
 #include "xsvf.h"
 #include "target.h"
 #include "flash.h"
@@ -39,6 +41,7 @@
 #include "server.h"
 #include "telnet_server.h"
 #include "gdb_server.h"
+#include "tcl_server.h"
 
 #include <sys/time.h>
 #include <sys/types.h>
 #include <unistd.h>
 #include <errno.h>
 
+#ifdef _WIN32
+#include <malloc.h>
+#else
+#include <alloca.h>
+#endif
+
+#include "replacements.h"
+
+
+
+
+
+
+void print_version()
+{
+       /* DANGER!!! make sure that the line below does not appear in a patch, do not remove */
+       /* DANGER!!! make sure that the line below does not appear in a patch, do not remove */
+       /* DANGER!!! make sure that the line below does not appear in a patch, do not remove */
+       /* DANGER!!! make sure that the line below does not appear in a patch, do not remove */
+       /* DANGER!!! make sure that the line below does not appear in a patch, do not remove */
+       LOG_OUTPUT( "$URL$\n");
+       /* DANGER!!! make sure that the line above does not appear in a patch, do not remove */
+       /* DANGER!!! make sure that the line above does not appear in a patch, do not remove */
+       /* DANGER!!! make sure that the line above does not appear in a patch, do not remove */
+       /* DANGER!!! make sure that the line above does not appear in a patch, do not remove */
+       /* DANGER!!! make sure that the line above does not appear in a patch, do not remove */
+}
+
+
+
+
+
+
+
+
+
 /* Give TELNET a way to find out what version this is */
 int handle_version_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
 {
@@ -64,12 +103,87 @@ void exit_handler(void)
                jtag->quit();
 }
 
-int main(int argc, char *argv[])
+static int log_target_callback_event_handler(struct target_s *target, enum target_event event, void *priv)
 {
-       /* initialize commandline interface */
-       command_context_t *cmd_ctx, *cfg_cmd_ctx;
-       cmd_ctx = command_init();
+       switch (event)
+       {
+               case TARGET_EVENT_HALTED:
+                       target_arch_state(target);
+                       break;
+               default:
+                       break;
+       }
+
+       return ERROR_OK;
+}
+
+/* OpenOCD can't really handle failure of this command. Patches welcome! :-) */
+int handle_init_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+{
+       int retval;
+       static int initialized=0;
+       if (initialized)
+               return ERROR_OK;
+       
+       initialized=1;
+       
+       atexit(exit_handler);
+       
+       if (target_init(cmd_ctx) != ERROR_OK)
+               return ERROR_FAIL;
+       LOG_DEBUG("target init complete");
+
+       if ((retval=jtag_interface_init(cmd_ctx)) != ERROR_OK)
+       {
+               /* we must be able to set up the jtag interface */
+               return retval;
+       }
+       LOG_DEBUG("jtag interface init complete");
+
+       /* Try to initialize & examine the JTAG chain at this point, but
+        * continue startup regardless */
+       if (jtag_init(cmd_ctx) == ERROR_OK)
+       {
+               LOG_DEBUG("jtag init complete");
+               if (target_examine() == ERROR_OK)
+               {
+                       LOG_DEBUG("jtag examine complete");
+               }
+       }
+       
+       if (flash_init_drivers(cmd_ctx) != ERROR_OK)
+               return ERROR_FAIL;
+       LOG_DEBUG("flash init complete");
+
+       if (nand_init(cmd_ctx) != ERROR_OK)
+               return ERROR_FAIL;
+       LOG_DEBUG("NAND init complete");
+
+       if (pld_init(cmd_ctx) != ERROR_OK)
+               return ERROR_FAIL;
+       LOG_DEBUG("pld init complete");
+
+       /* initialize tcp server */
+       server_init();
+
+       /* initialize telnet subsystem */
+       telnet_init("Open On-Chip Debugger");
+       gdb_init();
+       tcl_init(); /* allows tcl to just connect without going thru telnet */
+
+       target_register_event_callback(log_target_callback_event_handler, cmd_ctx);
+       
+       return ERROR_OK;
+}
 
+command_context_t *global_cmd_ctx;
+
+command_context_t *setup_command_handler(void)
+{
+       command_context_t *cmd_ctx;
+       
+       global_cmd_ctx = cmd_ctx = command_init();
+       
        register_command(cmd_ctx, NULL, "version", handle_version_command,
                                         COMMAND_EXEC, "show OpenOCD version");
        
@@ -77,9 +191,9 @@ int main(int argc, char *argv[])
        server_register_commands(cmd_ctx);
        telnet_register_commands(cmd_ctx);
        gdb_register_commands(cmd_ctx);
+       tcl_register_commands(cmd_ctx); /* tcl server commands */
        log_register_commands(cmd_ctx);
        jtag_register_commands(cmd_ctx);
-       interpreter_register_commands(cmd_ctx);
        xsvf_register_commands(cmd_ctx);
        target_register_commands(cmd_ctx);
        flash_register_commands(cmd_ctx);
@@ -87,62 +201,56 @@ int main(int argc, char *argv[])
        pld_register_commands(cmd_ctx);
        
        if (log_init(cmd_ctx) != ERROR_OK)
-               return EXIT_FAILURE;
-       DEBUG("log init complete");
-       
-       INFO( OPENOCD_VERSION );
-
-       cfg_cmd_ctx = copy_command_context(cmd_ctx);
-       cfg_cmd_ctx->mode = COMMAND_CONFIG;
-       command_set_output_handler(cfg_cmd_ctx, configuration_output_handler, NULL);
-       
-       if (parse_cmdline_args(cfg_cmd_ctx, argc, argv) != ERROR_OK)
-               return EXIT_FAILURE;
+       {
+               exit(-1);
+       }
+       LOG_DEBUG("log init complete");
 
-       if (parse_config_file(cfg_cmd_ctx) != ERROR_OK)
-               return EXIT_FAILURE;
+       LOG_OUTPUT( OPENOCD_VERSION "\n" );
        
-       command_done(cfg_cmd_ctx);
+       register_command(cmd_ctx, NULL, "init", handle_init_command,
+                                        COMMAND_ANY, "initializes target and servers - nop on subsequent invocations");
 
-       command_set_output_handler(cmd_ctx, configuration_output_handler, NULL);
+       return cmd_ctx;
+}
 
-       atexit(exit_handler);
+/* normally this is the main() function entry, but if OpenOCD is linked
+ * into application, then this fn will not be invoked, but rather that
+ * application will have it's own implementation of main(). */
+int openocd_main(int argc, char *argv[])
+{
+       /* initialize commandline interface */
+       command_context_t *cmd_ctx;
 
-       if (jtag_init(cmd_ctx) != ERROR_OK)
-               return EXIT_FAILURE;
-       DEBUG("jtag init complete");
+       cmd_ctx = setup_command_handler();
+       
+       LOG_OUTPUT( "\n\nBUGS? Read http://svn.berlios.de/svnroot/repos/openocd/trunk/BUGS\n\n\n");
 
-       if (target_init(cmd_ctx) != ERROR_OK)
-               return EXIT_FAILURE;
-       DEBUG("target init complete");
+       print_version();
+       
+       command_context_mode(cmd_ctx, COMMAND_CONFIG);
+       command_set_output_handler(cmd_ctx, configuration_output_handler, NULL);
 
-       if (flash_init(cmd_ctx) != ERROR_OK)
+       if (parse_cmdline_args(cmd_ctx, argc, argv) != ERROR_OK)
                return EXIT_FAILURE;
-       DEBUG("flash init complete");
-
-       if (nand_init(cmd_ctx) != ERROR_OK)
+       
+       if (parse_config_file(cmd_ctx) != ERROR_OK)
                return EXIT_FAILURE;
-       DEBUG("NAND init complete");
 
-       if (pld_init(cmd_ctx) != ERROR_OK)
+       command_context_mode(cmd_ctx, COMMAND_EXEC);
+       if (command_run_line(cmd_ctx, "init")!=ERROR_OK)
                return EXIT_FAILURE;
-       DEBUG("pld init complete");
-
-       /* initialize tcp server */
-       server_init();
        
-       /* initialize telnet subsystem */
-       telnet_init("Open On-Chip Debugger");
-       gdb_init();
-
        /* handle network connections */
        server_loop(cmd_ctx);
-       
+
        /* shut server down */
        server_quit();
+
+       unregister_all_commands(cmd_ctx);
        
        /* free commandline interface */
        command_done(cmd_ctx);
-       
+
        return EXIT_SUCCESS;
 }

Linking to existing account procedure

If you already have an account and want to add another login method you MUST first sign in with your existing account and then change URL to read https://review.openocd.org/login/?link to get to this page again but this time it'll work for linking. Thank you.

SSH host keys fingerprints

1024 SHA256:YKx8b7u5ZWdcbp7/4AeXNaqElP49m6QrwfXaqQGJAOk gerrit-code-review@openocd.zylin.com (DSA)
384 SHA256:jHIbSQa4REvwCFG4cq5LBlBLxmxSqelQPem/EXIrxjk gerrit-code-review@openocd.org (ECDSA)
521 SHA256:UAOPYkU9Fjtcao0Ul/Rrlnj/OsQvt+pgdYSZ4jOYdgs gerrit-code-review@openocd.org (ECDSA)
256 SHA256:A13M5QlnozFOvTllybRZH6vm7iSt0XLxbA48yfc2yfY gerrit-code-review@openocd.org (ECDSA)
256 SHA256:spYMBqEYoAOtK7yZBrcwE8ZpYt6b68Cfh9yEVetvbXg gerrit-code-review@openocd.org (ED25519)
+--[ED25519 256]--+
|=..              |
|+o..   .         |
|*.o   . .        |
|+B . . .         |
|Bo. = o S        |
|Oo.+ + =         |
|oB=.* = . o      |
| =+=.+   + E     |
|. .=o   . o      |
+----[SHA256]-----+
2048 SHA256:0Onrb7/PHjpo6iVZ7xQX2riKN83FJ3KGU0TvI0TaFG4 gerrit-code-review@openocd.zylin.com (RSA)