Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
jtag newtap change & huge manual update
[openocd.git] / src / openocd.c
diff --git a/src/openocd.c b/src/openocd.c
index 1094dcd633c1ee9e2cbb57e1ee02934c710c0ceb..51e40537781e5e35b9d012519b0f6570c7903b51 100644 (file)
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -2,6 +2,12 @@
  *   Copyright (C) 2005 by Dominic Rath                                    *
  *   Dominic.Rath@gmx.de                                                   *
  *                                                                         *
+ *   Copyright (C) 2007,2008 Øyvind Harboe                                 *
+ *   oyvind.harboe@zylin.com                                               *
+ *                                                                         *
+ *   Copyright (C) 2008 Richard Missenden                                  *
+ *   richard.missenden@googlemail.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     *
@@ -33,6 +39,7 @@
 #include "flash.h"
 #include "nand.h"
 #include "pld.h"
+#include "mflash.h"
 
 #include "command.h"
 #include "server.h"
@@ -57,26 +64,32 @@
 
 #include "replacements.h"
 
-
-/* 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)
+void print_version(void)
 {
-       command_print(cmd_ctx, OPENOCD_VERSION);
-
-       return ERROR_OK;
+       /* 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 */
 }
 
-static int daemon_startup = 0;
 
-int handle_daemon_startup_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+
+
+
+
+
+
+
+/* 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)
 {
-       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;
@@ -89,6 +102,30 @@ 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_GDB_START:
+                       target->display=0;
+                       break;
+               case TARGET_EVENT_GDB_END:
+                       target->display=1;
+                       break;
+               case TARGET_EVENT_HALTED:
+                       if (target->display)
+                       {
+                               /* do not display information when debugger caused the halt */
+                               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)
 {
@@ -96,11 +133,11 @@ int handle_init_command(struct command_context_s *cmd_ctx, char *cmd, char **arg
        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");
@@ -117,16 +154,20 @@ 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");
                }
        }
-       
+
        if (flash_init_drivers(cmd_ctx) != ERROR_OK)
                return ERROR_FAIL;
        LOG_DEBUG("flash init complete");
 
+       if (mflash_init_drivers(cmd_ctx) != ERROR_OK)
+               return ERROR_FAIL;
+       LOG_DEBUG("mflash init complete");
+
        if (nand_init(cmd_ctx) != ERROR_OK)
                return ERROR_FAIL;
        LOG_DEBUG("NAND init complete");
@@ -143,20 +184,22 @@ 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);
        telnet_register_commands(cmd_ctx);
@@ -169,7 +212,8 @@ command_context_t *setup_command_handler(void)
        flash_register_commands(cmd_ctx);
        nand_register_commands(cmd_ctx);
        pld_register_commands(cmd_ctx);
-       
+       mflash_register_commands(cmd_ctx);
+
        if (log_init(cmd_ctx) != ERROR_OK)
        {
                exit(-1);
@@ -177,7 +221,7 @@ command_context_t *setup_command_handler(void)
        LOG_DEBUG("log init complete");
 
        LOG_OUTPUT( OPENOCD_VERSION "\n" );
-       
+
        register_command(cmd_ctx, NULL, "init", handle_init_command,
                                         COMMAND_ANY, "initializes target and servers - nop on subsequent invocations");
 
@@ -189,47 +233,42 @@ command_context_t *setup_command_handler(void)
  * application will have it's own implementation of main(). */
 int openocd_main(int argc, char *argv[])
 {
+       int ret;
+
        /* initialize commandline interface */
        command_context_t *cmd_ctx;
 
        cmd_ctx = setup_command_handler();
 
-       /* 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 */
+       LOG_OUTPUT( "\n\nBUGS? Read http://svn.berlios.de/svnroot/repos/openocd/trunk/BUGS\n\n\n");
+
+       print_version();
 
        command_context_mode(cmd_ctx, COMMAND_CONFIG);
        command_set_output_handler(cmd_ctx, configuration_output_handler, NULL);
 
        if (parse_cmdline_args(cmd_ctx, argc, argv) != ERROR_OK)
                return EXIT_FAILURE;
-       
-       if (parse_config_file(cmd_ctx) != ERROR_OK)
-               return EXIT_FAILURE;
 
-       command_context_mode(cmd_ctx, COMMAND_EXEC);
-       if (command_run_line(cmd_ctx, "init")!=ERROR_OK)
+       ret = parse_config_file(cmd_ctx);
+       if ( (ret != ERROR_OK) && (ret != ERROR_COMMAND_CLOSE_CONNECTION) )
                return EXIT_FAILURE;
-       
-       if (daemon_startup)
-               command_run_line(cmd_ctx, "reset");
-       
-       /* handle network connections */
-       server_loop(cmd_ctx);
+
+       if (ret != ERROR_COMMAND_CLOSE_CONNECTION)
+       {
+               command_context_mode(cmd_ctx, COMMAND_EXEC);
+               if (command_run_line(cmd_ctx, "init")!=ERROR_OK)
+                       return EXIT_FAILURE;
+
+               /* handle network connections */
+               server_loop(cmd_ctx);
+       }
 
        /* shut server down */
        server_quit();
 
        unregister_all_commands(cmd_ctx);
-       
+
        /* free commandline interface */
        command_done(cmd_ctx);
 
Open On-Chip Debugger

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)