diff options
Diffstat (limited to 'include/uapi/linux')
| -rw-r--r-- | include/uapi/linux/serio.h | 1 | ||||
| -rw-r--r-- | include/uapi/linux/uinput.h | 9 |
2 files changed, 10 insertions, 0 deletions
diff --git a/include/uapi/linux/serio.h b/include/uapi/linux/serio.h index 9f53fa7fc132..becdd78295cc 100644 --- a/include/uapi/linux/serio.h +++ b/include/uapi/linux/serio.h | |||
| @@ -76,5 +76,6 @@ | |||
| 76 | #define SERIO_HAMPSHIRE 0x3b | 76 | #define SERIO_HAMPSHIRE 0x3b |
| 77 | #define SERIO_PS2MULT 0x3c | 77 | #define SERIO_PS2MULT 0x3c |
| 78 | #define SERIO_TSC40 0x3d | 78 | #define SERIO_TSC40 0x3d |
| 79 | #define SERIO_WACOM_IV 0x3e | ||
| 79 | 80 | ||
| 80 | #endif /* _UAPI_SERIO_H */ | 81 | #endif /* _UAPI_SERIO_H */ |
diff --git a/include/uapi/linux/uinput.h b/include/uapi/linux/uinput.h index 0389b489bbba..baeab83deb64 100644 --- a/include/uapi/linux/uinput.h +++ b/include/uapi/linux/uinput.h | |||
| @@ -84,6 +84,15 @@ struct uinput_ff_erase { | |||
| 84 | */ | 84 | */ |
| 85 | #define UI_GET_SYSNAME(len) _IOC(_IOC_READ, UINPUT_IOCTL_BASE, 300, len) | 85 | #define UI_GET_SYSNAME(len) _IOC(_IOC_READ, UINPUT_IOCTL_BASE, 300, len) |
| 86 | 86 | ||
| 87 | /** | ||
| 88 | * UI_GET_VERSION - Return version of uinput protocol | ||
| 89 | * | ||
| 90 | * This writes uinput protocol version implemented by the kernel into | ||
| 91 | * the integer pointed to by the ioctl argument. The protocol version | ||
| 92 | * is hard-coded in the kernel and is independent of the uinput device. | ||
| 93 | */ | ||
| 94 | #define UI_GET_VERSION _IOR(UINPUT_IOCTL_BASE, 301, unsigned int) | ||
| 95 | |||
| 87 | /* | 96 | /* |
| 88 | * To write a force-feedback-capable driver, the upload_effect | 97 | * To write a force-feedback-capable driver, the upload_effect |
| 89 | * and erase_effect callbacks in input_dev must be implemented. | 98 | * and erase_effect callbacks in input_dev must be implemented. |
