summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorØyvind Harboe <oyvind.harboe@zylin.com>2010-05-04 12:28:05 +0200
committerØyvind Harboe <oyvind.harboe@zylin.com>2010-05-05 15:24:24 +0200
commit812e21ac396247767da0144748b5f52ad11b3e17 (patch)
tree93f81a219a19b139cc1dbba6e1dfaa5ce62cba31
parent31b050108a1cd740b326dddfa7a2f1322ee8c186 (diff)
downloadopenocd+libswd-812e21ac396247767da0144748b5f52ad11b3e17.tar.gz
openocd+libswd-812e21ac396247767da0144748b5f52ad11b3e17.tar.bz2
openocd+libswd-812e21ac396247767da0144748b5f52ad11b3e17.tar.xz
openocd+libswd-812e21ac396247767da0144748b5f52ad11b3e17.zip
zy1000: fix keep_alive() bug
introduced in latest commit. Should have held off merging that commit. Sigh.... Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
-rw-r--r--src/jtag/zy1000/zy1000.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/jtag/zy1000/zy1000.c b/src/jtag/zy1000/zy1000.c
index 092e3cd2..2fac1767 100644
--- a/src/jtag/zy1000/zy1000.c
+++ b/src/jtag/zy1000/zy1000.c
@@ -205,6 +205,8 @@ void zy1000_reset(int trst, int srst)
total = timeval_ms() - start;
+ keep_alive();
+
if (total > 5000)
{
LOG_ERROR("SRST took too long to deassert: %dms", (int)total);