diff options
author | Dmitry Tunin <hanipouspilot@gmail.com> | 2015-05-31 14:26:49 -0400 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-06-02 13:46:10 -0400 |
commit | 85919a00e55f90e72405e707eb23c930b8d8db91 (patch) | |
tree | 50567c2015cc429d8fdda4706ea059b1016f4d57 | |
parent | ffb6e0c9a0572f8e5f8e9337a1b40ac2ec1493a1 (diff) |
Input: focaltech - report finger width to userspace
Focaltech touchpads report finger width in packet[5] of absolute packet.
Range for width in raw format is 0x10 - 0x70. Second half-byte is always 0.
0xff is reported, when a large contact area is detected.
This can be handled in userspace.
Signed-off-by: Dmitry Tunin <hanipouspilot@gmail.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
-rw-r--r-- | drivers/input/mouse/focaltech.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/drivers/input/mouse/focaltech.c b/drivers/input/mouse/focaltech.c index 23d259416f2f..4d5576de81be 100644 --- a/drivers/input/mouse/focaltech.c +++ b/drivers/input/mouse/focaltech.c | |||
@@ -103,6 +103,16 @@ struct focaltech_hw_state { | |||
103 | */ | 103 | */ |
104 | struct focaltech_finger_state fingers[FOC_MAX_FINGERS]; | 104 | struct focaltech_finger_state fingers[FOC_MAX_FINGERS]; |
105 | 105 | ||
106 | /* | ||
107 | * Finger width 0-7 and 15 for a very big contact area. | ||
108 | * 15 value stays until the finger is released. | ||
109 | * Width is reported only in absolute packets. | ||
110 | * Since hardware reports width only for last touching finger, | ||
111 | * there is no need to store width for every specific finger, | ||
112 | * so we keep only last value reported. | ||
113 | */ | ||
114 | unsigned int width; | ||
115 | |||
106 | /* True if the clickpad has been pressed. */ | 116 | /* True if the clickpad has been pressed. */ |
107 | bool pressed; | 117 | bool pressed; |
108 | }; | 118 | }; |
@@ -137,6 +147,7 @@ static void focaltech_report_state(struct psmouse *psmouse) | |||
137 | input_report_abs(dev, ABS_MT_POSITION_X, clamped_x); | 147 | input_report_abs(dev, ABS_MT_POSITION_X, clamped_x); |
138 | input_report_abs(dev, ABS_MT_POSITION_Y, | 148 | input_report_abs(dev, ABS_MT_POSITION_Y, |
139 | priv->y_max - clamped_y); | 149 | priv->y_max - clamped_y); |
150 | input_report_abs(dev, ABS_TOOL_WIDTH, state->width); | ||
140 | } | 151 | } |
141 | } | 152 | } |
142 | input_mt_report_pointer_emulation(dev, true); | 153 | input_mt_report_pointer_emulation(dev, true); |
@@ -187,6 +198,7 @@ static void focaltech_process_abs_packet(struct psmouse *psmouse, | |||
187 | 198 | ||
188 | state->fingers[finger].x = ((packet[1] & 0xf) << 8) | packet[2]; | 199 | state->fingers[finger].x = ((packet[1] & 0xf) << 8) | packet[2]; |
189 | state->fingers[finger].y = (packet[3] << 8) | packet[4]; | 200 | state->fingers[finger].y = (packet[3] << 8) | packet[4]; |
201 | state->width = packet[5] >> 4; | ||
190 | state->fingers[finger].valid = true; | 202 | state->fingers[finger].valid = true; |
191 | } | 203 | } |
192 | 204 | ||
@@ -331,6 +343,7 @@ static void focaltech_set_input_params(struct psmouse *psmouse) | |||
331 | __set_bit(EV_ABS, dev->evbit); | 343 | __set_bit(EV_ABS, dev->evbit); |
332 | input_set_abs_params(dev, ABS_MT_POSITION_X, 0, priv->x_max, 0, 0); | 344 | input_set_abs_params(dev, ABS_MT_POSITION_X, 0, priv->x_max, 0, 0); |
333 | input_set_abs_params(dev, ABS_MT_POSITION_Y, 0, priv->y_max, 0, 0); | 345 | input_set_abs_params(dev, ABS_MT_POSITION_Y, 0, priv->y_max, 0, 0); |
346 | input_set_abs_params(dev, ABS_TOOL_WIDTH, 0, 15, 0, 0); | ||
334 | input_mt_init_slots(dev, 5, INPUT_MT_POINTER); | 347 | input_mt_init_slots(dev, 5, INPUT_MT_POINTER); |
335 | __set_bit(INPUT_PROP_BUTTONPAD, dev->propbit); | 348 | __set_bit(INPUT_PROP_BUTTONPAD, dev->propbit); |
336 | } | 349 | } |