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.

Author: stinos

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

@@ -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/sleep.h

@@ -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
 }