summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-oe/recipes-support/utouch/utouch-evemu/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch15
1 files changed, 9 insertions, 6 deletions
diff --git a/meta-oe/recipes-support/utouch/utouch-evemu/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch b/meta-oe/recipes-support/utouch/utouch-evemu/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch
index 71bf572699..7cfd470430 100644
--- a/meta-oe/recipes-support/utouch/utouch-evemu/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch
+++ b/meta-oe/recipes-support/utouch/utouch-evemu/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch
@@ -12,8 +12,8 @@ Upstream-Status: Pending
12Signed-off-by: Khem Raj <raj.khem@gmail.com> 12Signed-off-by: Khem Raj <raj.khem@gmail.com>
13--- 13---
14 src/evemu-impl.h | 5 +++++ 14 src/evemu-impl.h | 5 +++++
15 src/evemu.c | 16 +++++++++------- 15 src/evemu.c | 20 ++++++++++++--------
16 2 files changed, 14 insertions(+), 7 deletions(-) 16 2 files changed, 17 insertions(+), 8 deletions(-)
17 17
18diff --git a/src/evemu-impl.h b/src/evemu-impl.h 18diff --git a/src/evemu-impl.h b/src/evemu-impl.h
19index acf2976..c08d861 100644 19index acf2976..c08d861 100644
@@ -32,7 +32,7 @@ index acf2976..c08d861 100644
32 #define EVPLAY_NBYTES ((EVPLAY_NBITS + 7) / 8) 32 #define EVPLAY_NBYTES ((EVPLAY_NBITS + 7) / 8)
33 33
34diff --git a/src/evemu.c b/src/evemu.c 34diff --git a/src/evemu.c b/src/evemu.c
35index 21187af..160c915 100644 35index 21187af..7489449 100644
36--- a/src/evemu.c 36--- a/src/evemu.c
37+++ b/src/evemu.c 37+++ b/src/evemu.c
38@@ -363,7 +363,7 @@ int evemu_read(struct evemu_device *dev, FILE *fp) 38@@ -363,7 +363,7 @@ int evemu_read(struct evemu_device *dev, FILE *fp)
@@ -55,16 +55,19 @@ index 21187af..160c915 100644
55 ev->type = type; 55 ev->type = type;
56 ev->code = code; 56 ev->code = code;
57 ev->value = value; 57 ev->value = value;
58@@ -411,12 +411,14 @@ int evemu_read_event_realtime(FILE *fp, struct input_event *ev, 58@@ -410,13 +411,16 @@ int evemu_read_event_realtime(FILE *fp, struct input_event *ev,
59 return ret;
59 60
60 if (evtime) { 61 if (evtime) {
61 if (!evtime->tv_sec) 62- if (!evtime->tv_sec)
62- *evtime = ev->time; 63- *evtime = ev->time;
63- usec = 1000000L * (ev->time.tv_sec - evtime->tv_sec); 64- usec = 1000000L * (ev->time.tv_sec - evtime->tv_sec);
64- usec += ev->time.tv_usec - evtime->tv_usec; 65- usec += ev->time.tv_usec - evtime->tv_usec;
66+ if (!evtime->tv_sec) {
65+ evtime->tv_sec = ev->input_event_sec; 67+ evtime->tv_sec = ev->input_event_sec;
66+ evtime->tv_usec = ev->input_event_usec; 68+ evtime->tv_usec = ev->input_event_usec;
67+ usec = 1000000L * (ev->input_event_sec - evtime->tv_sec); 69+ }
70+ usec = (ev->input_event_sec - evtime->tv_sec) * 1000000L;
68+ usec += ev->input_event_usec - evtime->tv_usec; 71+ usec += ev->input_event_usec - evtime->tv_usec;
69 if (usec > 500) { 72 if (usec > 500) {
70 usleep(usec); 73 usleep(usec);