diff options
| author | David Brownell <dbrownell@users.sourceforge.net> | 2010-07-02 16:45:28 -0400 |
|---|---|---|
| committer | David Brownell <db@helium.(none)> | 2010-07-02 16:45:28 -0400 |
| commit | 93f2afa45f4cfcb8afd08dae5a17996dba5c7a9c (patch) | |
| tree | 0c03935bd09e77c5edd98e1b356f0ffbc3df239b /src/openocd.c | |
| parent | deb176d33514eb6b702b14043c338b2d0053f11d (diff) | |
| download | openocd+libswd-93f2afa45f4cfcb8afd08dae5a17996dba5c7a9c.tar.gz openocd+libswd-93f2afa45f4cfcb8afd08dae5a17996dba5c7a9c.tar.bz2 openocd+libswd-93f2afa45f4cfcb8afd08dae5a17996dba5c7a9c.tar.xz openocd+libswd-93f2afa45f4cfcb8afd08dae5a17996dba5c7a9c.zip | |
initial "transport" framework
This adds the guts of a transport framework with initialization,
which should work with current JTAG-only configurations (tested
with FT2232).
Each debug adapter can declare the transports it supports, and
exactly one transport is initialized. (with its commands) in
any given OpenOCD session.
* Define a new "struct transport with init hooks and a few
"transport" subcommands to support it:
"list" ... list the transports configured (just "jtag" for now)
"select" ... makes the debug session use that transport
"init" ... initializes the selected transport (internal)
* "interface_transports" ... declares transports the current interface
can support. (Some will do this from C code instead, when there are
no hardware versioning (or other) issues to prevent it.
Plus some FT2232 tweaks, including a few to streamline upcoming
support for an SWD transport (initially for Luminary adapters).
Eventually src/jtag should probably become src/transport, moving
jtag-specific stuff to transport/jtag.
Signed-off-by: David Brownell <db@helium.(none)>
Diffstat (limited to 'src/openocd.c')
| -rw-r--r-- | src/openocd.c | 34 |
1 files changed, 16 insertions, 18 deletions
diff --git a/src/openocd.c b/src/openocd.c index 96de50c8..bba1e0bf 100644 --- a/src/openocd.c +++ b/src/openocd.c @@ -31,10 +31,9 @@ #include "openocd.h" #include <jtag/driver.h> #include <jtag/jtag.h> +#include <jtag/transport.h> #include <helper/ioutil.h> #include <helper/configuration.h> -#include <xsvf/xsvf.h> -#include <svf/svf.h> #include <flash/nor/core.h> #include <flash/nand/core.h> #include <pld/pld.h> @@ -120,22 +119,24 @@ COMMAND_HANDLER(handle_init_command) /* we must be able to set up the debug adapter */ return retval; } + LOG_DEBUG("Debug Adapter init complete"); - /* Try to initialize & examine the JTAG chain at this point, - * but continue startup regardless. Note that platforms - * need to be able to provide JTAG event handlers that use - * a variety of JTAG operations in order to do that... + /* "transport init" verifies the expected devices are present; + * for JTAG, it checks the list of configured TAPs against + * what's discoverable, possibly with help from the platform's + * JTAG event handlers. (which require COMMAND_EXEC) */ command_context_mode(CMD_CTX, COMMAND_EXEC); - if (command_run_line(CMD_CTX, "jtag init") == ERROR_OK) - { - LOG_DEBUG("Examining targets..."); - if (target_examine() != ERROR_OK) - LOG_DEBUG("target examination failed"); - } - else - LOG_WARNING("jtag initialization failed; try 'jtag init' again."); + + retval = command_run_line(CMD_CTX, "transport init"); + if (ERROR_OK != retval) + return ERROR_FAIL; + + LOG_DEBUG("Examining targets..."); + if (target_examine() != ERROR_OK) + LOG_DEBUG("target examination failed"); + command_context_mode(CMD_CTX, COMMAND_CONFIG); if (command_run_line(CMD_CTX, "flash init") != ERROR_OK) @@ -227,16 +228,13 @@ struct command_context *setup_command_handler(Jim_Interp *interp) &server_register_commands, &gdb_register_commands, &log_register_commands, + &transport_register_commands, &interface_register_commands, - &jtag_register_commands, - &xsvf_register_commands, - &svf_register_commands, &target_register_commands, &flash_register_commands, &nand_register_commands, &pld_register_commands, &mflash_register_commands, - NULL }; for (unsigned i = 0; NULL != command_registrants[i]; i++) { |