diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2018-12-04 07:51:52 +0100 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2018-12-04 07:51:52 +0100 |
| commit | 31c2ddabea0c34114062d9d1720b63ddf5e2be08 (patch) | |
| tree | cdc9cd1204ab40ae9ee31463bbd1c6d3a2ccc31b | |
| parent | 3843e8260c6df6bc00794cecfe5491eb28685da4 (diff) | |
| download | systemd-31c2ddabea0c34114062d9d1720b63ddf5e2be08.tar.gz systemd-31c2ddabea0c34114062d9d1720b63ddf5e2be08.tar.bz2 systemd-31c2ddabea0c34114062d9d1720b63ddf5e2be08.zip | |
missing: move input related entries to missing_input.h
| -rw-r--r-- | src/basic/meson.build | 1 | ||||
| -rw-r--r-- | src/basic/missing.h | 34 | ||||
| -rw-r--r-- | src/basic/missing_input.h | 44 |
3 files changed, 46 insertions, 33 deletions
diff --git a/src/basic/meson.build b/src/basic/meson.build index 596c937d54..656e21527e 100644 --- a/src/basic/meson.build +++ b/src/basic/meson.build @@ -99,6 +99,7 @@ basic_sources = files(''' missing_if_bridge.h missing_if_link.h missing_if_tunnel.h + missing_input.h missing_keyctl.h missing_network.h missing_securebits.h diff --git a/src/basic/missing.h b/src/basic/missing.h index 71a2258c90..4db565660d 100644 --- a/src/basic/missing.h +++ b/src/basic/missing.h @@ -9,7 +9,6 @@ #include <linux/audit.h> #include <linux/capability.h> #include <linux/falloc.h> -#include <linux/input.h> #include <linux/oom.h> #include <net/ethernet.h> #include <stdlib.h> @@ -292,21 +291,6 @@ struct sockaddr_vm { # define SO_PEERGROUPS 59 #endif -#ifndef EVIOCREVOKE -# define EVIOCREVOKE _IOW('E', 0x91, int) -#endif - -#ifndef EVIOCSMASK - -struct input_mask { - uint32_t type; - uint32_t codes_size; - uint64_t codes_ptr; -}; - -#define EVIOCSMASK _IOW('E', 0x93, struct input_mask) -#endif - #ifndef DRM_IOCTL_SET_MASTER # define DRM_IOCTL_SET_MASTER _IO('d', 0x1e) #endif @@ -392,23 +376,6 @@ struct input_mask { #define KCMP_FILE 0 #endif -#ifndef INPUT_PROP_POINTING_STICK -#define INPUT_PROP_POINTING_STICK 0x05 -#endif - -#ifndef INPUT_PROP_ACCELEROMETER -#define INPUT_PROP_ACCELEROMETER 0x06 -#endif - -#ifndef BTN_DPAD_UP -#define BTN_DPAD_UP 0x220 -#define BTN_DPAD_RIGHT 0x223 -#endif - -#ifndef KEY_ALS_TOGGLE -#define KEY_ALS_TOGGLE 0x230 -#endif - #ifndef PR_CAP_AMBIENT #define PR_CAP_AMBIENT 47 #endif @@ -516,5 +483,6 @@ struct statx { #endif #include "missing_btrfs_tree.h" +#include "missing_input.h" #include "missing_network.h" #include "missing_syscall.h" diff --git a/src/basic/missing_input.h b/src/basic/missing_input.h new file mode 100644 index 0000000000..93cdf9a310 --- /dev/null +++ b/src/basic/missing_input.h @@ -0,0 +1,44 @@ +/* SPDX-License-Identifier: LGPL-2.1+ */ +#pragma once + +#include <linux/input.h> + +/* linux@c7dc65737c9a607d3e6f8478659876074ad129b8 (3.12) */ +#ifndef EVIOCREVOKE +#define EVIOCREVOKE _IOW('E', 0x91, int) +#endif + +/* linux@06a16293f71927f756dcf37558a79c0b05a91641 (4.4) */ +#ifndef EVIOCSMASK +struct input_mask { + uint32_t type; + uint32_t codes_size; + uint64_t 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 +#endif + +/* linux@500d4160abe9a2e88b12e319c13ae3ebd1e18108 (4.0) */ +#ifndef INPUT_PROP_ACCELEROMETER +#define 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 +#endif + +/* linux@358f24704f2f016af7d504b357cdf32606091d07 (3.13) */ +#ifndef KEY_ALS_TOGGLE +#define KEY_ALS_TOGGLE 0x230 +#endif |