switch to jtag_add_dr_scan() from the synchronous version - USB performance fix

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

diff --git a/src/pld/virtex2.c b/src/pld/virtex2.c
index ae03572f151255db7d2cf1061d2dd804f13f2c29..36fa89c4349488ce10be169e517a325347c0252f 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);
@@ -97,6 +92,10 @@ int virtex2_send_32(struct pld_device_s *pld_device, int num_words, u32 *words)
        return ERROR_OK;
 }
 
+static __inline__ void virtexflip32(u8 *in)
+{
+       *((u32 *)in)=flip_u32(le_to_h_u32(in), 32);
+}
 
 int virtex2_receive_32(struct pld_device_s *pld_device, int num_words, u32 *words)
 {
@@ -106,16 +105,19 @@ int virtex2_receive_32(struct pld_device_s *pld_device, int num_words, u32 *word
        scan_field.tap = virtex2_info->tap;
        scan_field.num_bits = 32;
        scan_field.out_value = NULL;
-       u8 tmp[4];
-       scan_field.in_value = tmp;
+       scan_field.in_value = NULL;
 
        virtex2_set_instr(virtex2_info->tap, 0x4); /* CFG_OUT */
 
        while (num_words--)
        {
-               jtag_add_dr_scan_now(1, &scan_field, TAP_DRPAUSE);
+               scan_field.in_value = (u8 *)words;
+               
+               jtag_add_dr_scan(1, &scan_field, TAP_DRPAUSE);
+
+               jtag_add_callback(virtexflip32, (u8 *)words);
 
-               *words++=flip_u32(le_to_h_u32(tmp), 32);
+               words++;;
        }
 
        return ERROR_OK;