mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-05-09 17:59:26 +00:00
Code Issues Projects Releases Wiki Activity

utouch-evemu: correct Fix build for 32bit arches with 64bit time_t

Browse Source 
A pair of parenthesis are missing on correction which generate bad
behaviour at runtime.

Signed-off-by: Christophe Priouzeau <christophe.priouzeau@st.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Christophe PRIOUZEAU
2020-04-20 07:10:29 +00:00
committed by Khem Raj
parent 394b64e95a
commit 85d6bc79a5
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-support/utouch/utouch-evemu/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch
+9 -6
View File
@@ -12,8 +12,8 @@ Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
--- ---
src/evemu-impl.h | 5 +++++ src/evemu-impl.h | 5 +++++
src/evemu.c | 16 +++++++++------- src/evemu.c | 20 ++++++++++++--------
2 files changed, 14 insertions(+), 7 deletions(-) 2 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/src/evemu-impl.h b/src/evemu-impl.h diff --git a/src/evemu-impl.h b/src/evemu-impl.h
index acf2976..c08d861 100644 index acf2976..c08d861 100644
@@ -32,7 +32,7 @@ index acf2976..c08d861 100644
#define EVPLAY_NBYTES ((EVPLAY_NBITS + 7) / 8) #define EVPLAY_NBYTES ((EVPLAY_NBITS + 7) / 8)
diff --git a/src/evemu.c b/src/evemu.c diff --git a/src/evemu.c b/src/evemu.c
index 21187af..160c915 100644 index 21187af..7489449 100644
--- a/src/evemu.c --- a/src/evemu.c
+++ b/src/evemu.c +++ b/src/evemu.c
@@ -363,7 +363,7 @@ int evemu_read(struct evemu_device *dev, FILE *fp) @@ -363,7 +363,7 @@ int evemu_read(struct evemu_device *dev, FILE *fp)
@@ -55,16 +55,19 @@ index 21187af..160c915 100644
ev->type = type; ev->type = type;
ev->code = code; ev->code = code;
ev->value = value; ev->value = value;
@@ -411,12 +411,14 @@ int evemu_read_event_realtime(FILE *fp, struct input_event *ev, @@ -410,13 +411,16 @@ int evemu_read_event_realtime(FILE *fp, struct input_event *ev,
return ret;
if (evtime) { if (evtime) {
if (!evtime->tv_sec) - if (!evtime->tv_sec)
- *evtime = ev->time; - *evtime = ev->time;
- usec = 1000000L * (ev->time.tv_sec - evtime->tv_sec); - usec = 1000000L * (ev->time.tv_sec - evtime->tv_sec);
- usec += ev->time.tv_usec - evtime->tv_usec; - usec += ev->time.tv_usec - evtime->tv_usec;
+ if (!evtime->tv_sec) {
+ evtime->tv_sec = ev->input_event_sec; + evtime->tv_sec = ev->input_event_sec;
+ evtime->tv_usec = ev->input_event_usec; + evtime->tv_usec = ev->input_event_usec;
+ usec = 1000000L * (ev->input_event_sec - evtime->tv_sec); + }
+ usec = (ev->input_event_sec - evtime->tv_sec) * 1000000L;
+ usec += ev->input_event_usec - evtime->tv_usec; + usec += ev->input_event_usec - evtime->tv_usec;
if (usec > 500) { if (usec > 500) {
usleep(usec); usleep(usec);