diff options
-rw-r--r-- | Documentation/input/event-codes.rst | 11 | ||||
-rw-r--r-- | include/uapi/linux/input-event-codes.h | 10 |
2 files changed, 1 insertions, 20 deletions
diff --git a/Documentation/input/event-codes.rst b/Documentation/input/event-codes.rst index cef220c176a4..a8c0873beb95 100644 --- a/Documentation/input/event-codes.rst +++ b/Documentation/input/event-codes.rst | |||
@@ -190,16 +190,7 @@ A few EV_REL codes have special meanings: | |||
190 | * REL_WHEEL, REL_HWHEEL: | 190 | * REL_WHEEL, REL_HWHEEL: |
191 | 191 | ||
192 | - These codes are used for vertical and horizontal scroll wheels, | 192 | - These codes are used for vertical and horizontal scroll wheels, |
193 | respectively. The value is the number of "notches" moved on the wheel, the | 193 | respectively. |
194 | physical size of which varies by device. For high-resolution wheels (which | ||
195 | report multiple events for each notch of movement, or do not have notches) | ||
196 | this may be an approximation based on the high-resolution scroll events. | ||
197 | |||
198 | * REL_WHEEL_HI_RES: | ||
199 | |||
200 | - If a vertical scroll wheel supports high-resolution scrolling, this code | ||
201 | will be emitted in addition to REL_WHEEL. The value is the (approximate) | ||
202 | distance travelled by the user's finger, in microns. | ||
203 | 194 | ||
204 | EV_ABS | 195 | EV_ABS |
205 | ------ | 196 | ------ |
diff --git a/include/uapi/linux/input-event-codes.h b/include/uapi/linux/input-event-codes.h index 6d180cc60a5d..3eb5a4c3d60a 100644 --- a/include/uapi/linux/input-event-codes.h +++ b/include/uapi/linux/input-event-codes.h | |||
@@ -716,7 +716,6 @@ | |||
716 | * the situation described above. | 716 | * the situation described above. |
717 | */ | 717 | */ |
718 | #define REL_RESERVED 0x0a | 718 | #define REL_RESERVED 0x0a |
719 | #define REL_WHEEL_HI_RES 0x0b | ||
720 | #define REL_MAX 0x0f | 719 | #define REL_MAX 0x0f |
721 | #define REL_CNT (REL_MAX+1) | 720 | #define REL_CNT (REL_MAX+1) |
722 | 721 | ||
@@ -753,15 +752,6 @@ | |||
753 | 752 | ||
754 | #define ABS_MISC 0x28 | 753 | #define ABS_MISC 0x28 |
755 | 754 | ||
756 | /* | ||
757 | * 0x2e is reserved and should not be used in input drivers. | ||
758 | * It was used by HID as ABS_MISC+6 and userspace needs to detect if | ||
759 | * the next ABS_* event is correct or is just ABS_MISC + n. | ||
760 | * We define here ABS_RESERVED so userspace can rely on it and detect | ||
761 | * the situation described above. | ||
762 | */ | ||
763 | #define ABS_RESERVED 0x2e | ||
764 | |||
765 | #define ABS_MT_SLOT 0x2f /* MT slot being modified */ | 755 | #define ABS_MT_SLOT 0x2f /* MT slot being modified */ |
766 | #define ABS_MT_TOUCH_MAJOR 0x30 /* Major axis of touching ellipse */ | 756 | #define ABS_MT_TOUCH_MAJOR 0x30 /* Major axis of touching ellipse */ |
767 | #define ABS_MT_TOUCH_MINOR 0x31 /* Minor axis (omit if circular) */ | 757 | #define ABS_MT_TOUCH_MINOR 0x31 /* Minor axis (omit if circular) */ |