windows: Consolidate all sleep-related functions into windows_mphal.c.

Replace the timer-based sleep with the standard win32 call since the former
has no benefits: even though it allows specifying the time in 100uSec
chunks, the actual resolution is still limited by the OS and is never
better than 1mSec.

For clarity move all of this next to the mp_hal_delay_ms definition so all
related functions are in one place.

ports/windows/Makefile

@@ -55,7 +55,6 @@ SRC_C = \
 	windows_mphal.c \
 	realpath.c \
 	init.c \
-	sleep.c \
 	fmode.c \
 	$(SRC_MOD) \
 	$(wildcard $(VARIANT_DIR)/*.c)

ports/windows/init.c

@@ -30,7 +30,6 @@
 #ifdef _MSC_VER
 #include <crtdbg.h>
 #endif
-#include "sleep.h"
 #include "fmode.h"
 
 extern BOOL WINAPI console_sighandler(DWORD evt);
@@ -54,7 +53,6 @@ void init() {
     _set_invalid_parameter_handler(invalid_param_handler);
     #endif
     SetConsoleCtrlHandler(console_sighandler, TRUE);
-    init_sleep();
     #ifdef __MINGW32__
     putenv("PRINTF_EXPONENT_DIGITS=2");
     #elif _MSC_VER < 1900
@@ -67,5 +65,4 @@ void init() {
 
 void deinit() {
     SetConsoleCtrlHandler(console_sighandler, FALSE);
-    deinit_sleep();
 }

ports/windows/sleep.c

@@ -1,76 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2013, 2014 Damien P. George
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include <windows.h>
-#include <errno.h>
-#include <limits.h>
-
-HANDLE waitTimer = NULL;
-
-void init_sleep(void) {
-    waitTimer = CreateWaitableTimer(NULL, TRUE, NULL);
-}
-
-void deinit_sleep(void) {
-    if (waitTimer != NULL) {
-        CloseHandle(waitTimer);
-        waitTimer = NULL;
-    }
-}
-
-int usleep_impl(__int64 usec) {
-    if (waitTimer == NULL) {
-        errno = EAGAIN;
-        return -1;
-    }
-    if (usec < 0 || usec > LLONG_MAX / 10) {
-        errno = EINVAL;
-        return -1;
-    }
-
-    LARGE_INTEGER ft;
-    ft.QuadPart = -10 * usec; // 100 nanosecond interval, negative value = relative time
-    if (SetWaitableTimer(waitTimer, &ft, 0, NULL, NULL, 0) == 0) {
-        errno = EINVAL;
-        return -1;
-    }
-    if (WaitForSingleObject(waitTimer, INFINITE) != WAIT_OBJECT_0) {
-        errno = EAGAIN;
-        return -1;
-    }
-    return 0;
-}
-
-#ifdef _MSC_VER // mingw and the likes provide their own usleep()
-int usleep(__int64 usec) {
-    return usleep_impl(usec);
-}
-#endif
-
-void msec_sleep(double msec) {
-    const double usec = msec * 1000.0;
-    usleep_impl(usec > (double)LLONG_MAX ? LLONG_MAX : (__int64)usec);
-}

ports/windows/sleep.h

@@ -26,9 +26,12 @@
 #ifndef MICROPY_INCLUDED_WINDOWS_SLEEP_H
 #define MICROPY_INCLUDED_WINDOWS_SLEEP_H
 
-void init_sleep(void);
-void deinit_sleep(void);
+// The main sleep implementation for the Windows port.
 void msec_sleep(double msec);
+
+// Define usleep() because some of the unix port's code uses that.
+// Mingw and the likes provide a definition of usleep(), note however
+// that it's also just Sleep(usec/1000).
 #ifdef _MSC_VER
 int usleep(__int64 usec);
 #endif

ports/windows/windows_mphal.c

@@ -262,6 +262,20 @@ uint64_t mp_hal_time_ns(void) {
     return (uint64_t)tv.tv_sec * 1000000000ULL + (uint64_t)tv.tv_usec * 1000ULL;
 }
 
+void msec_sleep(double msec) {
+    if (msec < 0.0) {
+        msec = 0.0;
+    }
+    SleepEx((DWORD)msec, TRUE);
+}
+
+#ifdef _MSC_VER
+int usleep(__int64 usec) {
+    msec_sleep((double)usec / 1000.0);
+    return 0;
+}
+#endif
+
 void mp_hal_delay_ms(mp_uint_t ms) {
     #ifdef MICROPY_EVENT_POLL_HOOK
     mp_uint_t start = mp_hal_ticks_ms();
@@ -270,6 +284,6 @@ void mp_hal_delay_ms(mp_uint_t ms) {
         MICROPY_EVENT_POLL_HOOK
     }
     #else
-    SleepEx(ms, TRUE);
+    msec_sleep((double)ms);
     #endif
 }