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>

diff --git a/include/linux/freebsd/input-event-codes.h b/include/linux/freebsd/input-event-codes.h
index b6a835d37826384e87feb1446809e983379bda1f..0c2e27d28e0acdf825bab42cbffb452275f065ed 100644 (file)
--- 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 b6a835d37826384e87feb1446809e983379bda1f..0c2e27d28e0acdf825bab42cbffb452275f065ed 100644 (file)
--- 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 480176c4eacb495eaaf0369d39dff25d8d9d54cd..bf95f4342f67de063d60cba1669a77a659fad446 100644 (file)
--- 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 89635b6711d394ef8dec34e87fce9a91966e930f..b80e4501ef5258760faba9147bc870b63c8f9198 100755 (executable)
--- 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)"