Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
C99 printf() -Werror fixes
[openocd.git] / src / pld / virtex2.c
diff --git a/src/pld/virtex2.c b/src/pld/virtex2.c
index e0ec27deda6d6b2530cd816d9c5033e14f868079..8407d59e902266db1b9120fa316802db24558299 100644 (file)
--- a/src/pld/virtex2.c
+++ b/src/pld/virtex2.c
@@ -22,18 +22,13 @@
 #endif
 
 #include "virtex2.h"
-
-#include "pld.h"
 #include "xilinx_bit.h"
-#include "command.h"
-#include "log.h"
-#include "jtag.h"
+#include "pld.h"
 
-#include <stdlib.h>
 
-int virtex2_register_commands(struct command_context_s *cmd_ctx);
-int virtex2_pld_device_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct pld_device_s *pld_device);
-int virtex2_load(struct pld_device_s *pld_device, char *filename);
+static int virtex2_register_commands(struct command_context_s *cmd_ctx);
+static int virtex2_pld_device_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct pld_device_s *pld_device);
+static int virtex2_load(struct pld_device_s *pld_device, char *filename);
 
 pld_driver_t virtex2_pld =
 {
@@ -43,182 +38,170 @@ pld_driver_t virtex2_pld =
        .load = virtex2_load,
 };
 
-int virtex2_set_instr(int chain_pos, u32 new_instr)
+static int virtex2_set_instr(jtag_tap_t *tap, uint32_t new_instr)
 {
-       jtag_device_t *device = jtag_get_device(chain_pos);
-       
-       if (buf_get_u32(device->cur_instr, 0, device->ir_length) != new_instr)
+       if (tap == NULL)
+               return ERROR_FAIL;
+
+       if (buf_get_u32(tap->cur_instr, 0, tap->ir_length) != new_instr)
        {
                scan_field_t field;
-       
-               field.device = chain_pos;
-               field.num_bits = device->ir_length;
+
+               field.tap = tap;
+               field.num_bits = tap->ir_length;
                field.out_value = calloc(CEIL(field.num_bits, 8), 1);
                buf_set_u32(field.out_value, 0, field.num_bits, new_instr);
-               field.out_mask = NULL;
                field.in_value = NULL;
-               field.in_check_value = NULL;
-               field.in_check_mask = NULL;
-               field.in_handler = NULL;
-               field.in_handler_priv = NULL;
-               
-               jtag_add_ir_scan(1, &field, TAP_RTI);
-               
+
+               jtag_add_ir_scan(1, &field, jtag_set_end_state(TAP_IDLE));
+
                free(field.out_value);
        }
-       
+
        return ERROR_OK;
 }
 
-int virtex2_send_32(struct pld_device_s *pld_device, int num_words, u32 *words)
+static int virtex2_send_32(struct pld_device_s *pld_device,
+               int num_words, uint32_t *words)
 {
        virtex2_pld_device_t *virtex2_info = pld_device->driver_priv;
        scan_field_t scan_field;
-       u8 *values;
+       uint8_t *values;
        int i;
-       
+
        values = malloc(num_words * 4);
 
-       scan_field.device = virtex2_info->chain_pos;
+       scan_field.tap = virtex2_info->tap;
        scan_field.num_bits = num_words * 32;
        scan_field.out_value = values;
-       scan_field.out_mask = NULL;
        scan_field.in_value = NULL;
-       scan_field.in_check_value = NULL;
-       scan_field.in_check_mask = NULL;
-       scan_field.in_handler = NULL;
-       scan_field.in_handler_priv = NULL;
-       
+
        for (i = 0; i < num_words; i++)
                buf_set_u32(values + 4 * i, 0, 32, flip_u32(*words++, 32));
-       
-       virtex2_set_instr(virtex2_info->chain_pos, 0x5); /* CFG_IN */
-       
-       jtag_add_dr_scan(1, &scan_field, TAP_PD);
-       
+
+       virtex2_set_instr(virtex2_info->tap, 0x5); /* CFG_IN */
+
+       jtag_add_dr_scan(1, &scan_field, jtag_set_end_state(TAP_DRPAUSE));
+
        free(values);
-       
+
        return ERROR_OK;
 }
 
-int virtex2_jtag_buf_to_u32(u8 *in_buf, void *priv, struct scan_field_s *field)
+static __inline__ void virtexflip32(jtag_callback_data_t arg)
 {
-       u32 *dest = priv;
-       *dest = flip_u32(le_to_h_u32(in_buf), 32);
-       return ERROR_OK;
+  uint8_t *in=(uint8_t *)arg;
+       *((uint32_t *)in) = flip_u32(le_to_h_u32(in), 32);
 }
 
-int virtex2_receive_32(struct pld_device_s *pld_device, int num_words, u32 *words)
+static int virtex2_receive_32(struct pld_device_s *pld_device,
+               int num_words, uint32_t *words)
 {
        virtex2_pld_device_t *virtex2_info = pld_device->driver_priv;
        scan_field_t scan_field;
-       
-       scan_field.device = virtex2_info->chain_pos;
+
+       scan_field.tap = virtex2_info->tap;
        scan_field.num_bits = 32;
        scan_field.out_value = NULL;
-       scan_field.out_mask = NULL;
        scan_field.in_value = NULL;
-       scan_field.in_check_value = NULL;
-       scan_field.in_check_mask = NULL;
-       scan_field.in_handler = virtex2_jtag_buf_to_u32;
-       
-       virtex2_set_instr(virtex2_info->chain_pos, 0x4); /* CFG_OUT */
-       
+
+       virtex2_set_instr(virtex2_info->tap, 0x4); /* CFG_OUT */
+
        while (num_words--)
        {
-               scan_field.in_handler_priv = words++;
-               jtag_add_dr_scan(1, &scan_field, TAP_PD);
+               scan_field.in_value = (uint8_t *)words;
+
+               jtag_add_dr_scan(1, &scan_field, jtag_set_end_state(TAP_DRPAUSE));
+
+               jtag_add_callback(virtexflip32, (jtag_callback_data_t)words);
+
+               words++;;
        }
-       
+
        return ERROR_OK;
 }
 
-int virtex2_read_stat(struct pld_device_s *pld_device, u32 *status)
+static int virtex2_read_stat(struct pld_device_s *pld_device, uint32_t *status)
 {
-       u32 data[5];
-       
+       uint32_t data[5];
+
        jtag_add_tlr();
-       
+
        data[0] = 0xaa995566; /* synch word */
        data[1] = 0x2800E001; /* Type 1, read, address 7, 1 word */
        data[2] = 0x20000000; /* NOOP (Type 1, read, address 0, 0 words */
        data[3] = 0x20000000; /* NOOP */
        data[4] = 0x20000000; /* NOOP */
        virtex2_send_32(pld_device, 5, data);
-       
+
        virtex2_receive_32(pld_device, 1, status);
-       
+
        jtag_execute_queue();
-       
-       LOG_DEBUG("status: 0x%8.8x", *status);
-       
+
+       LOG_DEBUG("status: 0x%8.8" PRIx32 "", *status);
+
        return ERROR_OK;
 }
 
-int virtex2_load(struct pld_device_s *pld_device, char *filename)
+static int virtex2_load(struct pld_device_s *pld_device, char *filename)
 {
        virtex2_pld_device_t *virtex2_info = pld_device->driver_priv;
        xilinx_bit_file_t bit_file;
        int retval;
-       int i;
-
+       unsigned int i;
        scan_field_t field;
 
-       field.device = virtex2_info->chain_pos;
-       field.out_mask = NULL;
+       field.tap = virtex2_info->tap;
        field.in_value = NULL;
-       field.in_check_value = NULL;
-       field.in_check_mask = NULL;
-       field.in_handler = NULL;
-       field.in_handler_priv = NULL;
-       
+
        if ((retval = xilinx_read_bit_file(&bit_file, filename)) != ERROR_OK)
                return retval;
-       
-       jtag_add_end_state(TAP_RTI);
-       virtex2_set_instr(virtex2_info->chain_pos, 0xb); /* JPROG_B */
+
+       jtag_set_end_state(TAP_IDLE);
+       virtex2_set_instr(virtex2_info->tap, 0xb); /* JPROG_B */
        jtag_execute_queue();
        jtag_add_sleep(1000);
-       
-       virtex2_set_instr(virtex2_info->chain_pos, 0x5); /* CFG_IN */
+
+       virtex2_set_instr(virtex2_info->tap, 0x5); /* CFG_IN */
        jtag_execute_queue();
-       
+
        for (i = 0; i < bit_file.length; i++)
                bit_file.data[i] = flip_u32(bit_file.data[i], 8);
-       
+
        field.num_bits = bit_file.length * 8;
        field.out_value = bit_file.data;
 
-       jtag_add_dr_scan(1, &field, TAP_PD);
+       jtag_add_dr_scan(1, &field, jtag_set_end_state(TAP_DRPAUSE));
        jtag_execute_queue();
-       
+
        jtag_add_tlr();
-       
-       jtag_add_end_state(TAP_RTI);
-       virtex2_set_instr(virtex2_info->chain_pos, 0xc); /* JSTART */
-       jtag_add_runtest(13, TAP_RTI);
-       virtex2_set_instr(virtex2_info->chain_pos, 0x3f); /* BYPASS */
-       virtex2_set_instr(virtex2_info->chain_pos, 0x3f); /* BYPASS */
-       virtex2_set_instr(virtex2_info->chain_pos, 0xc); /* JSTART */
-       jtag_add_runtest(13, TAP_RTI);
-       virtex2_set_instr(virtex2_info->chain_pos, 0x3f); /* BYPASS */
+
+       jtag_set_end_state(TAP_IDLE);
+       virtex2_set_instr(virtex2_info->tap, 0xc); /* JSTART */
+       jtag_add_runtest(13, jtag_set_end_state(TAP_IDLE));
+       virtex2_set_instr(virtex2_info->tap, 0x3f); /* BYPASS */
+       virtex2_set_instr(virtex2_info->tap, 0x3f); /* BYPASS */
+       virtex2_set_instr(virtex2_info->tap, 0xc); /* JSTART */
+       jtag_add_runtest(13, jtag_set_end_state(TAP_IDLE));
+       virtex2_set_instr(virtex2_info->tap, 0x3f); /* BYPASS */
        jtag_execute_queue();
 
        return ERROR_OK;
 }
 
-int virtex2_handle_read_stat_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+static int virtex2_handle_read_stat_command(struct command_context_s *cmd_ctx,
+               char *cmd, char **args, int argc)
 {
        pld_device_t *device;
        virtex2_pld_device_t *virtex2_info;
-       u32 status;
-       
+       uint32_t status;
+
        if (argc < 1)
        {
                command_print(cmd_ctx, "usage: virtex2 read_stat <num>");
                return ERROR_OK;
        }
-       
+
        device = get_pld_device_by_num(strtoul(args[0], NULL, 0));
        if (!device)
        {
@@ -227,15 +210,15 @@ int virtex2_handle_read_stat_command(struct command_context_s *cmd_ctx, char *cm
        }
 
        virtex2_info = device->driver_priv;
-       
+
        virtex2_read_stat(device, &status);
-       
-       command_print(cmd_ctx, "virtex2 status register: 0x%8.8x", status);
-       
+
+       command_print(cmd_ctx, "virtex2 status register: 0x%8.8" PRIx32 "", status);
+
        return ERROR_OK;
 }
 
-int virtex2_register_commands(struct command_context_s *cmd_ctx)
+static int virtex2_register_commands(struct command_context_s *cmd_ctx)
 {
        command_t *virtex2_cmd = register_command(cmd_ctx, NULL, "virtex2", NULL, COMMAND_ANY, "virtex2 specific commands");
 
@@ -245,20 +228,28 @@ int virtex2_register_commands(struct command_context_s *cmd_ctx)
        return ERROR_OK;
 }
 
-int virtex2_pld_device_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct pld_device_s *pld_device)
+static int virtex2_pld_device_command(struct command_context_s *cmd_ctx,
+               char *cmd, char **args, int argc, struct pld_device_s *pld_device)
 {
+       jtag_tap_t *tap;
+
        virtex2_pld_device_t *virtex2_info;
-       
+
        if (argc < 2)
        {
                LOG_WARNING("incomplete pld device 'virtex2' configuration");
                return ERROR_PLD_DEVICE_INVALID;
        }
-       
+
+       tap = jtag_tap_by_string(args[1]);
+       if (tap == NULL) {
+               command_print( cmd_ctx, "Tap: %s does not exist", args[1] );
+               return ERROR_OK;
+       }
+
        virtex2_info = malloc(sizeof(virtex2_pld_device_t));
        pld_device->driver_priv = virtex2_info;
-       
-       virtex2_info->chain_pos = strtoul(args[1], NULL, 0);
-       
+       virtex2_info->tap = tap;
+
        return ERROR_OK;
 }
Open On-Chip Debugger

Linking to existing account procedure

If you already have an account and want to add another login method you MUST first sign in with your existing account and then change URL to read https://review.openocd.org/login/?link to get to this page again but this time it'll work for linking. Thank you.

SSH host keys fingerprints

1024 SHA256:YKx8b7u5ZWdcbp7/4AeXNaqElP49m6QrwfXaqQGJAOk gerrit-code-review@openocd.zylin.com (DSA)
384 SHA256:jHIbSQa4REvwCFG4cq5LBlBLxmxSqelQPem/EXIrxjk gerrit-code-review@openocd.org (ECDSA)
521 SHA256:UAOPYkU9Fjtcao0Ul/Rrlnj/OsQvt+pgdYSZ4jOYdgs gerrit-code-review@openocd.org (ECDSA)
256 SHA256:A13M5QlnozFOvTllybRZH6vm7iSt0XLxbA48yfc2yfY gerrit-code-review@openocd.org (ECDSA)
256 SHA256:spYMBqEYoAOtK7yZBrcwE8ZpYt6b68Cfh9yEVetvbXg gerrit-code-review@openocd.org (ED25519)
+--[ED25519 256]--+
|=..              |
|+o..   .         |
|*.o   . .        |
|+B . . .         |
|Bo. = o S        |
|Oo.+ + =         |
|oB=.* = . o      |
| =+=.+   + E     |
|. .=o   . o      |
+----[SHA256]-----+
2048 SHA256:0Onrb7/PHjpo6iVZ7xQX2riKN83FJ3KGU0TvI0TaFG4 gerrit-code-review@openocd.zylin.com (RSA)