From: Peter Hutterer Date: Thu, 25 May 2017 22:56:29 +0000 (+1000) Subject: Add tv2us helper function X-Git-Tag: 1.7.901~25 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1332d883f30e526c091da5e38d24ca6374099f0c;p=platform%2Fupstream%2Flibinput.git Add tv2us helper function Signed-off-by: Peter Hutterer --- diff --git a/src/evdev.c b/src/evdev.c index 7fac2b2f..f0f79067 100644 --- a/src/evdev.c +++ b/src/evdev.c @@ -1887,7 +1887,7 @@ static inline void evdev_process_event(struct evdev_device *device, struct input_event *e) { struct evdev_dispatch *dispatch = device->dispatch; - uint64_t time = s2us(e->time.tv_sec) + e->time.tv_usec; + uint64_t time = tv2us(&e->time); #if 0 if (libevdev_event_is_code(e, EV_SYN, SYN_REPORT)) diff --git a/src/libinput-util.h b/src/libinput-util.h index e34a5002..8d8e3d56 100644 --- a/src/libinput-util.h +++ b/src/libinput-util.h @@ -440,6 +440,12 @@ us2ms(uint64_t us) return (uint32_t)(us / 1000); } +static inline uint64_t +tv2us(const struct timeval *tv) +{ + return s2us(tv->tv_sec) + tv->tv_usec; +} + static inline bool safe_atoi(const char *str, int *val) {