Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Remove support for the GPL incompatible FTDI D2XX library
[openocd.git] / src / pld / virtex2.c
diff --git a/src/pld/virtex2.c b/src/pld/virtex2.c
index 15685e61b675c1e7fd17b4bf489388e72dbfef2b..4e385e97b1f394f0a9385444b77ed21750f996d2 100644 (file)
--- a/src/pld/virtex2.c
+++ b/src/pld/virtex2.c
@@ -13,10 +13,9 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -25,31 +24,30 @@
 #include "xilinx_bit.h"
 #include "pld.h"
 
-
 static int virtex2_set_instr(struct jtag_tap *tap, uint32_t new_instr)
 {
        if (tap == NULL)
                return ERROR_FAIL;
 
-       if (buf_get_u32(tap->cur_instr, 0, tap->ir_length) != new_instr)
-       {
+       if (buf_get_u32(tap->cur_instr, 0, tap->ir_length) != 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, 1, &field, jtag_set_end_state(TAP_IDLE));
+               jtag_add_ir_scan(tap, &field, TAP_IDLE);
 
-               free(field.out_value);
+               free(t);
        }
 
        return ERROR_OK;
 }
 
 static int virtex2_send_32(struct pld_device *pld_device,
-               int num_words, uint32_t *words)
+       int num_words, uint32_t *words)
 {
        struct virtex2_pld_device *virtex2_info = pld_device->driver_priv;
        struct scan_field scan_field;
@@ -65,23 +63,23 @@ static int virtex2_send_32(struct pld_device *pld_device,
        for (i = 0; i < num_words; i++)
                buf_set_u32(values + 4 * i, 0, 32, flip_u32(*words++, 32));
 
-       virtex2_set_instr(virtex2_info->tap, 0x5); /* CFG_IN */
+       virtex2_set_instr(virtex2_info->tap, 0x5);      /* CFG_IN */
 
-       jtag_add_dr_scan(virtex2_info->tap, 1, &scan_field, jtag_set_end_state(TAP_DRPAUSE));
+       jtag_add_dr_scan(virtex2_info->tap, 1, &scan_field, TAP_DRPAUSE);
 
        free(values);
 
        return ERROR_OK;
 }
 
-static __inline__ void virtexflip32(jtag_callback_data_t arg)
+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);
+       uint8_t *in = (uint8_t *)arg;
+       *((uint32_t *)arg) = flip_u32(le_to_h_u32(in), 32);
 }
 
 static int virtex2_receive_32(struct pld_device *pld_device,
-               int num_words, uint32_t *words)
+       int num_words, uint32_t *words)
 {
        struct virtex2_pld_device *virtex2_info = pld_device->driver_priv;
        struct scan_field scan_field;
@@ -90,17 +88,16 @@ static int virtex2_receive_32(struct pld_device *pld_device,
        scan_field.out_value = NULL;
        scan_field.in_value = NULL;
 
-       virtex2_set_instr(virtex2_info->tap, 0x4); /* CFG_OUT */
+       virtex2_set_instr(virtex2_info->tap, 0x4);      /* CFG_OUT */
 
-       while (num_words--)
-       {
+       while (num_words--) {
                scan_field.in_value = (uint8_t *)words;
 
-               jtag_add_dr_scan(virtex2_info->tap, 1, &scan_field, jtag_set_end_state(TAP_DRPAUSE));
+               jtag_add_dr_scan(virtex2_info->tap, 1, &scan_field, TAP_DRPAUSE);
 
                jtag_add_callback(virtexflip32, (jtag_callback_data_t)words);
 
-               words++;;
+               words++;
        }
 
        return ERROR_OK;
@@ -112,11 +109,11 @@ static int virtex2_read_stat(struct pld_device *pld_device, uint32_t *status)
 
        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 */
+       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);
@@ -138,15 +135,15 @@ static int virtex2_load(struct pld_device *pld_device, const char *filename)
 
        field.in_value = NULL;
 
-       if ((retval = xilinx_read_bit_file(&bit_file, filename)) != ERROR_OK)
+       retval = xilinx_read_bit_file(&bit_file, filename);
+       if (retval != ERROR_OK)
                return retval;
 
-       jtag_set_end_state(TAP_IDLE);
-       virtex2_set_instr(virtex2_info->tap, 0xb); /* JPROG_B */
+       virtex2_set_instr(virtex2_info->tap, 0xb);      /* JPROG_B */
        jtag_execute_queue();
        jtag_add_sleep(1000);
 
-       virtex2_set_instr(virtex2_info->tap, 0x5); /* CFG_IN */
+       virtex2_set_instr(virtex2_info->tap, 0x5);      /* CFG_IN */
        jtag_execute_queue();
 
        for (i = 0; i < bit_file.length; i++)
@@ -155,19 +152,20 @@ static int virtex2_load(struct pld_device *pld_device, const char *filename)
        field.num_bits = bit_file.length * 8;
        field.out_value = bit_file.data;
 
-       jtag_add_dr_scan(virtex2_info->tap, 1, &field, jtag_set_end_state(TAP_DRPAUSE));
+       jtag_add_dr_scan(virtex2_info->tap, 1, &field, TAP_DRPAUSE);
        jtag_execute_queue();
 
        jtag_add_tlr();
 
-       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 */
+       if (!(virtex2_info->no_jstart))
+               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 */
+       if (!(virtex2_info->no_jstart))
+               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;
@@ -176,26 +174,19 @@ 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;
        COMMAND_PARSE_NUMBER(uint, CMD_ARGV[0], dev_id);
        device = get_pld_device_by_num(dev_id);
-       if (!device)
-       {
+       if (!device) {
                command_print(CMD_CTX, "pld device '#%s' is out of bounds", CMD_ARGV[0]);
                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);
@@ -210,10 +201,7 @@ PLD_DEVICE_COMMAND_HANDLER(virtex2_pld_device_command)
        struct virtex2_pld_device *virtex2_info;
 
        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]);
        if (tap == NULL) {
@@ -224,6 +212,10 @@ PLD_DEVICE_COMMAND_HANDLER(virtex2_pld_device_command)
        virtex2_info = malloc(sizeof(struct virtex2_pld_device));
        virtex2_info->tap = tap;
 
+       virtex2_info->no_jstart = 0;
+       if (CMD_ARGC >= 3)
+               COMMAND_PARSE_NUMBER(int, CMD_ARGV[2], virtex2_info->no_jstart);
+
        pld->driver_priv = virtex2_info;
 
        return ERROR_OK;
@@ -244,14 +236,15 @@ 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
 };
 
 struct pld_driver virtex2_pld = {
-               .name = "virtex2",
-               .commands = virtex2_command_handler,
-               .pld_device_command = &virtex2_pld_device_command,
-               .load = &virtex2_load,
-       };
+       .name = "virtex2",
+       .commands = virtex2_command_handler,
+       .pld_device_command = &virtex2_pld_device_command,
+       .load = &virtex2_load,
+};
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)