jtag: factor init into 'jtag init'

[openocd.git] / src / openocd.c

diff --git a/src/openocd.c b/src/openocd.c
index ff35f8782e0eb8996ec25e1fad5e210cb0b18f30..79a30e77e176e4fb44a4f2a6303e1bcdd8a65fa5 100644 (file)
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -126,20 +126,21 @@ COMMAND_HANDLER(handle_init_command)
 
        /* Try to initialize & examine the JTAG chain at this point, but
         * continue startup regardless */
-       if (jtag_init(CMD_CTX) == ERROR_OK)
+       command_context_mode(CMD_CTX, COMMAND_CONFIG);
+       if (command_run_line(CMD_CTX, "jtag init") == ERROR_OK)
        {
-               LOG_DEBUG("jtag init complete");
-               if (target_examine() == ERROR_OK)
-               {
-                       LOG_DEBUG("jtag examine complete");
-               }
+               command_context_mode(CMD_CTX, COMMAND_EXEC);
+               LOG_DEBUG("Examining targets...");
+               if (target_examine() != ERROR_OK)
+                       LOG_DEBUG("target examination failed");
+               command_context_mode(CMD_CTX, COMMAND_CONFIG);
        }
+       else
+               LOG_WARNING("jtag initialization failed; try 'jtag init' again.");
 
-       if (flash_init_drivers(CMD_CTX) != ERROR_OK)
+       if (command_run_line(CMD_CTX, "flash init") != ERROR_OK)
                return ERROR_FAIL;
-       LOG_DEBUG("flash init complete");
 
-       command_context_mode(CMD_CTX, COMMAND_CONFIG);
        if (command_run_line(CMD_CTX, "mflash init") != ERROR_OK)
                return ERROR_FAIL;