diff options
| author | oharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2009-05-07 12:29:31 +0000 |
|---|---|---|
| committer | oharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2009-05-07 12:29:31 +0000 |
| commit | a1777c6bcff357d5744fe4b09633bc0363dd53e6 (patch) | |
| tree | 1df11186da8965677e773b13732de4259cc689c5 /src/pld | |
| parent | b227b5eb762f86725d711fb84d665190622e9adc (diff) | |
| download | openocd+libswd-a1777c6bcff357d5744fe4b09633bc0363dd53e6.tar.gz openocd+libswd-a1777c6bcff357d5744fe4b09633bc0363dd53e6.tar.bz2 openocd+libswd-a1777c6bcff357d5744fe4b09633bc0363dd53e6.tar.xz openocd+libswd-a1777c6bcff357d5744fe4b09633bc0363dd53e6.zip | |
remove in_handler usage
git-svn-id: svn://svn.berlios.de/openocd/trunk@1636 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src/pld')
| -rw-r--r-- | src/pld/virtex2.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/src/pld/virtex2.c b/src/pld/virtex2.c index f9043217..5a069421 100644 --- a/src/pld/virtex2.c +++ b/src/pld/virtex2.c @@ -98,12 +98,6 @@ int virtex2_send_32(struct pld_device_s *pld_device, int num_words, u32 *words) 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) { @@ -113,15 +107,17 @@ 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; - scan_field.in_value = NULL; - scan_field.in_handler = virtex2_jtag_buf_to_u32; /* deprecated! invoke this from user code! */ + u8 tmp[4]; + scan_field.in_value = tmp; + scan_field.in_handler = NULL; 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_DRPAUSE); + jtag_add_dr_scan_now(1, &scan_field, TAP_DRPAUSE); + + *words++=flip_u32(le_to_h_u32(tmp), 32); } return ERROR_OK; |