interesting
/
riscv-openocd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

build: cleanup src/transport directory 

Change-Id: If73da1a7272602314f042c3e3c0e61050530998d
Signed-off-by: Spencer Oliver <spen@spen-soft.co.uk>
Reviewed-on: http://openocd.zylin.com/411
Tested-by: jenkins
This commit is contained in:
Spencer Oliver 2012-01-27 17:05:35 +00:00
parent f7772ccb49
commit 91e054a9ea
1 changed files with 46 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/transport/transport.c
View File

@ -43,12 +43,10 @@
*/ */
#include <helper/log.h> #include <helper/log.h>
#include <transport/transport.h> #include <transport/transport.h>
extern struct command_context *global_cmd_ctx; extern struct command_context *global_cmd_ctx;
/*-----------------------------------------------------------------------*/ /*-----------------------------------------------------------------------*/
/* /*
@ -82,8 +80,7 @@ static int transport_select(struct command_context *ctx, const char *name)
if (retval == ERROR_OK) if (retval == ERROR_OK)
session = t; session = t;
else else
LOG_ERROR("Error selecting '%s' as " LOG_ERROR("Error selecting '%s' as transport", t->name);
"transport", t->name);
return retval; return retval;
} }
} }
@ -114,14 +111,12 @@ int allow_transports(struct command_context *ctx, const char **vector)
return ERROR_FAIL; return ERROR_FAIL;
} }
allowed_transports = vector; allowed_transports = vector;
/* autoselect if there's no choice ... */ /* autoselect if there's no choice ... */
if (!vector[1]) { if (!vector[1]) {
LOG_INFO("only one transport option; autoselect '%s'", LOG_INFO("only one transport option; autoselect '%s'", vector[0]);
vector[0]); return transport_select(ctx, vector[0]);
return transport_select(ctx, vector [0]);
} else { } else {
/* guard against user config errors */ /* guard against user config errors */
LOG_WARNING("must select a transport."); LOG_WARNING("must select a transport.");
@ -133,7 +128,6 @@ int allow_transports(struct command_context *ctx, const char **vector)
} }
} }
/** /**
* Used to verify corrrect adapter driver initialization. * Used to verify corrrect adapter driver initialization.
* *
@ -170,9 +164,8 @@ int transport_register(struct transport *new_transport)
} }
} }
if (!new_transport->select || !new_transport->init) { if (!new_transport->select || !new_transport->init)
LOG_ERROR("invalid transport %s", new_transport->name); LOG_ERROR("invalid transport %s", new_transport->name);
}
/* splice this into the list */ /* splice this into the list */
new_transport->next = transport_list; new_transport->next = transport_list;
@ -190,12 +183,10 @@ int transport_register(struct transport *new_transport)
*/ */
struct transport *get_current_transport(void) struct transport *get_current_transport(void)
{ {
/* REVISIT -- constify */ /* REVISIT -- constify */
return session; return session;
} }
/*-----------------------------------------------------------------------*/ /*-----------------------------------------------------------------------*/
/* /*
@ -280,7 +271,7 @@ COMMAND_HANDLER(handle_transport_list)
* set supported by the debug adapter being used. Return value * set supported by the debug adapter being used. Return value
* is scriptable (allowing "if swd then..." etc). * is scriptable (allowing "if swd then..." etc).
*/ */
static int jim_transport_select(Jim_Interp *interp, int argc, Jim_Obj *const *argv) static int jim_transport_select(Jim_Interp *interp, int argc, Jim_Obj * const *argv)
{ {
switch (argc) { switch (argc) {
case 1: /* return/display */ case 1: /* return/display */
@ -316,8 +307,7 @@ static int jim_transport_select(Jim_Interp *interp, int argc, Jim_Obj *const *ar
return transport_select(global_cmd_ctx, argv[1]->bytes); return transport_select(global_cmd_ctx, argv[1]->bytes);
} }
LOG_ERROR("Debug adapter doesn't support '%s' " LOG_ERROR("Debug adapter doesn't support '%s' transport", argv[1]->bytes);
"transport", argv[1]->bytes);
return JIM_ERR; return JIM_ERR;
break; break;
default: default:
@ -366,7 +356,6 @@ static const struct command_registration transport_group[] = {
COMMAND_REGISTRATION_DONE COMMAND_REGISTRATION_DONE
}; };
int transport_register_commands(struct command_context *ctx) int transport_register_commands(struct command_context *ctx)
{ {
return register_commands(ctx, NULL, transport_group); return register_commands(ctx, NULL, transport_group);