sys/syscalls: empty gettimeofday() unless 64bit present

Instead of requesting the 64bit for gettimeofday, make it an empty function unless 64 bit is already present
RIOT-OS · Mar 2, 2022 · 1a64bc1 · 1a64bc1
1 parent 0bb7ecc
commit 1a64bc1
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 23 deletions.
diff --git a/cpu/native/Kconfig b/cpu/native/Kconfig
@@ -25,7 +25,6 @@ config CPU_ARCH_NATIVE
 
     # needed modules
     select MODULE_PERIPH if TEST_KCONFIG
-    select MODULE_ZTIMER64_XTIMER_COMPAT if MODULE_ZTIMER_XTIMER_COMPAT
 
 config CPU_CORE_NATIVE
     bool

diff --git a/cpu/native/Makefile.dep b/cpu/native/Makefile.dep
@@ -40,11 +40,6 @@ ifneq (,$(filter socket_zep,$(USEMODULE)))
   endif
 endif
 
-ifneq (,$(filter ztimer_xtimer_compat,$(USEMODULE)))
-  # requires 64bit for syscalls
-  USEMODULE += ztimer64_xtimer_compat
-endif
-
 USEMODULE += periph
 
 # UART is needed by startup.c

diff --git a/cpu/native/syscalls.c b/cpu/native/syscalls.c
@@ -42,6 +42,7 @@
 #include "xtimer.h"
 #include "stdio_base.h"
 
+#include "kernel_defines.h"
 #include "native_internal.h"
 
 #define ENABLE_DEBUG 0
@@ -474,16 +475,21 @@ int getpid(void)
     return -1;
 }
 
-#ifdef MODULE_XTIMER
 int _gettimeofday(struct timeval *tp, void *restrict tzp)
 {
-    (void) tzp;
+    (void)tzp;
+    (void)tp;
+#if (IS_USED(MODULE_XTIMER) && !IS_USED(MODULE_ZTIMER_XTIMER_COMPAT)) || \
+    (IS_USED(MODULE_XTIMER) && IS_USED(MODULE_ZTIMER64_XTIMER_COMPAT))
     uint64_t now = xtimer_now_usec64();
     tp->tv_sec  = now / US_PER_SEC;
     tp->tv_usec = now - tp->tv_sec;
     return 0;
-}
+#else
+    return -1;
 #endif
+}
+
 
 /**
  * set up native internal syscall symbols

diff --git a/sys/Kconfig.newlib b/sys/Kconfig.newlib
@@ -18,7 +18,6 @@ config MODULE_NEWLIB_SYSCALLS_DEFAULT
     default y
     depends on !HAVE_CUSTOM_NEWLIB_SYSCALLS
     select MODULE_DIV
-    select MODULE_ZTIMER64_XTIMER_COMPAT if MODULE_ZTIMER_XTIMER_COMPAT
     help
         Default implementation of newlib system calls.
 

diff --git a/sys/Makefile.dep b/sys/Makefile.dep
@@ -233,10 +233,6 @@ ifneq (,$(filter newlib,$(USEMODULE)))
   endif
   ifneq (,$(filter newlib_syscalls_default,$(USEMODULE)))
     USEMODULE += div
-    ifneq (,$(filter ztimer_xtimer_compat,$(USEMODULE)))
-      # requires 64bit timestamps when using xtimer
-      USEMODULE += ztimer64_xtimer_compat
-    endif
   endif
 endif
 

diff --git a/sys/newlib_syscalls_default/syscalls.c b/sys/newlib_syscalls_default/syscalls.c
@@ -630,25 +630,22 @@ int _kill(pid_t pid, int sig)
     return -1;
 }
 
-#ifdef MODULE_XTIMER
 int _gettimeofday_r(struct _reent *r, struct timeval *restrict tp, void *restrict tzp)
 {
-    (void) r;
-    (void) tzp;
+    (void)r;
+    (void)tzp;
+    (void)tp;
+#if (IS_USED(MODULE_XTIMER) && !IS_USED(MODULE_ZTIMER_XTIMER_COMPAT)) || \
+    (IS_USED(MODULE_XTIMER) && IS_USED(MODULE_ZTIMER64_XTIMER_COMPAT))
     uint64_t now = xtimer_now_usec64();
     tp->tv_sec = div_u64_by_1000000(now);
     tp->tv_usec = now - (tp->tv_sec * US_PER_SEC);
     return 0;
-}
 #else
-int _gettimeofday_r(struct _reent *r, struct timeval *restrict tp, void *restrict tzp)
-{
-    (void) tp;
-    (void) tzp;
     r->_errno = ENOSYS;
     return -1;
-}
 #endif
+}
 
 /**
  * Current process times (not implemented).