missing_input: replace the header with genuine linux header

diff --git a/src/basic/missing_input.h b/src/basic/missing_input.h
deleted file mode 100644 (file)
index ee61bf9..0000000
--- a/src/basic/missing_input.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* SPDX-License-Identifier: LGPL-2.1-or-later */
-#pragma once
-
-#include <linux/input.h>
-#include <linux/types.h>
-
-#include "macro.h"
-
-/* linux@c7dc65737c9a607d3e6f8478659876074ad129b8 (3.12) */
-#ifndef EVIOCREVOKE
-#  define EVIOCREVOKE _IOW('E', 0x91, int)
-#endif
-
-/* linux@06a16293f71927f756dcf37558a79c0b05a91641 (4.4) */
-#ifndef EVIOCSMASK
-struct input_mask {
-        __u32 type;
-        __u32 codes_size;
-        __u64 codes_ptr;
-};
-
-#  define EVIOCGMASK _IOR('E', 0x92, struct input_mask)
-#  define EVIOCSMASK _IOW('E', 0x93, struct input_mask)
-#endif
-
-/* linux@7611392fe8ff95ecae528b01a815ae3d72ca6b95 (3.17) */
-#ifndef INPUT_PROP_POINTING_STICK
-#  define INPUT_PROP_POINTING_STICK 0x05
-#else
-assert_cc(INPUT_PROP_POINTING_STICK == 0x05);
-#endif
-
-/* linux@500d4160abe9a2e88b12e319c13ae3ebd1e18108 (4.0) */
-#ifndef INPUT_PROP_ACCELEROMETER
-#  define INPUT_PROP_ACCELEROMETER  0x06
-#else
-assert_cc(INPUT_PROP_ACCELEROMETER == 0x06);
-#endif
-
-/* linux@d09bbfd2a8408a995419dff0d2ba906013cf4cc9 (3.11) */
-#ifndef BTN_DPAD_UP
-#  define BTN_DPAD_UP    0x220
-#  define BTN_DPAD_DOWN  0x221
-#  define BTN_DPAD_LEFT  0x222
-#  define BTN_DPAD_RIGHT 0x223
-#else
-assert_cc(BTN_DPAD_UP    == 0x220);
-assert_cc(BTN_DPAD_DOWN  == 0x221);
-assert_cc(BTN_DPAD_LEFT  == 0x222);
-assert_cc(BTN_DPAD_RIGHT == 0x223);
-#endif
-
-/* linux@358f24704f2f016af7d504b357cdf32606091d07 (3.13) */
-#ifndef KEY_ALS_TOGGLE
-#  fine KEY_ALS_TOGGLE 0x230
-#else
-assert_cc(KEY_ALS_TOGGLE == 0x230);
-#endif

diff --git a/src/login/logind-button.c b/src/login/logind-button.c
index f980ea5eced9956b32772e157cd71b57366d56f3..bc49305fcd52478e8c2aed697177c599d58c4dee 100644 (file)
--- a/src/login/logind-button.c
+++ b/src/login/logind-button.c
@@ -2,6 +2,7 @@
 
 #include <errno.h>
 #include <fcntl.h>
+#include <linux/input.h>
 #include <sys/ioctl.h>
 #include <unistd.h>
 
@@ -12,7 +13,6 @@
 #include "fd-util.h"
 #include "logind-button.h"
 #include "logind-dbus.h"
-#include "missing_input.h"
 #include "string-util.h"
 
 /* KEY_RESTART is the highest value key in keys_interested. */

diff --git a/src/login/logind-session-device.c b/src/login/logind-session-device.c
index 035a36795447badbb8ef93220b39860a3795f376..f0730f751c35f207ddcda3d4fbefadde91ef1b56 100644 (file)
--- a/src/login/logind-session-device.c
+++ b/src/login/logind-session-device.c
@@ -2,6 +2,7 @@
 
 #include <fcntl.h>
 #include <linux/hidraw.h>
+#include <linux/input.h>
 #include <string.h>
 #include <sys/ioctl.h>
 #include <sys/types.h>
@@ -17,7 +18,6 @@
 #include "logind-session-dbus.h"
 #include "logind-session-device.h"
 #include "missing_drm.h"
-#include "missing_input.h"
 #include "parse-util.h"
 
 enum SessionDeviceNotifications {

diff --git a/src/udev/udev-builtin-input_id.c b/src/udev/udev-builtin-input_id.c
index 509edee8aadf502cf2f6e163f1467acf5236a016..f16ca00e139697acf2c1fc530f659edb3ab63686 100644 (file)
--- a/src/udev/udev-builtin-input_id.c
+++ b/src/udev/udev-builtin-input_id.c
@@ -8,13 +8,13 @@
 
 #include <errno.h>
 #include <fcntl.h>
+#include <linux/input.h>
+#include <linux/limits.h>
 #include <stdarg.h>
 #include <unistd.h>
-#include <linux/limits.h>
 
 #include "device-util.h"
 #include "fd-util.h"
-#include "missing_input.h"
 #include "parse-util.h"
 #include "stdio-util.h"
 #include "string-util.h"