[openocd-svn] Main OpenOCD repository branch, master, updated. v0.4.0-214-g812e21a

[Øyvind H. <go...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  812e21ac396247767da0144748b5f52ad11b3e17 (commit)
      from  31b050108a1cd740b326dddfa7a2f1322ee8c186 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 812e21ac396247767da0144748b5f52ad11b3e17
Author: Øyvind Harboe <oyv...@zy...>
Date:   Tue May 4 12:28:05 2010 +0200

    zy1000: fix keep_alive() bug
    
    introduced in latest commit. Should have held off merging
    that commit. Sigh....
    
    Signed-off-by: Øyvind Harboe <oyv...@zy...>

diff --git a/src/jtag/zy1000/zy1000.c b/src/jtag/zy1000/zy1000.c
index 092e3cd..2fac176 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);

-----------------------------------------------------------------------

Summary of changes:
 src/jtag/zy1000/zy1000.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository