0002-evemu-Update-struct-input_event.patch 3.3 KB

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