- only if "reset halt" or "reset init" are issued will the reset vector be set up

[openocd.git] / src / openocd.c

diff --git a/src/openocd.c b/src/openocd.c
index fac385a1f11b6fbf3126428e8826abc5a9f8cf4b..fa2d2c6127a59953867621e9322d2417e60d52ae 100644 (file)
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -64,6 +64,17 @@ void exit_handler(void)
                jtag->quit();
 }
 
+/* implementations of OpenOCD that uses multithreading needs to lock OpenOCD while calling
+ * OpenOCD fn's. No-op in vanilla OpenOCD
+ */
+void lockBigLock()
+{
+}
+void unlockBigLock()
+{
+}
+
+
 int main(int argc, char *argv[])
 {
        /* initialize commandline interface */
@@ -88,10 +99,22 @@ int main(int argc, char *argv[])
        
        if (log_init(cmd_ctx) != ERROR_OK)
                return EXIT_FAILURE;
-       DEBUG("log init complete");
+       LOG_DEBUG("log init complete");
+       
+       LOG_OUTPUT( OPENOCD_VERSION "\n" );
+       
        
-       OUTPUT( OPENOCD_VERSION "\n" );
-       OUTPUT( "$URL$\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 */
+       /* 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 */
 
        cfg_cmd_ctx = copy_command_context(cmd_ctx);
        cfg_cmd_ctx->mode = COMMAND_CONFIG;
@@ -111,23 +134,23 @@ int main(int argc, char *argv[])
 
        if (jtag_init(cmd_ctx) != ERROR_OK)
                return EXIT_FAILURE;
-       DEBUG("jtag init complete");
+       LOG_DEBUG("jtag init complete");
 
        if (target_init(cmd_ctx) != ERROR_OK)
                return EXIT_FAILURE;
-       DEBUG("target init complete");
+       LOG_DEBUG("target init complete");
 
        if (flash_init_drivers(cmd_ctx) != ERROR_OK)
                return EXIT_FAILURE;
-       DEBUG("flash init complete");
+       LOG_DEBUG("flash init complete");
 
        if (nand_init(cmd_ctx) != ERROR_OK)
                return EXIT_FAILURE;
-       DEBUG("NAND init complete");
+       LOG_DEBUG("NAND init complete");
 
        if (pld_init(cmd_ctx) != ERROR_OK)
                return EXIT_FAILURE;
-       DEBUG("pld init complete");
+       LOG_DEBUG("pld init complete");
 
        /* initialize tcp server */
        server_init();
@@ -139,7 +162,7 @@ int main(int argc, char *argv[])
        /* call any target resets */
        if (target_init_reset(cmd_ctx) != ERROR_OK)
                return EXIT_FAILURE;
-       DEBUG("target init reset complete");
+       LOG_DEBUG("target init reset complete");
 
        /* handle network connections */
        server_loop(cmd_ctx);