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/jtag/usbprog.c | |
| 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/jtag/usbprog.c')
| -rw-r--r-- | src/jtag/usbprog.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/jtag/usbprog.c b/src/jtag/usbprog.c index c0fae956..ae365719 100644 --- a/src/jtag/usbprog.c +++ b/src/jtag/usbprog.c @@ -151,7 +151,7 @@ int usbprog_execute_queue(void) #endif if (cmd->cmd.reset->trst == 1) { - cur_state = TAP_TLR; + cur_state = TAP_RESET; } usbprog_reset(cmd->cmd.reset->trst, cmd->cmd.reset->srst); break; @@ -299,9 +299,9 @@ void usbprog_runtest(int num_cycles) int i; /* only do a state_move when we're not already in RTI */ - if (cur_state != TAP_RTI) + if (cur_state != TAP_IDLE) { - usbprog_end_state(TAP_RTI); + usbprog_end_state(TAP_IDLE); usbprog_state_move(); } @@ -336,9 +336,9 @@ void usbprog_scan(int ir_scan, enum scan_type type, u8 *buffer, int scan_size) enum tap_state saved_end_state = end_state; if (ir_scan) - usbprog_end_state(TAP_SI); + usbprog_end_state(TAP_IRSHIFT); else - usbprog_end_state(TAP_SD); + usbprog_end_state(TAP_DRSHIFT); /* usbprog_jtag_tms_send(usbprog_jtag_handle); */ @@ -361,9 +361,9 @@ void usbprog_scan(int ir_scan, enum scan_type type, u8 *buffer, int scan_size) } if (ir_scan) - cur_state = TAP_PI; + cur_state = TAP_IRPAUSE; else - cur_state = TAP_PD; + cur_state = TAP_DRPAUSE; if (cur_state != end_state) usbprog_state_move(); |