command_registration: add empty usage field to chained commands

[openocd.git] / src / jtag / drivers / jlink.c

diff --git a/src/jtag/drivers/jlink.c b/src/jtag/drivers/jlink.c
index 132ef06e98f7fb3ed717292ce002b75c58ec2c65..c81579ab29e9a39242f584f53c020b57aed6ecda 100644 (file)
--- a/src/jtag/drivers/jlink.c
+++ b/src/jtag/drivers/jlink.c
@@ -1263,7 +1263,7 @@ static bool check_trace_freq(struct jaylink_swo_speed speed,
        return false;
 }
 
-static int config_trace(bool enabled, enum tpio_pin_protocol pin_protocol,
+static int config_trace(bool enabled, enum tpiu_pin_protocol pin_protocol,
                uint32_t port_size, unsigned int *trace_freq)
 {
        int ret;
@@ -1275,7 +1275,7 @@ static int config_trace(bool enabled, enum tpio_pin_protocol pin_protocol,
                return ERROR_FAIL;
        }
 
-       if (pin_protocol != ASYNC_UART) {
+       if (pin_protocol != TPIU_PIN_PROTOCOL_ASYNC_UART) {
                LOG_ERROR("Selected pin protocol is not supported.");
                return ERROR_FAIL;
        }
@@ -1849,12 +1849,14 @@ static const struct command_registration jlink_subcommand_handlers[] = {
                .help = "access the device configuration. If no argument is given "
                        "this will show the device configuration",
                .chain = jlink_config_subcommand_handlers,
+               .usage = "[<cmd>]",
        },
        {
                .name = "emucom",
                .mode = COMMAND_EXEC,
                .help = "access EMUCOM channel",
-               .chain = jlink_emucom_subcommand_handlers
+               .chain = jlink_emucom_subcommand_handlers,
+               .usage = "",
        },
        COMMAND_REGISTRATION_DONE
 };
@@ -1865,6 +1867,7 @@ static const struct command_registration jlink_command_handlers[] = {
                .mode = COMMAND_ANY,
                .help = "perform jlink management",
                .chain = jlink_subcommand_handlers,
+               .usage = "",
        },
        COMMAND_REGISTRATION_DONE
 };
@@ -2130,7 +2133,7 @@ skip:
 static void jlink_swd_queue_cmd(uint8_t cmd, uint32_t *dst, uint32_t data, uint32_t ap_delay_clk)
 {
        uint8_t data_parity_trn[DIV_ROUND_UP(32 + 1, 8)];
-       if (tap_length + 46 + 8 + ap_delay_clk >= sizeof(tdi_buffer) * 8 ||
+       if (tap_length + 46 + 8 + ap_delay_clk >= swd_buffer_size * 8 ||
            pending_scan_results_length == MAX_PENDING_SCAN_RESULTS) {
                /* Not enough room in the queue. Run the queue. */
                queued_retval = jlink_swd_run_queue();