diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2019-03-06 10:56:28 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2019-03-06 10:56:55 +1000 |
| commit | 951cd6a189329f35d2477210c8db36cfb1eb4d80 (patch) | |
| tree | c80d0f2bb6a38dfe51673f6c9ad0a49122474cf5 /include | |
| parent | 6852dadbca2720621ce4699a03d35f791e9d7ebe (diff) | |
include: sync event codes with kernel 5.0
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/input-event-codes.h | 2 | ||||
| -rw-r--r-- | include/linux/input.h | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/include/linux/input-event-codes.h b/include/linux/input-event-codes.h index 2bc40ad..c9489f3 100644 --- a/include/linux/input-event-codes.h +++ b/include/linux/input-event-codes.h @@ -716,6 +716,8 @@ * the situation described above. */ #define REL_RESERVED 0x0a +#define REL_WHEEL_HI_RES 0x0b +#define REL_HWHEEL_HI_RES 0x0c #define REL_MAX 0x0f #define REL_CNT (REL_MAX+1) diff --git a/include/linux/input.h b/include/linux/input.h index 8574807..8ad54cc 100644 --- a/include/linux/input.h +++ b/include/linux/input.h @@ -24,13 +24,17 @@ */ struct input_event { -#if (__BITS_PER_LONG != 32 || !defined(__USE_TIME_BITS64)) && !defined(__KERNEL) +#if (__BITS_PER_LONG != 32 || !defined(__USE_TIME_BITS64)) && !defined(__KERNEL__) struct timeval time; #define input_event_sec time.tv_sec #define input_event_usec time.tv_usec #else __kernel_ulong_t __sec; +#if defined(__sparc__) && defined(__arch64__) + unsigned int __usec; +#else __kernel_ulong_t __usec; +#endif #define input_event_sec __sec #define input_event_usec __usec #endif |