diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2015-06-22 15:53:48 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2015-06-22 15:53:48 +1000 |
| commit | 66dfaeb999ed46037a38756fac17d852e3c16eac (patch) | |
| tree | 51c26f545f0d1d4588cdbc80b4aa6d64a41942c8 /include | |
| parent | f54656ecc145caa69bd54c5cade332bf000e4668 (diff) | |
| download | libevdev-66dfaeb999ed46037a38756fac17d852e3c16eac.tar.gz | |
include: update to 4.1 header
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/input.h | 7 | ||||
| -rw-r--r-- | include/linux/uinput.h | 11 |
2 files changed, 16 insertions, 2 deletions
diff --git a/include/linux/input.h b/include/linux/input.h index 722eee6..da74f3f 100644 --- a/include/linux/input.h +++ b/include/linux/input.h @@ -367,7 +367,8 @@ struct input_keymap_entry { #define KEY_MSDOS 151 #define KEY_COFFEE 152 /* AL Terminal Lock/Screensaver */ #define KEY_SCREENLOCK KEY_COFFEE -#define KEY_DIRECTION 153 +#define KEY_ROTATE_DISPLAY 153 /* Display orientation for e.g. tablets */ +#define KEY_DIRECTION KEY_ROTATE_DISPLAY #define KEY_CYCLEWINDOWS 154 #define KEY_MAIL 155 #define KEY_BOOKMARKS 156 /* AC Bookmarks */ @@ -700,6 +701,10 @@ struct input_keymap_entry { #define KEY_NUMERIC_9 0x209 #define KEY_NUMERIC_STAR 0x20a #define KEY_NUMERIC_POUND 0x20b +#define KEY_NUMERIC_A 0x20c /* Phone key A - HUT Telephony 0xb9 */ +#define KEY_NUMERIC_B 0x20d +#define KEY_NUMERIC_C 0x20e +#define KEY_NUMERIC_D 0x20f #define KEY_CAMERA_FOCUS 0x210 #define KEY_WPS_BUTTON 0x211 /* WiFi Protected Setup key */ diff --git a/include/linux/uinput.h b/include/linux/uinput.h index 4f0c5f9..5eaad8a 100644 --- a/include/linux/uinput.h +++ b/include/linux/uinput.h @@ -82,7 +82,16 @@ struct uinput_ff_erase { * The complete sysfs path is then /sys/devices/virtual/input/--NAME-- * Usually, it is in the form "inputN" */ -#define UI_GET_SYSNAME(len) _IOC(_IOC_READ, UINPUT_IOCTL_BASE, 300, len) +#define UI_GET_SYSNAME(len) _IOC(_IOC_READ, UINPUT_IOCTL_BASE, 44, len) + +/** + * UI_GET_VERSION - Return version of uinput protocol + * + * This writes uinput protocol version implemented by the kernel into + * the integer pointed to by the ioctl argument. The protocol version + * is hard-coded in the kernel and is independent of the uinput device. + */ +#define UI_GET_VERSION _IOR(UINPUT_IOCTL_BASE, 45, unsigned int) /* * To write a force-feedback-capable driver, the upload_effect |