ChibiOS: struct ChibiOS_params_list[] should not be const

[openocd.git] / src / transport / transport.c

diff --git a/src/transport/transport.c b/src/transport/transport.c
index 072a0d38544d59b0c18f0748efe3d10b266753d1..c57064bbdde8b40d0e17c0155ea98769e7eb4367 100644 (file)
--- 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;
@@ -277,7 +278,7 @@ static int jim_transport_select(Jim_Interp *interp, int argc, Jim_Obj * const *a
        switch (argc) {
                case 1:         /* return/display */
                        if (!session) {
-                               LOG_ERROR("session's transport is not selected.");
+                               LOG_ERROR("session transport was not selected. Use 'transport select <transport>'");
                                return JIM_ERR;
                        } else {
                                Jim_SetResultString(interp, session->name, -1);
@@ -286,9 +287,13 @@ static int jim_transport_select(Jim_Interp *interp, int argc, Jim_Obj * const *a
                        break;
                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);
+                                       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?