X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftransport%2Ftransport.c;h=77db9e21099f81eeaf19b1c09518959b824385be;hp=06f09c99882137242a4b4c7dfe171b4b7e3410e1;hb=6cb5ba6f1136df2986850f5c176cb38e34ca1795;hpb=08d4411b59dd8bd0e7d8009003b71d23acbf6eee

diff --git a/src/transport/transport.c b/src/transport/transport.c
index 06f09c9988..77db9e2109 100644
--- a/src/transport/transport.c
+++ b/src/transport/transport.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
@@ -61,7 +60,7 @@ static struct transport *transport_list;
  * currently selected debug adapter supports.  This is declared
  * by the time that adapter is fully set up.
  */
-static const char **allowed_transports;
+static const char * const *allowed_transports;
 
 /** * The transport being used for the current OpenOCD session.  */
 static struct transport *session;
@@ -94,7 +93,7 @@ static int transport_select(struct command_context *ctx, const char *name)
  * to declare the set of transports supported by an adapter.  When
  * there is only one member of that set, it is automatically selected.
  */
-int allow_transports(struct command_context *ctx, const char **vector)
+int allow_transports(struct command_context *ctx, const char * const *vector)
 {
 	/* NOTE:  caller is required to provide only a list
 	 * of *valid* transport names
@@ -206,7 +205,7 @@ COMMAND_HELPER(transport_list_parse, char ***vector)
 		return ERROR_COMMAND_SYNTAX_ERROR;
 
 	/* our return vector must be NULL terminated */
-	argv = (char **) calloc(n + 1, sizeof(char *));
+	argv = calloc(n + 1, sizeof(char *));
 	if (argv == NULL)
 		return ERROR_FAIL;
 
@@ -239,12 +238,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 */
-		const char **vector = allowed_transports;
+		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;
@@ -258,10 +258,10 @@ COMMAND_HANDLER(handle_transport_list)
 	if (CMD_ARGC != 0)
 		return ERROR_COMMAND_SYNTAX_ERROR;
 
-	command_print(CMD_CTX, "The following transports are available:");
+	command_print(CMD, "The following transports are available:");
 
 	for (struct transport *t = transport_list; t; t = t->next)
-		command_print(CMD_CTX, "\t%s", t->name);
+		command_print(CMD, "\t%s", t->name);
 
 	return ERROR_OK;
 }
@@ -274,21 +274,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 +316,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);