X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftransport%2Ftransport.c;h=708594712b6cbf679ef46892f9429705c3e8e4a3;hp=3f5337e35a7c95464ffd4d9bed48c1047360cc68;hb=d0e763ac7ef6aa17b17bd00ccdfbccfb4eacda69;hpb=80ea8053329d84157666ed36afb7cff73ab505a6
diff --git a/src/transport/transport.c b/src/transport/transport.c
index 3f5337e35a..708594712b 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 .
*/
#ifdef HAVE_CONFIG_H
@@ -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 '");
/* 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,20 +274,28 @@ 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 '.", 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) {
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");
@@ -308,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);