libjaylink: Update to latest Git version

[openocd.git] / src / jtag / adapter.c

diff --git a/src/jtag/adapter.c b/src/jtag/adapter.c
index 24706f5624e5fb145a45bfef8e0b311673ad421e..e11f4e9067efdc9a1e51be1d9361409e89f3312a 100644 (file)
--- a/src/jtag/adapter.c
+++ b/src/jtag/adapter.c
@@ -114,10 +114,10 @@ COMMAND_HANDLER(handle_interface_list_command)
        if (strcmp(CMD_NAME, "interface_list") == 0 && CMD_ARGC > 0)
                return ERROR_COMMAND_SYNTAX_ERROR;
 
-       command_print(CMD_CTX, "The following debug interfaces are available:");
+       command_print(CMD, "The following debug interfaces are available:");
        for (unsigned i = 0; NULL != jtag_interfaces[i]; i++) {
                const char *name = jtag_interfaces[i]->name;
-               command_print(CMD_CTX, "%u: %s", i + 1, name);
+               command_print(CMD, "%u: %s", i + 1, name);
        }
 
        return ERROR_OK;
@@ -394,7 +394,7 @@ next:
                modes[5] = "";
        }
 
-       command_print(CMD_CTX, "%s %s%s%s%s%s",
+       command_print(CMD, "%s %s%s%s%s%s",
                        modes[0], modes[1],
                        modes[2], modes[3], modes[4], modes[5]);
 
@@ -411,7 +411,7 @@ COMMAND_HANDLER(handle_adapter_nsrst_delay_command)
 
                jtag_set_nsrst_delay(delay);
        }
-       command_print(CMD_CTX, "adapter_nsrst_delay: %u", jtag_get_nsrst_delay());
+       command_print(CMD, "adapter_nsrst_delay: %u", jtag_get_nsrst_delay());
        return ERROR_OK;
 }
 
@@ -425,7 +425,7 @@ COMMAND_HANDLER(handle_adapter_nsrst_assert_width_command)
 
                jtag_set_nsrst_assert_width(width);
        }
-       command_print(CMD_CTX, "adapter_nsrst_assert_width: %u", jtag_get_nsrst_assert_width());
+       command_print(CMD, "adapter_nsrst_assert_width: %u", jtag_get_nsrst_assert_width());
        return ERROR_OK;
 }
 
@@ -450,9 +450,9 @@ COMMAND_HANDLER(handle_adapter_khz_command)
                return retval;
 
        if (cur_speed)
-               command_print(CMD_CTX, "adapter speed: %d kHz", cur_speed);
+               command_print(CMD, "adapter speed: %d kHz", cur_speed);
        else
-               command_print(CMD_CTX, "adapter speed: RCLK - adaptive");
+               command_print(CMD, "adapter speed: RCLK - adaptive");
 
        return retval;
 }
@@ -464,7 +464,7 @@ COMMAND_HANDLER(handle_usb_location_command)
        if (CMD_ARGC == 1)
                jtag_usb_set_location(CMD_ARGV[0]);
 
-       command_print(CMD_CTX, "adapter usb location: %s", jtag_usb_get_location());
+       command_print(CMD, "adapter usb location: %s", jtag_usb_get_location());
 
        return ERROR_OK;
 }
@@ -476,8 +476,8 @@ static const struct command_registration adapter_usb_command_handlers[] = {
                .name = "location",
                .handler = &handle_usb_location_command,
                .mode = COMMAND_CONFIG,
-               .help = "set the USB bus location of the USB device",
-               .usage = "<bus>-port[.port]...",
+               .help = "display or set the USB bus location of the USB device",
+               .usage = "[<bus>-port[.port]...]",
        },
 #endif /* HAVE_LIBUSB_GET_PORT_NUMBERS */
        COMMAND_REGISTRATION_DONE