diff options
| author | Zachary T Welch <zw@superlucidity.net> | 2009-11-30 18:30:38 -0800 |
|---|---|---|
| committer | Zachary T Welch <zw@superlucidity.net> | 2009-12-02 13:26:22 -0800 |
| commit | ac1887c703d0d5ae83c513df61127f59e44a0469 (patch) | |
| tree | 2520fe4e0e3466351f7d1aaf5516342c664aaa85 /src/openocd.c | |
| parent | 37201c019ffc6b806aa61bf2eb8fc18c58083f02 (diff) | |
| download | openocd+libswd-ac1887c703d0d5ae83c513df61127f59e44a0469.tar.gz openocd+libswd-ac1887c703d0d5ae83c513df61127f59e44a0469.tar.bz2 openocd+libswd-ac1887c703d0d5ae83c513df61127f59e44a0469.tar.xz openocd+libswd-ac1887c703d0d5ae83c513df61127f59e44a0469.zip | |
jtag: factor init into 'jtag init'
Adds 'jtag init' command handler, which can be called as part of a
fine-grained 'init' process.
Diffstat (limited to 'src/openocd.c')
| -rw-r--r-- | src/openocd.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/openocd.c b/src/openocd.c index aaa45314..79a30e77 100644 --- a/src/openocd.c +++ b/src/openocd.c @@ -126,16 +126,18 @@ 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."); - command_context_mode(CMD_CTX, COMMAND_CONFIG); if (command_run_line(CMD_CTX, "flash init") != ERROR_OK) return ERROR_FAIL; |