target: Remove soft_reset_halt_imp

[openocd.git] / src / helper / replacements.c

diff --git a/src/helper/replacements.c b/src/helper/replacements.c
index 2020003f0e3a7d3de31ee513c91cd95a8d7c9f13..0ba98a488e6ea43bb4fcabed1cdc8101ec8a9112 100644 (file)
--- a/src/helper/replacements.c
+++ b/src/helper/replacements.c
@@ -89,12 +89,9 @@ int gettimeofday(struct timeval *tv, struct timezone *tz)
                GetSystemTimeAsFileTime(&ft);
                li.LowPart  = ft.dwLowDateTime;
                li.HighPart = ft.dwHighDateTime;
-               t  = li.QuadPart;                                       /* In 100-nanosecond
-                                                                        *intervals */
-               t -= EPOCHFILETIME;                                     /* Offset to the Epoch time
-                                                                        **/
-               t /= 10;                                                        /* In microseconds
-                                                                                **/
+               t  = li.QuadPart;                                       /* In 100-nanosecond intervals */
+               t -= EPOCHFILETIME;                                     /* Offset to the Epoch time */
+               t /= 10;                                                        /* In microseconds */
                tv->tv_sec  = (long)(t / 1000000);
                tv->tv_usec = (long)(t % 1000000);
        }
@@ -209,10 +206,11 @@ int win_select(int max_fd, fd_set *rfds, fd_set *wfds, fd_set *efds, struct time
                        aexcept = sock_except;
 
                        tvslice.tv_sec = 0;
-                       tvslice.tv_usec = 100000;
+                       tvslice.tv_usec = 1000;
 
                        retcode = select(sock_max_fd + 1, &aread, &awrite, &aexcept, &tvslice);
                }
+
                if (n_handles > 0) {
                        /* check handles */
                        DWORD wret;
@@ -220,7 +218,7 @@ int win_select(int max_fd, fd_set *rfds, fd_set *wfds, fd_set *efds, struct time
                        wret = MsgWaitForMultipleObjects(n_handles,
                                        handles,
                                        FALSE,
-                                       retcode > 0 ? 0 : 100,
+                                       retcode > 0 ? 0 : 1,
                                        QS_ALLEVENTS);
 
                        if (wret == WAIT_TIMEOUT) {
@@ -244,16 +242,13 @@ int win_select(int max_fd, fd_set *rfds, fd_set *wfds, fd_set *efds, struct time
 
                                                        if (PeekNamedPipe((HANDLE)handle, NULL, 0,
                                                                    NULL, &dwBytes, NULL)) {
-                                                               /* check to see if gdb pipe has data
-                                                                *available */
+                                                               /* check to see if gdb pipe has data available */
                                                                if (dwBytes) {
-                                                                       FD_SET(handle_slot_to_fd[i],
-                                                                               &aread);
+                                                                       FD_SET(handle_slot_to_fd[i], &aread);
                                                                        retcode++;
                                                                }
                                                        } else {
-                                                               FD_SET(handle_slot_to_fd[i],
-                                                                       &aread);
+                                                               FD_SET(handle_slot_to_fd[i], &aread);
                                                                retcode++;
                                                        }
                                                }