History

Merge branch 'for-4.12/sony' into for-linus

Jiri Kosina committed 9 years ago

Commit 800f3ee2 parents 18fc216 040fc003 files · +876 −814Browse files

Showing the changes to include/uapi/linux (1 of 3 files). Show all

Unified · Split

include/uapi/linux/input.h+8−3
@@ -61,9 +61,14 @@ struct input_id { · 60 unmodified lines
61 * Note that input core does not clamp reported values to the61 * Note that input core does not clamp reported values to the
62 * [minimum, maximum] limits, such task is left to userspace.62 * [minimum, maximum] limits, such task is left to userspace.
63 *63 *
64 * Resolution for main axes (ABS_X, ABS_Y, ABS_Z) is reported in64 * The default resolution for main axes (ABS_X, ABS_Y, ABS_Z)
65 * units per millimeter (units/mm), resolution for rotational axes65 * is reported in units per millimeter (units/mm), resolution
66 * (ABS_RX, ABS_RY, ABS_RZ) is reported in units per radian.66 * for rotational axes (ABS_RX, ABS_RY, ABS_RZ) is reported
67 * in units per radian.
68 * When INPUT_PROP_ACCELEROMETER is set the resolution changes.
69 * The main axes (ABS_X, ABS_Y, ABS_Z) are then reported in
70 * in units per g (units/g) and in units per degree per second
71 * (units/deg/s) for rotational axes (ABS_RX, ABS_RY, ABS_RZ).
67 */72 */
68struct input_absinfo {73struct input_absinfo {
69 __s32 value;74 __s32 value;