summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authoroharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2009-04-22 10:59:23 +0000
committeroharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2009-04-22 10:59:23 +0000
commit7395ca92d48becfe064e14b3ca0abbbb6bbf8fb5 (patch)
treeef08599cf1debaa7f99e50cf0c25bfeb981a072e /src
parentefa79144f3bc1015b9260a990eb4069db13b7806 (diff)
downloadopenocd+libswd-7395ca92d48becfe064e14b3ca0abbbb6bbf8fb5.tar.gz
openocd+libswd-7395ca92d48becfe064e14b3ca0abbbb6bbf8fb5.tar.bz2
openocd+libswd-7395ca92d48becfe064e14b3ca0abbbb6bbf8fb5.tar.xz
openocd+libswd-7395ca92d48becfe064e14b3ca0abbbb6bbf8fb5.zip
Zach Welch <zw@superlucidity.net> fix jlink reset
git-svn-id: svn://svn.berlios.de/openocd/trunk@1507 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src')
-rw-r--r--src/jtag/jlink.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/jtag/jlink.c b/src/jtag/jlink.c
index 9886c3b3..44a1ad6d 100644
--- a/src/jtag/jlink.c
+++ b/src/jtag/jlink.c
@@ -463,6 +463,8 @@ static void jlink_reset(int trst, int srst)
if (srst == 0)
{
jlink_simple_command(EMU_CMD_HW_RESET1);
+ jlink_end_state(TAP_RESET);
+ jlink_state_move();
}
else if (srst == 1)
{
@@ -472,6 +474,8 @@ static void jlink_reset(int trst, int srst)
if (trst == 0)
{
jlink_simple_command(EMU_CMD_HW_TRST1);
+ jlink_end_state(TAP_RESET);
+ jlink_state_move();
}
else if (trst == 1)
{