summaryrefslogtreecommitdiff
path: root/src/pld
diff options
context:
space:
mode:
authoroharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2009-05-08 09:48:00 +0000
committeroharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2009-05-08 09:48:00 +0000
commit57bc9f37c9029f1b481cd50e15676a0f74aa9e92 (patch)
tree547bae31fa4f90ea78a6042c4f3889a483fe897f /src/pld
parent4df87471ca53417fdcbe3285db4b70d710414a24 (diff)
downloadopenocd_libswd-57bc9f37c9029f1b481cd50e15676a0f74aa9e92.tar.gz
openocd_libswd-57bc9f37c9029f1b481cd50e15676a0f74aa9e92.tar.bz2
openocd_libswd-57bc9f37c9029f1b481cd50e15676a0f74aa9e92.tar.xz
openocd_libswd-57bc9f37c9029f1b481cd50e15676a0f74aa9e92.zip
in_handler in_check_mask and in_check_value now removed from field. Last big patch in the series of JTAG API cleanup.
git-svn-id: svn://svn.berlios.de/openocd/trunk@1672 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src/pld')
-rw-r--r--src/pld/virtex2.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/pld/virtex2.c b/src/pld/virtex2.c
index 5a069421..ae03572f 100644
--- a/src/pld/virtex2.c
+++ b/src/pld/virtex2.c
@@ -60,7 +60,7 @@ int virtex2_set_instr(jtag_tap_t *tap, u32 new_instr)
field.in_value = NULL;
- field.in_handler = NULL;
+
jtag_add_ir_scan(1, &field, TAP_IDLE);
@@ -84,7 +84,6 @@ int virtex2_send_32(struct pld_device_s *pld_device, int num_words, u32 *words)
scan_field.num_bits = num_words * 32;
scan_field.out_value = values;
scan_field.in_value = NULL;
- scan_field.in_handler = NULL;
for (i = 0; i < num_words; i++)
buf_set_u32(values + 4 * i, 0, 32, flip_u32(*words++, 32));
@@ -109,7 +108,6 @@ int virtex2_receive_32(struct pld_device_s *pld_device, int num_words, u32 *word
scan_field.out_value = NULL;
u8 tmp[4];
scan_field.in_value = tmp;
- scan_field.in_handler = NULL;
virtex2_set_instr(virtex2_info->tap, 0x4); /* CFG_OUT */
@@ -159,7 +157,7 @@ int virtex2_load(struct pld_device_s *pld_device, char *filename)
field.in_value = NULL;
- field.in_handler = NULL;
+
if ((retval = xilinx_read_bit_file(&bit_file, filename)) != ERROR_OK)