tests/net/gnrc_mac_timeout: migrate to ztimer

RIOT-OS · May 22, 2023 · a667267 · a667267
1 parent 6939eb9
commit a667267
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/tests/net/gnrc_mac_timeout/Makefile b/tests/net/gnrc_mac_timeout/Makefile
@@ -1,5 +1,6 @@
 include ../Makefile.net_common
 
+USEMODULE += ztimer_msec
 USEMODULE += gnrc_mac
 
 include $(RIOTBASE)/Makefile.include
diff --git a/tests/net/gnrc_mac_timeout/main.c b/tests/net/gnrc_mac_timeout/main.c
@@ -23,7 +23,7 @@
 #include "net/gnrc/mac/timeout.h"
 #include "thread.h"
 #include "msg.h"
-#include "xtimer.h"
+#include "ztimer.h"
 
 #define TIMEOUT_COUNT    3
 #define TIMEOUT_1_DURATION    1000
@@ -34,7 +34,7 @@ static gnrc_mac_timeout_event_t test_timeouts[TIMEOUT_COUNT];
 static gnrc_mac_timeout_type_t timeout_1;
 static gnrc_mac_timeout_type_t timeout_2;
 static gnrc_mac_timeout_type_t timeout_3;
-static uint32_t start_time;
+static ztimer_now_t start_time;
 
 static char worker_stack[THREAD_STACKSIZE_MAIN];
 
@@ -47,10 +47,10 @@ void *worker_thread(void *arg)
 
     while (1) {
         msg_t m;
-        uint32_t now;
+        ztimer_now_t now;
 
         msg_receive(&m);
-        now = xtimer_now_usec() / US_PER_MS;
+        now = ztimer_now(ZTIMER_MSEC);
 
         if (gnrc_mac_timeout_is_expired(&mac_timeout, timeout_1)) {
             printf("At %6" PRIu32 " ms received msg %i: timeout_1 (set at %" PRIu32 " ms) expired, "
@@ -102,7 +102,7 @@ int main(void)
     timeout_2 = -2;
     timeout_3 = -3;
 
-    start_time = xtimer_now_usec() / US_PER_MS;
+    start_time = ztimer_now(ZTIMER_MSEC);
     gnrc_mac_init_timeouts(&mac_timeout, test_timeouts, TIMEOUT_COUNT);
     gnrc_mac_set_timeout(&mac_timeout, timeout_1, TIMEOUT_1_DURATION, pid);
     gnrc_mac_set_timeout(&mac_timeout, timeout_2, TIMEOUT_2_DURATION, pid);