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

vtimer: fix integer overflow in vtimer_now() for MSP-430

Browse Source
This commit is contained in:
René Kijewski 2014-04-17 14:46:21 +02:00
parent 38785b14b7
commit 77c296cf59
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/vtimer/vtimer.c
View File

@ -261,9 +261,10 @@ static int vtimer_set(vtimer_t *timer)
void vtimer_now(timex_t *out) void vtimer_now(timex_t *out)
{ {
uint32_t us = HWTIMER_TICKS_TO_US(hwtimer_now() - longterm_tick_start); uint32_t us = HWTIMER_TICKS_TO_US(hwtimer_now() - longterm_tick_start);
uint32_t us_per_s = 1000ul * 1000ul;
out->seconds = seconds + us / (1000 * 1000); out->seconds = seconds + us / us_per_s;
out->microseconds = us % (1000 * 1000); out->microseconds = us % us_per_s;
} }
void vtimer_gettimeofday(struct timeval *tp) { void vtimer_gettimeofday(struct timeval *tp) {