diff options
author | oharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2009-06-04 13:18:07 +0000 |
---|---|---|
committer | oharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2009-06-04 13:18:07 +0000 |
commit | d86100261252805215282b17d214c48021ef7f79 (patch) | |
tree | 02a060fa2844c6280bd4620bb6a1782539aaeb57 /src/pld | |
parent | f133158175b568b9355e1bb3da159fd235723dec (diff) | |
download | openocd+libswd-d86100261252805215282b17d214c48021ef7f79.tar.gz openocd+libswd-d86100261252805215282b17d214c48021ef7f79.tar.bz2 openocd+libswd-d86100261252805215282b17d214c48021ef7f79.tar.xz openocd+libswd-d86100261252805215282b17d214c48021ef7f79.zip |
Rename jtag_add_end_state to jtag_set_end_state since "add" implies that
this fn has something to do with the queue, which it does not as such.
git-svn-id: svn://svn.berlios.de/openocd/trunk@2050 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src/pld')
-rw-r--r-- | src/pld/virtex2.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/pld/virtex2.c b/src/pld/virtex2.c index 51991c3b..f8e13df6 100644 --- a/src/pld/virtex2.c +++ b/src/pld/virtex2.c @@ -58,7 +58,7 @@ int virtex2_set_instr(jtag_tap_t *tap, u32 new_instr) - jtag_add_ir_scan(1, &field, jtag_add_end_state(TAP_IDLE)); + jtag_add_ir_scan(1, &field, jtag_set_end_state(TAP_IDLE)); free(field.out_value); } @@ -85,7 +85,7 @@ int virtex2_send_32(struct pld_device_s *pld_device, int num_words, u32 *words) virtex2_set_instr(virtex2_info->tap, 0x5); /* CFG_IN */ - jtag_add_dr_scan(1, &scan_field, jtag_add_end_state(TAP_DRPAUSE)); + jtag_add_dr_scan(1, &scan_field, jtag_set_end_state(TAP_DRPAUSE)); free(values); @@ -113,7 +113,7 @@ int virtex2_receive_32(struct pld_device_s *pld_device, int num_words, u32 *word { scan_field.in_value = (u8 *)words; - jtag_add_dr_scan(1, &scan_field, jtag_add_end_state(TAP_DRPAUSE)); + jtag_add_dr_scan(1, &scan_field, jtag_set_end_state(TAP_DRPAUSE)); jtag_add_callback(virtexflip32, (u8 *)words); @@ -165,7 +165,7 @@ int virtex2_load(struct pld_device_s *pld_device, char *filename) if ((retval = xilinx_read_bit_file(&bit_file, filename)) != ERROR_OK) return retval; - jtag_add_end_state(TAP_IDLE); + jtag_set_end_state(TAP_IDLE); virtex2_set_instr(virtex2_info->tap, 0xb); /* JPROG_B */ jtag_execute_queue(); jtag_add_sleep(1000); @@ -179,18 +179,18 @@ int virtex2_load(struct pld_device_s *pld_device, char *filename) field.num_bits = bit_file.length * 8; field.out_value = bit_file.data; - jtag_add_dr_scan(1, &field, jtag_add_end_state(TAP_DRPAUSE)); + jtag_add_dr_scan(1, &field, jtag_set_end_state(TAP_DRPAUSE)); jtag_execute_queue(); jtag_add_tlr(); - jtag_add_end_state(TAP_IDLE); + jtag_set_end_state(TAP_IDLE); virtex2_set_instr(virtex2_info->tap, 0xc); /* JSTART */ - jtag_add_runtest(13, jtag_add_end_state(TAP_IDLE)); + 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_add_end_state(TAP_IDLE)); + jtag_add_runtest(13, jtag_set_end_state(TAP_IDLE)); virtex2_set_instr(virtex2_info->tap, 0x3f); /* BYPASS */ jtag_execute_queue(); |