zy1000: fix false positive warning about unitialized local variable

[openocd.git] / src / jtag / zy1000 / zy1000.c

diff --git a/src/jtag/zy1000/zy1000.c b/src/jtag/zy1000/zy1000.c
index 80731aabe207c2b80f111927e016d1da2a69e6e3..442a09fb0b24dd182d30d01176dbe9c3c9621199 100644 (file)
--- a/src/jtag/zy1000/zy1000.c
+++ b/src/jtag/zy1000/zy1000.c
@@ -49,6 +49,7 @@
 #include <jtag/minidriver.h>
 #include <jtag/interface.h>
 #include <time.h>
+#include <helper/time_support.h>
 
 #include <netinet/tcp.h>
 
@@ -176,28 +177,43 @@ void zy1000_reset(int trst, int srst)
        }
 
        /* wait for srst to float back up */
-       if (!srst)
+       if ((!srst && ((jtag_get_reset_config() & RESET_TRST_PULLS_SRST) == 0))||
+               (!srst && !trst && (jtag_get_reset_config() & RESET_TRST_PULLS_SRST)))
        {
-               int i;
-               for (i = 0; i < 1000; i++)
-               {
+               bool first = true;
+               long long start = 0;
+               long total = 0;
+               for (;;)
+               {       
                        // We don't want to sense our own reset, so we clear here.
                        // There is of course a timing hole where we could loose
                        // a "real" reset.
                        if (!readSRST())
+                       {
+                               if (total > 1)
+                               {
+                                 LOG_USER("SRST took %dms to deassert", (int)total);
+                               }
                                break;
+                       }
 
-                       /* wait 1ms */
-                       alive_sleep(1);
-               }
+                       if (first)
+                       {
+                           first = false;
+                           start = timeval_ms();
+                       }
 
-               if (i == 1000)
-               {
-                       LOG_USER("SRST didn't deassert after %dms", i);
-               } else if (i > 1)
-               {
-                       LOG_USER("SRST took %dms to deassert", i);
+                       total = timeval_ms() - start;
+
+                       keep_alive();
+
+                       if (total > 5000)
+                       {
+                               LOG_ERROR("SRST took too long to deassert: %dms", (int)total);
+                           break;
+                       }
                }
+
        }
 }
 
@@ -418,10 +434,9 @@ zylinjtag_Jim_Command_powerstatus(Jim_Interp *interp,
                return JIM_ERR;
        }
 
-       uint32_t status;
-       ZY1000_PEEK(ZY1000_JTAG_BASE + 0x10, status);
+       bool dropout = readPowerDropout();
 
-       Jim_SetResult(interp, Jim_NewIntObj(interp, (status&0x80) != 0));
+       Jim_SetResult(interp, Jim_NewIntObj(interp, dropout));
 
        return JIM_OK;
 }