From 01225ca9d5bc202a4161947b2c63e16a96d99f37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cenk=20G=C3=BCndo=C4=9Fan?= <cnkgndgn@gmail.com>
Date: Tue, 10 Nov 2015 08:28:00 +0100
Subject: [PATCH] gnrc_nettest: use xtimer instead of vtimer
---
Makefile.dep | 2 +-
sys/net/gnrc/nettest/gnrc_nettest.c | 7 ++-----
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/Makefile.dep b/Makefile.dep
index 471526596a..eaf1e0a170 100644
--- a/Makefile.dep
+++ b/Makefile.dep
@@ -255,7 +255,7 @@ ifneq (,$(filter gnrc_nettest,$(USEMODULE)))
USEMODULE += gnrc_netreg
USEMODULE += gnrc_netif
USEMODULE += gnrc_pktbuf
- USEMODULE += vtimer
+ USEMODULE += xtimer
endif
ifneq (,$(filter gnrc_pktdump,$(USEMODULE)))
diff --git a/sys/net/gnrc/nettest/gnrc_nettest.c b/sys/net/gnrc/nettest/gnrc_nettest.c
index 301c7d0840..d5d07a3b23 100644
--- a/sys/net/gnrc/nettest/gnrc_nettest.c
+++ b/sys/net/gnrc/nettest/gnrc_nettest.c
@@ -22,9 +22,8 @@
#include "net/netopt.h"
#include "net/gnrc/netreg.h"
#include "net/gnrc/pktbuf.h"
-#include "timex.h"
#include "thread.h"
-#include "vtimer.h"
+#include "xtimer.h"
#include "net/gnrc/nettest.h"
@@ -55,14 +54,12 @@ static gnrc_nettest_res_t _pkt_test(uint16_t cmd_type, kernel_pid_t pid,
const gnrc_pktsnip_t **exp_out)
{
msg_t msg;
- timex_t t = { 0, GNRC_NETTEST_TIMEOUT };
gnrc_nettest_res_t res = GNRC_NETTEST_SUCCESS;
msg.type = cmd_type;
msg.content.ptr = (char *)in;
msg_send(&msg, pid);
- timex_normalize(&t);
if (exp_pkts == 0) {
thread_yield();
@@ -72,7 +69,7 @@ static gnrc_nettest_res_t _pkt_test(uint16_t cmd_type, kernel_pid_t pid,
gnrc_pktsnip_t *out;
const gnrc_pktsnip_t *exp = exp_out[i];
- if (vtimer_msg_receive_timeout(&msg, t) < 0) {
+ if (xtimer_msg_receive_timeout(&msg, GNRC_NETTEST_TIMEOUT) < 0) {
return GNRC_NETTEST_TIMED_OUT;
}
--
GitLab