riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #430 from mehlis/vtimer-now-fix

Browse Source 
fix: vtimer_now should return seconds and microseconds
This commit is contained in:
Oleg Hahm 2014-01-15 09:10:29 -08:00
commit 01d62a52bc
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/vtimer/vtimer.c
View File

@ -255,8 +255,10 @@ static int vtimer_set(vtimer_t *timer)
void vtimer_now(timex_t *out) void vtimer_now(timex_t *out)
{ {
timex_t t = timex_set(seconds, hwtimer_now() - longterm_tick_start); uint32_t us = HWTIMER_TICKS_TO_US(hwtimer_now() - longterm_tick_start);
memcpy(out, &t, sizeof(timex_t));
out->seconds = seconds + us / (1000 * 1000);
out->microseconds = us % (1000 * 1000);
} }
int vtimer_init() int vtimer_init()