diff options
| author | Tomek CEDRO <cederom@tlen.pl> | 2011-06-25 14:16:06 +0200 |
|---|---|---|
| committer | Tomek CEDRO <cederom@tlen.pl> | 2011-06-25 14:16:06 +0200 |
| commit | 2c7b391eb3179f6c095890741214afcf8dc6ff29 (patch) | |
| tree | a79216abe804ffa9234370e5dd8ab05b6e028911 /src/jtag | |
| parent | 202a2abedf4ab87e9ae61b6ede5db615f0c1a131 (diff) | |
| download | openocd+libswd-2c7b391eb3179f6c095890741214afcf8dc6ff29.tar.gz openocd+libswd-2c7b391eb3179f6c095890741214afcf8dc6ff29.tar.bz2 openocd+libswd-2c7b391eb3179f6c095890741214afcf8dc6ff29.tar.xz openocd+libswd-2c7b391eb3179f6c095890741214afcf8dc6ff29.zip | |
TRANSPORT: Supported transport names lists are now declared by src/transport.h and defined by src/transport.c. Multiple definitions of 'jtag_only' were removed and code was updated to use 'oocd_transport_jtag_only' (also updated headers if necessary) as defined by src/transport.
Diffstat (limited to 'src/jtag')
| -rw-r--r-- | src/jtag/adapter.c | 3 | ||||
| -rw-r--r-- | src/jtag/core.c | 2 | ||||
| -rw-r--r-- | src/jtag/drivers/ft2232.c | 2 | ||||
| -rw-r--r-- | src/jtag/interface.h | 2 |
4 files changed, 3 insertions, 6 deletions
diff --git a/src/jtag/adapter.c b/src/jtag/adapter.c index 628bfaee..7cacd62f 100644 --- a/src/jtag/adapter.c +++ b/src/jtag/adapter.c @@ -50,7 +50,6 @@ */ extern struct jtag_interface *jtag_interface; -const char *jtag_only[] = { "jtag", NULL }; static int jim_adapter_name(Jim_Interp *interp, int argc, Jim_Obj *const *argv) @@ -169,7 +168,7 @@ COMMAND_HANDLER(handle_interface_command) "which transports it allows; assuming " "legacy JTAG-only", jtag_interface->name); retval = allow_transports(CMD_CTX, jtag_interface->transports - ? jtag_interface->transports : jtag_only); + ? jtag_interface->transports : oocd_transport_jtag_only); if (ERROR_OK != retval) return retval; diff --git a/src/jtag/core.c b/src/jtag/core.c index b26701e3..1345de8f 100644 --- a/src/jtag/core.c +++ b/src/jtag/core.c @@ -1384,7 +1384,7 @@ int adapter_init(struct command_context *cmd_ctx) LOG_ERROR("Adapter driver '%s' did not declare " "which transports it allows; assuming " "JTAG-only", jtag->name); - retval = allow_transports(cmd_ctx, jtag_only); + retval = allow_transports(cmd_ctx, oocd_transport_jtag_only); if (retval != ERROR_OK) return retval; } diff --git a/src/jtag/drivers/ft2232.c b/src/jtag/drivers/ft2232.c index 215c13e8..8ceaa645 100644 --- a/src/jtag/drivers/ft2232.c +++ b/src/jtag/drivers/ft2232.c @@ -4683,7 +4683,7 @@ struct jtag_interface ft2232_interface = { .name = "ft2232", .supported = DEBUG_CAP_TMS_SEQ, .commands = ft2232_command_handlers, - .transports = jtag_only, + .transports = oocd_transport_jtag_only, .init = ft2232_init, .quit = ft2232_quit, diff --git a/src/jtag/interface.h b/src/jtag/interface.h index 9c30352c..d98751df 100644 --- a/src/jtag/interface.h +++ b/src/jtag/interface.h @@ -328,8 +328,6 @@ struct jtag_interface { }; -extern const char *jtag_only[]; - extern const struct swd_driver *swd; #endif // OPENOCD_JTAG_INTERFACE_H |