diff options
| author | kc8apf <kc8apf@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2008-12-13 06:25:50 +0000 |
|---|---|---|
| committer | kc8apf <kc8apf@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2008-12-13 06:25:50 +0000 |
| commit | c45de8073d027f1a4d39640dc140666f27960e3b (patch) | |
| tree | dbde64f23e1c6a1c588891ebd537d7b18d2843fd /src/pld | |
| parent | 6c27550f6e6b6ae84a43f9d73df6d0f6801581ea (diff) | |
| download | openocd_libswd-c45de8073d027f1a4d39640dc140666f27960e3b.tar.gz openocd_libswd-c45de8073d027f1a4d39640dc140666f27960e3b.tar.bz2 openocd_libswd-c45de8073d027f1a4d39640dc140666f27960e3b.tar.xz openocd_libswd-c45de8073d027f1a4d39640dc140666f27960e3b.zip | |
Change tap_state naming to be consistent with SVF documentation.
Courtesy of Dick Hollenbeck <dick@softplc.com>
git-svn-id: svn://svn.berlios.de/openocd/trunk@1232 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 2d86e3e5..6cce1997 100644 --- a/src/pld/virtex2.c +++ b/src/pld/virtex2.c @@ -63,7 +63,7 @@ int virtex2_set_instr(jtag_tap_t *tap, u32 new_instr) field.in_handler = NULL; field.in_handler_priv = NULL; - jtag_add_ir_scan(1, &field, TAP_RTI); + jtag_add_ir_scan(1, &field, TAP_IDLE); free(field.out_value); } @@ -95,7 +95,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, TAP_PD); + jtag_add_dr_scan(1, &scan_field, TAP_DRPAUSE); free(values); @@ -128,7 +128,7 @@ int virtex2_receive_32(struct pld_device_s *pld_device, int num_words, u32 *word while (num_words--) { scan_field.in_handler_priv = words++; - jtag_add_dr_scan(1, &scan_field, TAP_PD); + jtag_add_dr_scan(1, &scan_field, TAP_DRPAUSE); } return ERROR_OK; @@ -176,7 +176,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_RTI); + jtag_add_end_state(TAP_IDLE); virtex2_set_instr(virtex2_info->tap, 0xb); /* JPROG_B */ jtag_execute_queue(); jtag_add_sleep(1000); @@ -190,18 +190,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, TAP_PD); + jtag_add_dr_scan(1, &field, TAP_DRPAUSE); jtag_execute_queue(); jtag_add_tlr(); - jtag_add_end_state(TAP_RTI); + jtag_add_end_state(TAP_IDLE); virtex2_set_instr(virtex2_info->tap, 0xc); /* JSTART */ - jtag_add_runtest(13, TAP_RTI); + jtag_add_runtest(13, 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, TAP_RTI); + jtag_add_runtest(13, TAP_IDLE); virtex2_set_instr(virtex2_info->tap, 0x3f); /* BYPASS */ jtag_execute_queue(); |