From cd016e03343649feac4e28e72403da6423fb4798 Mon Sep 17 00:00:00 2001 From: Christian Mehlis Date: Mon, 16 Dec 2013 11:47:02 +0100 Subject: [PATCH] fix: vtimer_now should return seconds and microseconds --- sys/vtimer/vtimer.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/vtimer/vtimer.c b/sys/vtimer/vtimer.c index 8572310414..1b76297089 100644 --- a/sys/vtimer/vtimer.c +++ b/sys/vtimer/vtimer.c @@ -242,8 +242,10 @@ static int vtimer_set(vtimer_t *timer) void vtimer_now(timex_t *out) { - timex_t t = timex_set(seconds, hwtimer_now() - longterm_tick_start); - memcpy(out, &t, sizeof(timex_t)); + uint32_t us = HWTIMER_TICKS_TO_US(hwtimer_now() - longterm_tick_start); + + out->seconds = seconds + us / (1000 * 1000); + out->microseconds = us % (1000 * 1000); } int vtimer_init()