X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftransport%2Ftransport.c;h=c973e1c3a9ff783f344ee608ef5663ffd5583a4e;hb=d90b86d8e35f4f681eb341ca534985eb1046cc59;hp=072a0d38544d59b0c18f0748efe3d10b266753d1;hpb=cc99e57b0e8ed3672afce1925142863cceb809f2;p=openocd.git

diff --git a/src/transport/transport.c b/src/transport/transport.c
index 072a0d3854..c973e1c3a9 100644
--- a/src/transport/transport.c
+++ b/src/transport/transport.c
@@ -239,12 +239,13 @@ COMMAND_HANDLER(handle_transport_init)
 {
 	LOG_DEBUG("%s", __func__);
 	if (!session) {
-		LOG_ERROR("session's transport is not selected.");
+		LOG_ERROR("session transport was not selected. Use 'transport select <transport>'");
 
 		/* no session transport configured, print transports then fail */
+		LOG_ERROR("Transports available:");
 		const char * const *vector = allowed_transports;
 		while (*vector) {
-			LOG_ERROR("allow transport '%s'", *vector);
+			LOG_ERROR("%s", *vector);
 			vector++;
 		}
 		return ERROR_FAIL;
@@ -274,21 +275,33 @@ COMMAND_HANDLER(handle_transport_list)
  */
 static int jim_transport_select(Jim_Interp *interp, int argc, Jim_Obj * const *argv)
 {
+	int res;
 	switch (argc) {
-		case 1:		/* return/display */
+		case 1:	/* autoselect if necessary, then return/display current config */
 			if (!session) {
-				LOG_ERROR("session's transport is not selected.");
-				return JIM_ERR;
-			} else {
-				Jim_SetResultString(interp, session->name, -1);
-				return JIM_OK;
+				if (!allowed_transports) {
+					LOG_ERROR("Debug adapter does not support any transports? Check config file order.");
+					return JIM_ERR;
+				}
+				LOG_INFO("auto-selecting first available session transport \"%s\". "
+					 "To override use 'transport select <transport>'.", allowed_transports[0]);
+				res = transport_select(global_cmd_ctx, allowed_transports[0]);
+				if (res != JIM_OK)
+					return res;
 			}
+			Jim_SetResultString(interp, session->name, -1);
+			return JIM_OK;
 			break;
-		case 2:		/* assign */
+		case 2:	/* assign */
 			if (session) {
-				/* can't change session's transport after-the-fact */
-				LOG_ERROR("session's transport is already selected.");
-				return JIM_ERR;
+				if (!strcmp(session->name, argv[1]->bytes)) {
+					LOG_WARNING("Transport \"%s\" was already selected", session->name);
+					Jim_SetResultString(interp, session->name, -1);
+					return JIM_OK;
+				} else {
+					LOG_ERROR("Can't change session's transport after the initial selection was made");
+					return JIM_ERR;
+				}
 			}
 
 			/* Is this transport supported by our debug adapter?
@@ -304,8 +317,13 @@ static int jim_transport_select(Jim_Interp *interp, int argc, Jim_Obj * const *a
 
 			for (unsigned i = 0; allowed_transports[i]; i++) {
 
-				if (strcmp(allowed_transports[i], argv[1]->bytes) == 0)
-					return transport_select(global_cmd_ctx, argv[1]->bytes);
+				if (strcmp(allowed_transports[i], argv[1]->bytes) == 0) {
+					if (transport_select(global_cmd_ctx, argv[1]->bytes) == ERROR_OK) {
+						Jim_SetResultString(interp, session->name, -1);
+						return JIM_OK;
+					}
+					return JIM_ERR;
+				}
 			}
 
 			LOG_ERROR("Debug adapter doesn't support '%s' transport", argv[1]->bytes);