cmd: add missing usage vars

[fw/openocd] / src / pld / virtex2.c

diff --git a/src/pld/virtex2.c b/src/pld/virtex2.c
index 93509dec1cd8ec06eb3a8fd4cac132409d8dab7c..74fcc40d9ddd099328d85e22774a2e2f7b1f2e30 100644 (file)
--- a/src/pld/virtex2.c
+++ b/src/pld/virtex2.c
@@ -36,13 +36,14 @@ static int virtex2_set_instr(struct jtag_tap *tap, uint32_t new_instr)
                struct scan_field field;
 
                field.num_bits = tap->ir_length;
-               field.out_value = calloc(DIV_ROUND_UP(field.num_bits, 8), 1);
-               buf_set_u32(field.out_value, 0, field.num_bits, new_instr);
+               void * t = calloc(DIV_ROUND_UP(field.num_bits, 8), 1);
+               field.out_value = t;
+               buf_set_u32(t, 0, field.num_bits, new_instr);
                field.in_value = NULL;
 
                jtag_add_ir_scan(tap, &field, TAP_IDLE);
 
-               free(field.out_value);
+               free(t);
        }
 
        return ERROR_OK;
@@ -77,7 +78,7 @@ static int virtex2_send_32(struct pld_device *pld_device,
 static __inline__ void virtexflip32(jtag_callback_data_t arg)
 {
   uint8_t *in = (uint8_t *)arg;
-       *((uint32_t *)in) = flip_u32(le_to_h_u32(in), 32);
+       *((uint32_t *)arg) = flip_u32(le_to_h_u32(in), 32);
 }
 
 static int virtex2_receive_32(struct pld_device *pld_device,
@@ -141,7 +142,6 @@ static int virtex2_load(struct pld_device *pld_device, const char *filename)
        if ((retval = xilinx_read_bit_file(&bit_file, filename)) != ERROR_OK)
                return retval;
 
-       jtag_set_end_state(TAP_IDLE);
        virtex2_set_instr(virtex2_info->tap, 0xb); /* JPROG_B */
        jtag_execute_queue();
        jtag_add_sleep(1000);
@@ -160,7 +160,6 @@ static int virtex2_load(struct pld_device *pld_device, const char *filename)
 
        jtag_add_tlr();
 
-       jtag_set_end_state(TAP_IDLE);
        virtex2_set_instr(virtex2_info->tap, 0xc); /* JSTART */
        jtag_add_runtest(13, TAP_IDLE);
        virtex2_set_instr(virtex2_info->tap, 0x3f); /* BYPASS */
@@ -176,13 +175,11 @@ static int virtex2_load(struct pld_device *pld_device, const char *filename)
 COMMAND_HANDLER(virtex2_handle_read_stat_command)
 {
        struct pld_device *device;
-       struct virtex2_pld_device *virtex2_info;
        uint32_t status;
 
        if (CMD_ARGC < 1)
        {
-               command_print(CMD_CTX, "usage: virtex2 read_stat <num>");
-               return ERROR_OK;
+               return ERROR_COMMAND_SYNTAX_ERROR;
        }
 
        unsigned dev_id;
@@ -194,8 +191,6 @@ COMMAND_HANDLER(virtex2_handle_read_stat_command)
                return ERROR_OK;
        }
 
-       virtex2_info = device->driver_priv;
-
        virtex2_read_stat(device, &status);
 
        command_print(CMD_CTX, "virtex2 status register: 0x%8.8" PRIx32 "", status);
@@ -211,8 +206,7 @@ PLD_DEVICE_COMMAND_HANDLER(virtex2_pld_device_command)
 
        if (CMD_ARGC < 2)
        {
-               LOG_WARNING("incomplete pld device 'virtex2' configuration");
-               return ERROR_PLD_DEVICE_INVALID;
+               return ERROR_COMMAND_SYNTAX_ERROR;
        }
 
        tap = jtag_tap_by_string(CMD_ARGV[1]);
@@ -244,6 +238,7 @@ static const struct command_registration virtex2_command_handler[] = {
                .name = "virtex2",
                .mode = COMMAND_ANY,
                .help = "Virtex-II specific commands",
+               .usage = "",
                .chain = virtex2_exec_command_handlers,
        },
        COMMAND_REGISTRATION_DONE