Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Audit and eliminate redundant #include directives in src/{pld,svf,xsvf}.
[openocd.git] / src / pld / virtex2.c
diff --git a/src/pld/virtex2.c b/src/pld/virtex2.c
index 45c39ae43fe80a84ce068346ba8682473f556730..d9c26760c87fc2d39718ddbeeca636233eebb283 100644 (file)
--- a/src/pld/virtex2.c
+++ b/src/pld/virtex2.c
@@ -22,14 +22,9 @@
 #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);
@@ -43,30 +38,31 @@ pld_driver_t virtex2_pld =
        .load = virtex2_load,
 };
 
-int virtex2_set_instr(int chain_pos, u32 new_instr)
+int virtex2_set_instr(jtag_tap_t *tap, u32 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, TAP_IDLE);
+
                free(field.out_value);
        }
-       
+
        return ERROR_OK;
 }
 
@@ -76,82 +72,69 @@ int virtex2_send_32(struct pld_device_s *pld_device, int num_words, u32 *words)
        scan_field_t scan_field;
        u8 *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, TAP_DRPAUSE);
+
        free(values);
-       
-       return ERROR_OK;
-}
 
-int virtex2_jtag_buf_to_u32(u8 *in_buf, void *priv, struct scan_field_s *field)
-{
-       u32 *dest = priv;
-       *dest = flip_u32(le_to_h_u32(in_buf), 32);
        return ERROR_OK;
 }
 
+
 int virtex2_receive_32(struct pld_device_s *pld_device, int num_words, u32 *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 */
-       
+       u8 tmp[4];
+       scan_field.in_value = tmp;
+
+       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);
+               jtag_add_dr_scan_now(1, &scan_field, TAP_DRPAUSE);
+
+               *words++=flip_u32(le_to_h_u32(tmp), 32);
        }
-       
+
        return ERROR_OK;
 }
 
 int virtex2_read_stat(struct pld_device_s *pld_device, u32 *status)
 {
        u32 data[5];
-       
-       jtag_add_statemove(TAP_TLR);
-       
+
+       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);
-       
+
        return ERROR_OK;
 }
 
@@ -160,48 +143,48 @@ 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_add_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, TAP_DRPAUSE);
        jtag_execute_queue();
-       
-       jtag_add_statemove(TAP_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_add_tlr();
+
+       jtag_add_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 */
+       virtex2_set_instr(virtex2_info->tap, 0x3f); /* BYPASS */
+       virtex2_set_instr(virtex2_info->tap, 0xc); /* JSTART */
+       jtag_add_runtest(13, TAP_IDLE);
+       virtex2_set_instr(virtex2_info->tap, 0x3f); /* BYPASS */
        jtag_execute_queue();
 
        return ERROR_OK;
@@ -212,13 +195,13 @@ int virtex2_handle_read_stat_command(struct command_context_s *cmd_ctx, char *cm
        pld_device_t *device;
        virtex2_pld_device_t *virtex2_info;
        u32 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,11 +210,11 @@ 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);
-       
+
        return ERROR_OK;
 }
 
@@ -247,18 +230,25 @@ 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)
 {
+       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_TapByString( 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)