xref: /OK3568_Linux_fs/buildroot/package/evemu/0003-src-evemu.c-fix-build-with-kernels-4.16.patch (revision 4882a59341e53eb6f0b4789bf948001014eff981)
1From fd204f628021c9bb13870a8c983d9c63e1a53ebb Mon Sep 17 00:00:00 2001
2From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
3Date: Mon, 23 Mar 2020 11:04:11 +0100
4Subject: [PATCH] src/evemu.c: fix build with kernels >= 4.16
5
6Commit 30973c0b forgot to update all occurences of input_event, this
7will result in the following build failure with kernel >= 4.16:
8
9evemu.c: In function 'write_event_desc':
10evemu.c:753:23: error: 'const struct input_event' has no member named 'time'; did you mean 'type'?
11    time = millis(&ev->time);
12                       ^~~~
13                       type
14
15Fixes:
16 - http://autobuild.buildroot.org/results/487dd5056ec0a977d55b23417d5db2664dcc91fa
17
18Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
19[Retrieved from:
20https://gitlab.freedesktop.org/libevdev/evemu/-/commit/fd204f628021c9bb13870a8c983d9c63e1a53ebb]
21---
22 src/evemu.c | 7 +------
23 1 file changed, 1 insertion(+), 6 deletions(-)
24
25diff --git a/src/evemu.c b/src/evemu.c
26index c7ff561..42dbe1d 100644
27--- a/src/evemu.c
28+++ b/src/evemu.c
29@@ -733,11 +733,6 @@ out:
30 	return rc;
31 }
32
33-static inline unsigned long millis(const struct timeval *tv)
34-{
35-	return tv->tv_sec * 1000 + tv->tv_usec/1000;
36-}
37-
38 static int write_event_desc(FILE *fp, const struct input_event *ev)
39 {
40 	int rc;
41@@ -750,7 +745,7 @@ static int write_event_desc(FILE *fp, const struct input_event *ev)
42 				     libevdev_event_code_get_name(ev->type, ev->code),
43 				     ev->value);
44 		} else {
45-			time = millis(&ev->time);
46+			time = ev->input_event_sec * 1000 + ev->input_event_usec/1000;
47 			dt = time - last_ms;
48 			last_ms = time;
49 			rc = fprintf(fp, "# ------------ %s (%d) ---------- %+ldms\n",
50--
512.24.1
52
53