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