diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2020-08-03 15:46:39 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2020-09-11 12:13:13 +1000 |
| commit | 44b5c9bd9fc3694124ce1af815656bbda3ce6329 (patch) | |
| tree | 075ac512c455d6bf650d6ce055c8ad0f564e70c0 | |
| parent | b40675c701d564c3a465018950041a682401cacd (diff) | |
include: sync event codes with kernel 5.8
And fix the script to sync the headers up so it syncs event codes for both bsd
and linux, but only syncs input.h for linux.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | include/linux/freebsd/input-event-codes.h | 3 | ||||
| -rw-r--r-- | include/linux/linux/input-event-codes.h | 3 | ||||
| -rw-r--r-- | test/test-event-names.c | 2 | ||||
| -rwxr-xr-x | tools/sync-with-kernel-headers.sh | 9 |
4 files changed, 10 insertions, 7 deletions
diff --git a/include/linux/freebsd/input-event-codes.h b/include/linux/freebsd/input-event-codes.h index b6a835d..0c2e27d 100644 --- a/include/linux/freebsd/input-event-codes.h +++ b/include/linux/freebsd/input-event-codes.h @@ -888,7 +888,8 @@ #define SW_LINEIN_INSERT 0x0d /* set = inserted */ #define SW_MUTE_DEVICE 0x0e /* set = device disabled */ #define SW_PEN_INSERTED 0x0f /* set = pen inserted */ -#define SW_MAX 0x0f +#define SW_MACHINE_COVER 0x10 /* set = cover closed */ +#define SW_MAX 0x10 #define SW_CNT (SW_MAX+1) /* diff --git a/include/linux/linux/input-event-codes.h b/include/linux/linux/input-event-codes.h index b6a835d..0c2e27d 100644 --- a/include/linux/linux/input-event-codes.h +++ b/include/linux/linux/input-event-codes.h @@ -888,7 +888,8 @@ #define SW_LINEIN_INSERT 0x0d /* set = inserted */ #define SW_MUTE_DEVICE 0x0e /* set = device disabled */ #define SW_PEN_INSERTED 0x0f /* set = pen inserted */ -#define SW_MAX 0x0f +#define SW_MACHINE_COVER 0x10 /* set = cover closed */ +#define SW_MAX 0x10 #define SW_CNT (SW_MAX+1) /* diff --git a/test/test-event-names.c b/test/test-event-names.c index 480176c..bf95f43 100644 --- a/test/test-event-names.c +++ b/test/test-event-names.c @@ -175,7 +175,7 @@ START_TEST(test_code_sw_name) ck_assert_str_eq(libevdev_event_code_get_name(EV_SW, SW_RFKILL_ALL), "SW_RFKILL_ALL"); ck_assert_str_eq(libevdev_event_code_get_name(EV_SW, SW_LINEIN_INSERT), "SW_LINEIN_INSERT"); ck_assert_str_eq(libevdev_event_code_get_name(EV_SW, SW_PEN_INSERTED), "SW_PEN_INSERTED"); - ck_assert_str_eq(libevdev_event_code_get_name(EV_SW, SW_MAX), "SW_PEN_INSERTED"); + ck_assert_str_eq(libevdev_event_code_get_name(EV_SW, SW_MAX), "SW_MACHINE_COVER"); } END_TEST diff --git a/tools/sync-with-kernel-headers.sh b/tools/sync-with-kernel-headers.sh index 89635b6..b80e450 100755 --- a/tools/sync-with-kernel-headers.sh +++ b/tools/sync-with-kernel-headers.sh @@ -21,10 +21,11 @@ if ! [ -d .git ]; then exit 1 fi -files="linux/input.h linux/input-event-codes.h" +file="linux/input.h" +git cat-file -p "$TAG:include/uapi/$file" > "include/linux/linux/$(basename $file)" -for file in $files; do - git cat-file -p "$TAG:include/uapi/$file" > "include/$file" -done +file="linux/input-event-codes.h" +git cat-file -p "$TAG:include/uapi/$file" > "include/linux/linux/$(basename $file)" +git cat-file -p "$TAG:include/uapi/$file" > "include/linux/freebsd/$(basename $file)" |