"marcel" <M.W.Wijlaars@tue.nl>,

[openocd.git] / src / openocd.c

diff --git a/src/openocd.c b/src/openocd.c
index 1094dcd633c1ee9e2cbb57e1ee02934c710c0ceb..d0bd9de1babf618d1dc467f6639f2c00eaa1dd2b 100644 (file)
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -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     *
@@ -66,21 +69,6 @@ int handle_version_command(struct command_context_s *cmd_ctx, char *cmd, char **
        return ERROR_OK;
 }
 
-static int daemon_startup = 0;
-
-int handle_daemon_startup_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
-{
-       if (argc==0)
-               return ERROR_OK;
-       if (argc > 1 )
-               return ERROR_COMMAND_SYNTAX_ERROR;
-       
-       daemon_startup = strcmp("reset", args[0])==0;
-       
-       command_print(cmd_ctx, OPENOCD_VERSION);
-
-       return ERROR_OK;
-}
 
 void exit_handler(void)
 {
@@ -89,6 +77,22 @@ void exit_handler(void)
                jtag->quit();
 }
 
+static int log_target_callback_event_handler(struct target_s *target, enum target_event event, void *priv)
+{
+       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)
 {
@@ -117,7 +121,7 @@ int handle_init_command(struct command_context_s *cmd_ctx, char *cmd, char **arg
        if (jtag_init(cmd_ctx) == ERROR_OK)
        {
                LOG_DEBUG("jtag init complete");
-               if (target_examine(cmd_ctx) == ERROR_OK)
+               if (target_examine() == ERROR_OK)
                {
                        LOG_DEBUG("jtag examine complete");
                }
@@ -143,19 +147,23 @@ int handle_init_command(struct command_context_s *cmd_ctx, char *cmd, char **arg
        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;
        
-       cmd_ctx = command_init();
+       global_cmd_ctx = cmd_ctx = command_init();
        
        register_command(cmd_ctx, NULL, "version", handle_version_command,
                                         COMMAND_EXEC, "show OpenOCD version");
-       register_command(cmd_ctx, NULL, "daemon_startup", handle_daemon_startup_command, COMMAND_CONFIG, 
-                       "deprecated - use \"init\" and \"reset\" at end of startup script instead");
        
        /* register subsystem commands */
        server_register_commands(cmd_ctx);
@@ -193,6 +201,8 @@ int openocd_main(int argc, char *argv[])
        command_context_t *cmd_ctx;
 
        cmd_ctx = setup_command_handler();
+       
+       LOG_OUTPUT( "\n\nBUGS? Read http://svn.berlios.de/svnroot/repos/openocd/trunk/BUGS\n\n\n");
 
        /* 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 */
@@ -219,9 +229,6 @@ int openocd_main(int argc, char *argv[])
        if (command_run_line(cmd_ctx, "init")!=ERROR_OK)
                return EXIT_FAILURE;
        
-       if (daemon_startup)
-               command_run_line(cmd_ctx, "reset");
-       
        /* handle network connections */
        server_loop(cmd_ctx);