1*4882a593SmuzhiyunFrom 30973c0bc053b2198cafb1899a0843688d5bb541 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Deepa Dinamani <deepa.kernel@gmail.com> 3*4882a593SmuzhiyunDate: Mon, 15 Jan 2018 17:18:49 -0800 4*4882a593SmuzhiyunSubject: [PATCH] evemu: Update struct input_event 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunThe struct input_event is not y2038 safe. 7*4882a593SmuzhiyunUpdate the struct according to the kernel patch: 8*4882a593Smuzhiyunhttps://lkml.org/lkml/2018/1/6/324 9*4882a593Smuzhiyun 10*4882a593SmuzhiyunSigned-off-by: Deepa Dinamani <deepa.kernel@gmail.com> 11*4882a593SmuzhiyunSigned-off-by: Peter Hutterer <peter.hutterer@who-t.net> 12*4882a593Smuzhiyun[Retrieved from: 13*4882a593Smuzhiyunhttps://gitlab.freedesktop.org/libevdev/evemu/-/commit/30973c0bc053b2198cafb1899a0843688d5bb541] 14*4882a593SmuzhiyunSigned-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> 15*4882a593Smuzhiyun--- 16*4882a593Smuzhiyun src/evemu.c | 35 +++++++++++++++++++++++------------ 17*4882a593Smuzhiyun 1 file changed, 23 insertions(+), 12 deletions(-) 18*4882a593Smuzhiyun 19*4882a593Smuzhiyundiff --git a/src/evemu.c b/src/evemu.c 20*4882a593Smuzhiyunindex a8a949b..c7ff561 100644 21*4882a593Smuzhiyun--- a/src/evemu.c 22*4882a593Smuzhiyun+++ b/src/evemu.c 23*4882a593Smuzhiyun@@ -771,7 +771,7 @@ int evemu_write_event(FILE *fp, const struct input_event *ev) 24*4882a593Smuzhiyun { 25*4882a593Smuzhiyun int rc; 26*4882a593Smuzhiyun rc = fprintf(fp, "E: %lu.%06u %04x %04x %04d ", 27*4882a593Smuzhiyun- ev->time.tv_sec, (unsigned)ev->time.tv_usec, 28*4882a593Smuzhiyun+ ev->input_event_sec, (unsigned)ev->input_event_usec, 29*4882a593Smuzhiyun ev->type, ev->code, ev->value); 30*4882a593Smuzhiyun rc += write_event_desc(fp, ev); 31*4882a593Smuzhiyun return rc; 32*4882a593Smuzhiyun@@ -800,13 +800,19 @@ int evemu_record(FILE *fp, int fd, int ms) 33*4882a593Smuzhiyun if (ret < 0) 34*4882a593Smuzhiyun return ret; 35*4882a593Smuzhiyun if (ret == sizeof(ev)) { 36*4882a593Smuzhiyun+ struct timeval tv; 37*4882a593Smuzhiyun long time; 38*4882a593Smuzhiyun 39*4882a593Smuzhiyun+ tv.tv_sec = ev.input_event_sec; 40*4882a593Smuzhiyun+ tv.tv_usec = ev.input_event_usec; 41*4882a593Smuzhiyun+ 42*4882a593Smuzhiyun if (offset == 0) 43*4882a593Smuzhiyun- offset = time_to_long(&ev.time) - 1; 44*4882a593Smuzhiyun+ offset = time_to_long(&tv) - 1; 45*4882a593Smuzhiyun 46*4882a593Smuzhiyun- time = time_to_long(&ev.time); 47*4882a593Smuzhiyun- ev.time = long_to_time(time - offset); 48*4882a593Smuzhiyun+ time = time_to_long(&tv); 49*4882a593Smuzhiyun+ tv = long_to_time(time - offset); 50*4882a593Smuzhiyun+ ev.input_event_sec = tv.tv_sec; 51*4882a593Smuzhiyun+ ev.input_event_usec = tv.tv_usec; 52*4882a593Smuzhiyun evemu_write_event(fp, &ev); 53*4882a593Smuzhiyun fflush(fp); 54*4882a593Smuzhiyun } 55*4882a593Smuzhiyun@@ -839,8 +845,8 @@ int evemu_read_event(FILE *fp, struct input_event *ev) 56*4882a593Smuzhiyun return -1; 57*4882a593Smuzhiyun } 58*4882a593Smuzhiyun 59*4882a593Smuzhiyun- ev->time.tv_sec = sec; 60*4882a593Smuzhiyun- ev->time.tv_usec = usec; 61*4882a593Smuzhiyun+ ev->input_event_sec = sec; 62*4882a593Smuzhiyun+ ev->input_event_usec = usec; 63*4882a593Smuzhiyun ev->type = type; 64*4882a593Smuzhiyun ev->code = code; 65*4882a593Smuzhiyun ev->value = value; 66*4882a593Smuzhiyun@@ -852,8 +858,8 @@ out: 67*4882a593Smuzhiyun 68*4882a593Smuzhiyun int evemu_create_event(struct input_event *ev, int type, int code, int value) 69*4882a593Smuzhiyun { 70*4882a593Smuzhiyun- ev->time.tv_sec = 0; 71*4882a593Smuzhiyun- ev->time.tv_usec = 0; 72*4882a593Smuzhiyun+ ev->input_event_sec = 0; 73*4882a593Smuzhiyun+ ev->input_event_usec = 0; 74*4882a593Smuzhiyun ev->type = type; 75*4882a593Smuzhiyun ev->code = code; 76*4882a593Smuzhiyun ev->value = value; 77*4882a593Smuzhiyun@@ -873,6 +879,7 @@ static inline unsigned long us2s(unsigned long us) 78*4882a593Smuzhiyun int evemu_read_event_realtime(FILE *fp, struct input_event *ev, 79*4882a593Smuzhiyun struct timeval *evtime) 80*4882a593Smuzhiyun { 81*4882a593Smuzhiyun+ struct timeval tv; 82*4882a593Smuzhiyun unsigned long usec; 83*4882a593Smuzhiyun const unsigned long ERROR_MARGIN = 150; /* µs */ 84*4882a593Smuzhiyun int ret; 85*4882a593Smuzhiyun@@ -882,14 +889,18 @@ int evemu_read_event_realtime(FILE *fp, struct input_event *ev, 86*4882a593Smuzhiyun return ret; 87*4882a593Smuzhiyun 88*4882a593Smuzhiyun if (evtime) { 89*4882a593Smuzhiyun- if (evtime->tv_sec == 0 && evtime->tv_usec == 0) 90*4882a593Smuzhiyun- *evtime = ev->time; 91*4882a593Smuzhiyun- usec = time_to_long(&ev->time) - time_to_long(evtime); 92*4882a593Smuzhiyun+ if (evtime->tv_sec == 0 && evtime->tv_usec == 0) { 93*4882a593Smuzhiyun+ evtime->tv_sec = ev->input_event_sec; 94*4882a593Smuzhiyun+ evtime->tv_usec = ev->input_event_usec; 95*4882a593Smuzhiyun+ } 96*4882a593Smuzhiyun+ tv.tv_sec = ev->input_event_sec; 97*4882a593Smuzhiyun+ tv.tv_usec = ev->input_event_usec; 98*4882a593Smuzhiyun+ usec = time_to_long(&tv) - time_to_long(evtime); 99*4882a593Smuzhiyun if (usec > ERROR_MARGIN * 2) { 100*4882a593Smuzhiyun if (usec > s2us(10)) 101*4882a593Smuzhiyun error(INFO, "Sleeping for %lds.\n", us2s(usec)); 102*4882a593Smuzhiyun usleep(usec - ERROR_MARGIN); 103*4882a593Smuzhiyun- *evtime = ev->time; 104*4882a593Smuzhiyun+ *evtime = tv; 105*4882a593Smuzhiyun } 106*4882a593Smuzhiyun } 107*4882a593Smuzhiyun 108*4882a593Smuzhiyun-- 109*4882a593Smuzhiyun2.24.1 110*4882a593Smuzhiyun 111