From: Spencer O. <nt...@us...> - 2010-07-09 23:03:48
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Main OpenOCD repository". The branch, master has been updated via ac5ad4ad8d0312259974d4aeb947a43fa815c3a8 (commit) from daa02f7d84017f21c3ffa2be9997560d353a8829 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit ac5ad4ad8d0312259974d4aeb947a43fa815c3a8 Author: Spencer Oliver <nt...@us...> Date: Fri Jul 9 22:02:52 2010 +0100 transport: fix bug/typo in transport_register cmd Signed-off-by: Spencer Oliver <nt...@us...> diff --git a/src/jtag/core.c b/src/jtag/core.c index 1643d9b..f7bbe8d 100644 --- a/src/jtag/core.c +++ b/src/jtag/core.c @@ -1359,14 +1359,13 @@ int adapter_init(struct command_context *cmd_ctx) if (!transports_are_declared()) { static const char *jtag_only[] = { "jtag", NULL, }; LOG_ERROR("Adapter driver '%s' did not declare " - "which transports it allows; assuming" + "which transports it allows; assuming " "JTAG-only", jtag->name); int retval = allow_transports(cmd_ctx, jtag_only); if (retval != ERROR_OK) return retval; } - int requested_khz = jtag_get_speed_khz(); int actual_khz = requested_khz; int retval = jtag_get_speed_readable(&actual_khz); @@ -1734,7 +1733,6 @@ static int jtag_select(struct command_context *ctx) * That works with only C code ... no Tcl glue required. */ - retval = jtag_register_commands(ctx); if (retval != ERROR_OK) diff --git a/src/jtag/drivers/ft2232.c b/src/jtag/drivers/ft2232.c index f02ae62..f06e13b 100644 --- a/src/jtag/drivers/ft2232.c +++ b/src/jtag/drivers/ft2232.c @@ -3207,7 +3207,7 @@ COMMAND_HANDLER(ft2232_handle_layout_command) if (strcmp(l->name, CMD_ARGV[0]) == 0) { layout = l; /* This may also select the transport - * if we only suppport one of them. + * if we only support one of them. */ return allow_transports(CMD_CTX, l->transports ? : jtag_only); diff --git a/src/jtag/transport.c b/src/jtag/transport.c index e431fee..cce45fb 100644 --- a/src/jtag/transport.c +++ b/src/jtag/transport.c @@ -166,7 +166,7 @@ int transport_register(struct transport *new_transport) /* splice this into the list */ new_transport->next = transport_list; transport_list = new_transport; - LOG_DEBUG("register '%s'", t->name); + LOG_DEBUG("register '%s'", new_transport->name); return ERROR_OK; } ----------------------------------------------------------------------- Summary of changes: src/jtag/core.c | 4 +--- src/jtag/drivers/ft2232.c | 2 +- src/jtag/transport.c | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) hooks/post-receive -- Main OpenOCD repository |