summaryrefslogtreecommitdiff
path: root/src/jtag/jlink.c
diff options
context:
space:
mode:
authormifi <mifi@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2009-04-19 19:15:09 +0000
committermifi <mifi@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2009-04-19 19:15:09 +0000
commit7989000e0969c1ccf69acbc3ce649a020bc1ee66 (patch)
treec56d273d5e61204cae9e6a1ec940a85edcfbb3aa /src/jtag/jlink.c
parent486799e65b1d2496056e898c80e659cdf25a0b6a (diff)
downloadopenocd+libswd-7989000e0969c1ccf69acbc3ce649a020bc1ee66.tar.gz
openocd+libswd-7989000e0969c1ccf69acbc3ce649a020bc1ee66.tar.bz2
openocd+libswd-7989000e0969c1ccf69acbc3ce649a020bc1ee66.tar.xz
openocd+libswd-7989000e0969c1ccf69acbc3ce649a020bc1ee66.zip
Partially fix USBprog and JLink adapters on XScale target
Thanks to Peter Denison <openwrt(at)marshadder.org> git-svn-id: svn://svn.berlios.de/openocd/trunk@1471 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src/jtag/jlink.c')
-rw-r--r--src/jtag/jlink.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/jtag/jlink.c b/src/jtag/jlink.c
index 0c5f40dd..4e41ec47 100644
--- a/src/jtag/jlink.c
+++ b/src/jtag/jlink.c
@@ -433,7 +433,10 @@ void jlink_scan(int ir_scan, enum scan_type type, u8 *buffer, int scan_size, sca
/* Move to appropriate scan state */
jlink_end_state(ir_scan ? TAP_IRSHIFT : TAP_DRSHIFT);
- jlink_state_move();
+ /* Only move if we're not already there */
+ if (tap_get_state() != tap_get_end_state())
+ jlink_state_move();
+
jlink_end_state(saved_end_state);
/* Scan */