diff options
Diffstat (limited to 'drivers/input/mouse/alps.c')
-rw-r--r-- | drivers/input/mouse/alps.c | 1036 |
1 files changed, 955 insertions, 81 deletions
diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c index 003587c71f43..bd87380bd879 100644 --- a/drivers/input/mouse/alps.c +++ b/drivers/input/mouse/alps.c | |||
@@ -17,13 +17,63 @@ | |||
17 | 17 | ||
18 | #include <linux/slab.h> | 18 | #include <linux/slab.h> |
19 | #include <linux/input.h> | 19 | #include <linux/input.h> |
20 | #include <linux/input/mt.h> | ||
20 | #include <linux/serio.h> | 21 | #include <linux/serio.h> |
21 | #include <linux/libps2.h> | 22 | #include <linux/libps2.h> |
22 | 23 | ||
23 | #include "psmouse.h" | 24 | #include "psmouse.h" |
24 | #include "alps.h" | 25 | #include "alps.h" |
25 | 26 | ||
26 | #define ALPS_OLDPROTO 0x01 /* old style input */ | 27 | /* |
28 | * Definitions for ALPS version 3 and 4 command mode protocol | ||
29 | */ | ||
30 | #define ALPS_V3_X_MAX 2000 | ||
31 | #define ALPS_V3_Y_MAX 1400 | ||
32 | |||
33 | #define ALPS_BITMAP_X_BITS 15 | ||
34 | #define ALPS_BITMAP_Y_BITS 11 | ||
35 | |||
36 | #define ALPS_CMD_NIBBLE_10 0x01f2 | ||
37 | |||
38 | static const struct alps_nibble_commands alps_v3_nibble_commands[] = { | ||
39 | { PSMOUSE_CMD_SETPOLL, 0x00 }, /* 0 */ | ||
40 | { PSMOUSE_CMD_RESET_DIS, 0x00 }, /* 1 */ | ||
41 | { PSMOUSE_CMD_SETSCALE21, 0x00 }, /* 2 */ | ||
42 | { PSMOUSE_CMD_SETRATE, 0x0a }, /* 3 */ | ||
43 | { PSMOUSE_CMD_SETRATE, 0x14 }, /* 4 */ | ||
44 | { PSMOUSE_CMD_SETRATE, 0x28 }, /* 5 */ | ||
45 | { PSMOUSE_CMD_SETRATE, 0x3c }, /* 6 */ | ||
46 | { PSMOUSE_CMD_SETRATE, 0x50 }, /* 7 */ | ||
47 | { PSMOUSE_CMD_SETRATE, 0x64 }, /* 8 */ | ||
48 | { PSMOUSE_CMD_SETRATE, 0xc8 }, /* 9 */ | ||
49 | { ALPS_CMD_NIBBLE_10, 0x00 }, /* a */ | ||
50 | { PSMOUSE_CMD_SETRES, 0x00 }, /* b */ | ||
51 | { PSMOUSE_CMD_SETRES, 0x01 }, /* c */ | ||
52 | { PSMOUSE_CMD_SETRES, 0x02 }, /* d */ | ||
53 | { PSMOUSE_CMD_SETRES, 0x03 }, /* e */ | ||
54 | { PSMOUSE_CMD_SETSCALE11, 0x00 }, /* f */ | ||
55 | }; | ||
56 | |||
57 | static const struct alps_nibble_commands alps_v4_nibble_commands[] = { | ||
58 | { PSMOUSE_CMD_ENABLE, 0x00 }, /* 0 */ | ||
59 | { PSMOUSE_CMD_RESET_DIS, 0x00 }, /* 1 */ | ||
60 | { PSMOUSE_CMD_SETSCALE21, 0x00 }, /* 2 */ | ||
61 | { PSMOUSE_CMD_SETRATE, 0x0a }, /* 3 */ | ||
62 | { PSMOUSE_CMD_SETRATE, 0x14 }, /* 4 */ | ||
63 | { PSMOUSE_CMD_SETRATE, 0x28 }, /* 5 */ | ||
64 | { PSMOUSE_CMD_SETRATE, 0x3c }, /* 6 */ | ||
65 | { PSMOUSE_CMD_SETRATE, 0x50 }, /* 7 */ | ||
66 | { PSMOUSE_CMD_SETRATE, 0x64 }, /* 8 */ | ||
67 | { PSMOUSE_CMD_SETRATE, 0xc8 }, /* 9 */ | ||
68 | { ALPS_CMD_NIBBLE_10, 0x00 }, /* a */ | ||
69 | { PSMOUSE_CMD_SETRES, 0x00 }, /* b */ | ||
70 | { PSMOUSE_CMD_SETRES, 0x01 }, /* c */ | ||
71 | { PSMOUSE_CMD_SETRES, 0x02 }, /* d */ | ||
72 | { PSMOUSE_CMD_SETRES, 0x03 }, /* e */ | ||
73 | { PSMOUSE_CMD_SETSCALE11, 0x00 }, /* f */ | ||
74 | }; | ||
75 | |||
76 | |||
27 | #define ALPS_DUALPOINT 0x02 /* touchpad has trackstick */ | 77 | #define ALPS_DUALPOINT 0x02 /* touchpad has trackstick */ |
28 | #define ALPS_PASS 0x04 /* device has a pass-through port */ | 78 | #define ALPS_PASS 0x04 /* device has a pass-through port */ |
29 | 79 | ||
@@ -35,30 +85,33 @@ | |||
35 | 6-byte ALPS packet */ | 85 | 6-byte ALPS packet */ |
36 | 86 | ||
37 | static const struct alps_model_info alps_model_data[] = { | 87 | static const struct alps_model_info alps_model_data[] = { |
38 | { { 0x32, 0x02, 0x14 }, 0xf8, 0xf8, ALPS_PASS | ALPS_DUALPOINT }, /* Toshiba Salellite Pro M10 */ | 88 | { { 0x32, 0x02, 0x14 }, 0x00, ALPS_PROTO_V2, 0xf8, 0xf8, ALPS_PASS | ALPS_DUALPOINT }, /* Toshiba Salellite Pro M10 */ |
39 | { { 0x33, 0x02, 0x0a }, 0x88, 0xf8, ALPS_OLDPROTO }, /* UMAX-530T */ | 89 | { { 0x33, 0x02, 0x0a }, 0x00, ALPS_PROTO_V1, 0x88, 0xf8, 0 }, /* UMAX-530T */ |
40 | { { 0x53, 0x02, 0x0a }, 0xf8, 0xf8, 0 }, | 90 | { { 0x53, 0x02, 0x0a }, 0x00, ALPS_PROTO_V2, 0xf8, 0xf8, 0 }, |
41 | { { 0x53, 0x02, 0x14 }, 0xf8, 0xf8, 0 }, | 91 | { { 0x53, 0x02, 0x14 }, 0x00, ALPS_PROTO_V2, 0xf8, 0xf8, 0 }, |
42 | { { 0x60, 0x03, 0xc8 }, 0xf8, 0xf8, 0 }, /* HP ze1115 */ | 92 | { { 0x60, 0x03, 0xc8 }, 0x00, ALPS_PROTO_V2, 0xf8, 0xf8, 0 }, /* HP ze1115 */ |
43 | { { 0x63, 0x02, 0x0a }, 0xf8, 0xf8, 0 }, | 93 | { { 0x63, 0x02, 0x0a }, 0x00, ALPS_PROTO_V2, 0xf8, 0xf8, 0 }, |
44 | { { 0x63, 0x02, 0x14 }, 0xf8, 0xf8, 0 }, | 94 | { { 0x63, 0x02, 0x14 }, 0x00, ALPS_PROTO_V2, 0xf8, 0xf8, 0 }, |
45 | { { 0x63, 0x02, 0x28 }, 0xf8, 0xf8, ALPS_FW_BK_2 }, /* Fujitsu Siemens S6010 */ | 95 | { { 0x63, 0x02, 0x28 }, 0x00, ALPS_PROTO_V2, 0xf8, 0xf8, ALPS_FW_BK_2 }, /* Fujitsu Siemens S6010 */ |
46 | { { 0x63, 0x02, 0x3c }, 0x8f, 0x8f, ALPS_WHEEL }, /* Toshiba Satellite S2400-103 */ | 96 | { { 0x63, 0x02, 0x3c }, 0x00, ALPS_PROTO_V2, 0x8f, 0x8f, ALPS_WHEEL }, /* Toshiba Satellite S2400-103 */ |
47 | { { 0x63, 0x02, 0x50 }, 0xef, 0xef, ALPS_FW_BK_1 }, /* NEC Versa L320 */ | 97 | { { 0x63, 0x02, 0x50 }, 0x00, ALPS_PROTO_V2, 0xef, 0xef, ALPS_FW_BK_1 }, /* NEC Versa L320 */ |
48 | { { 0x63, 0x02, 0x64 }, 0xf8, 0xf8, 0 }, | 98 | { { 0x63, 0x02, 0x64 }, 0x00, ALPS_PROTO_V2, 0xf8, 0xf8, 0 }, |
49 | { { 0x63, 0x03, 0xc8 }, 0xf8, 0xf8, ALPS_PASS | ALPS_DUALPOINT }, /* Dell Latitude D800 */ | 99 | { { 0x63, 0x03, 0xc8 }, 0x00, ALPS_PROTO_V2, 0xf8, 0xf8, ALPS_PASS | ALPS_DUALPOINT }, /* Dell Latitude D800 */ |
50 | { { 0x73, 0x00, 0x0a }, 0xf8, 0xf8, ALPS_DUALPOINT }, /* ThinkPad R61 8918-5QG */ | 100 | { { 0x73, 0x00, 0x0a }, 0x00, ALPS_PROTO_V2, 0xf8, 0xf8, ALPS_DUALPOINT }, /* ThinkPad R61 8918-5QG */ |
51 | { { 0x73, 0x02, 0x0a }, 0xf8, 0xf8, 0 }, | 101 | { { 0x73, 0x02, 0x0a }, 0x00, ALPS_PROTO_V2, 0xf8, 0xf8, 0 }, |
52 | { { 0x73, 0x02, 0x14 }, 0xf8, 0xf8, ALPS_FW_BK_2 }, /* Ahtec Laptop */ | 102 | { { 0x73, 0x02, 0x14 }, 0x00, ALPS_PROTO_V2, 0xf8, 0xf8, ALPS_FW_BK_2 }, /* Ahtec Laptop */ |
53 | { { 0x20, 0x02, 0x0e }, 0xf8, 0xf8, ALPS_PASS | ALPS_DUALPOINT }, /* XXX */ | 103 | { { 0x20, 0x02, 0x0e }, 0x00, ALPS_PROTO_V2, 0xf8, 0xf8, ALPS_PASS | ALPS_DUALPOINT }, /* XXX */ |
54 | { { 0x22, 0x02, 0x0a }, 0xf8, 0xf8, ALPS_PASS | ALPS_DUALPOINT }, | 104 | { { 0x22, 0x02, 0x0a }, 0x00, ALPS_PROTO_V2, 0xf8, 0xf8, ALPS_PASS | ALPS_DUALPOINT }, |
55 | { { 0x22, 0x02, 0x14 }, 0xff, 0xff, ALPS_PASS | ALPS_DUALPOINT }, /* Dell Latitude D600 */ | 105 | { { 0x22, 0x02, 0x14 }, 0x00, ALPS_PROTO_V2, 0xff, 0xff, ALPS_PASS | ALPS_DUALPOINT }, /* Dell Latitude D600 */ |
56 | /* Dell Latitude E5500, E6400, E6500, Precision M4400 */ | 106 | /* Dell Latitude E5500, E6400, E6500, Precision M4400 */ |
57 | { { 0x62, 0x02, 0x14 }, 0xcf, 0xcf, | 107 | { { 0x62, 0x02, 0x14 }, 0x00, ALPS_PROTO_V2, 0xcf, 0xcf, |
58 | ALPS_PASS | ALPS_DUALPOINT | ALPS_PS2_INTERLEAVED }, | 108 | ALPS_PASS | ALPS_DUALPOINT | ALPS_PS2_INTERLEAVED }, |
59 | { { 0x73, 0x02, 0x50 }, 0xcf, 0xcf, ALPS_FOUR_BUTTONS }, /* Dell Vostro 1400 */ | 109 | { { 0x73, 0x02, 0x50 }, 0x00, ALPS_PROTO_V2, 0xcf, 0xcf, ALPS_FOUR_BUTTONS }, /* Dell Vostro 1400 */ |
60 | { { 0x52, 0x01, 0x14 }, 0xff, 0xff, | 110 | { { 0x52, 0x01, 0x14 }, 0x00, ALPS_PROTO_V2, 0xff, 0xff, |
61 | ALPS_PASS | ALPS_DUALPOINT | ALPS_PS2_INTERLEAVED }, /* Toshiba Tecra A11-11L */ | 111 | ALPS_PASS | ALPS_DUALPOINT | ALPS_PS2_INTERLEAVED }, /* Toshiba Tecra A11-11L */ |
112 | { { 0x73, 0x02, 0x64 }, 0x9b, ALPS_PROTO_V3, 0x8f, 0x8f, ALPS_DUALPOINT }, | ||
113 | { { 0x73, 0x02, 0x64 }, 0x9d, ALPS_PROTO_V3, 0x8f, 0x8f, ALPS_DUALPOINT }, | ||
114 | { { 0x73, 0x02, 0x64 }, 0x8a, ALPS_PROTO_V4, 0x8f, 0x8f, 0 }, | ||
62 | }; | 115 | }; |
63 | 116 | ||
64 | /* | 117 | /* |
@@ -67,42 +120,7 @@ static const struct alps_model_info alps_model_data[] = { | |||
67 | * isn't valid per PS/2 spec. | 120 | * isn't valid per PS/2 spec. |
68 | */ | 121 | */ |
69 | 122 | ||
70 | /* | 123 | /* Packet formats are described in Documentation/input/alps.txt */ |
71 | * PS/2 packet format | ||
72 | * | ||
73 | * byte 0: 0 0 YSGN XSGN 1 M R L | ||
74 | * byte 1: X7 X6 X5 X4 X3 X2 X1 X0 | ||
75 | * byte 2: Y7 Y6 Y5 Y4 Y3 Y2 Y1 Y0 | ||
76 | * | ||
77 | * Note that the device never signals overflow condition. | ||
78 | * | ||
79 | * ALPS absolute Mode - new format | ||
80 | * | ||
81 | * byte 0: 1 ? ? ? 1 ? ? ? | ||
82 | * byte 1: 0 x6 x5 x4 x3 x2 x1 x0 | ||
83 | * byte 2: 0 x10 x9 x8 x7 ? fin ges | ||
84 | * byte 3: 0 y9 y8 y7 1 M R L | ||
85 | * byte 4: 0 y6 y5 y4 y3 y2 y1 y0 | ||
86 | * byte 5: 0 z6 z5 z4 z3 z2 z1 z0 | ||
87 | * | ||
88 | * Dualpoint device -- interleaved packet format | ||
89 | * | ||
90 | * byte 0: 1 1 0 0 1 1 1 1 | ||
91 | * byte 1: 0 x6 x5 x4 x3 x2 x1 x0 | ||
92 | * byte 2: 0 x10 x9 x8 x7 0 fin ges | ||
93 | * byte 3: 0 0 YSGN XSGN 1 1 1 1 | ||
94 | * byte 4: X7 X6 X5 X4 X3 X2 X1 X0 | ||
95 | * byte 5: Y7 Y6 Y5 Y4 Y3 Y2 Y1 Y0 | ||
96 | * byte 6: 0 y9 y8 y7 1 m r l | ||
97 | * byte 7: 0 y6 y5 y4 y3 y2 y1 y0 | ||
98 | * byte 8: 0 z6 z5 z4 z3 z2 z1 z0 | ||
99 | * | ||
100 | * CAPITALS = stick, miniscules = touchpad | ||
101 | * | ||
102 | * ?'s can have different meanings on different models, | ||
103 | * such as wheel rotation, extra buttons, stick buttons | ||
104 | * on a dualpoint, etc. | ||
105 | */ | ||
106 | 124 | ||
107 | static bool alps_is_valid_first_byte(const struct alps_model_info *model, | 125 | static bool alps_is_valid_first_byte(const struct alps_model_info *model, |
108 | unsigned char data) | 126 | unsigned char data) |
@@ -137,7 +155,7 @@ static void alps_report_buttons(struct psmouse *psmouse, | |||
137 | input_sync(dev2); | 155 | input_sync(dev2); |
138 | } | 156 | } |
139 | 157 | ||
140 | static void alps_process_packet(struct psmouse *psmouse) | 158 | static void alps_process_packet_v1_v2(struct psmouse *psmouse) |
141 | { | 159 | { |
142 | struct alps_data *priv = psmouse->private; | 160 | struct alps_data *priv = psmouse->private; |
143 | const struct alps_model_info *model = priv->i; | 161 | const struct alps_model_info *model = priv->i; |
@@ -147,7 +165,7 @@ static void alps_process_packet(struct psmouse *psmouse) | |||
147 | int x, y, z, ges, fin, left, right, middle; | 165 | int x, y, z, ges, fin, left, right, middle; |
148 | int back = 0, forward = 0; | 166 | int back = 0, forward = 0; |
149 | 167 | ||
150 | if (model->flags & ALPS_OLDPROTO) { | 168 | if (model->proto_version == ALPS_PROTO_V1) { |
151 | left = packet[2] & 0x10; | 169 | left = packet[2] & 0x10; |
152 | right = packet[2] & 0x08; | 170 | right = packet[2] & 0x08; |
153 | middle = 0; | 171 | middle = 0; |
@@ -239,6 +257,403 @@ static void alps_process_packet(struct psmouse *psmouse) | |||
239 | input_sync(dev); | 257 | input_sync(dev); |
240 | } | 258 | } |
241 | 259 | ||
260 | /* | ||
261 | * Process bitmap data from v3 and v4 protocols. Returns the number of | ||
262 | * fingers detected. A return value of 0 means at least one of the | ||
263 | * bitmaps was empty. | ||
264 | * | ||
265 | * The bitmaps don't have enough data to track fingers, so this function | ||
266 | * only generates points representing a bounding box of all contacts. | ||
267 | * These points are returned in x1, y1, x2, and y2 when the return value | ||
268 | * is greater than 0. | ||
269 | */ | ||
270 | static int alps_process_bitmap(unsigned int x_map, unsigned int y_map, | ||
271 | int *x1, int *y1, int *x2, int *y2) | ||
272 | { | ||
273 | struct alps_bitmap_point { | ||
274 | int start_bit; | ||
275 | int num_bits; | ||
276 | }; | ||
277 | |||
278 | int fingers_x = 0, fingers_y = 0, fingers; | ||
279 | int i, bit, prev_bit; | ||
280 | struct alps_bitmap_point x_low = {0,}, x_high = {0,}; | ||
281 | struct alps_bitmap_point y_low = {0,}, y_high = {0,}; | ||
282 | struct alps_bitmap_point *point; | ||
283 | |||
284 | if (!x_map || !y_map) | ||
285 | return 0; | ||
286 | |||
287 | *x1 = *y1 = *x2 = *y2 = 0; | ||
288 | |||
289 | prev_bit = 0; | ||
290 | point = &x_low; | ||
291 | for (i = 0; x_map != 0; i++, x_map >>= 1) { | ||
292 | bit = x_map & 1; | ||
293 | if (bit) { | ||
294 | if (!prev_bit) { | ||
295 | point->start_bit = i; | ||
296 | fingers_x++; | ||
297 | } | ||
298 | point->num_bits++; | ||
299 | } else { | ||
300 | if (prev_bit) | ||
301 | point = &x_high; | ||
302 | else | ||
303 | point->num_bits = 0; | ||
304 | } | ||
305 | prev_bit = bit; | ||
306 | } | ||
307 | |||
308 | /* | ||
309 | * y bitmap is reversed for what we need (lower positions are in | ||
310 | * higher bits), so we process from the top end. | ||
311 | */ | ||
312 | y_map = y_map << (sizeof(y_map) * BITS_PER_BYTE - ALPS_BITMAP_Y_BITS); | ||
313 | prev_bit = 0; | ||
314 | point = &y_low; | ||
315 | for (i = 0; y_map != 0; i++, y_map <<= 1) { | ||
316 | bit = y_map & (1 << (sizeof(y_map) * BITS_PER_BYTE - 1)); | ||
317 | if (bit) { | ||
318 | if (!prev_bit) { | ||
319 | point->start_bit = i; | ||
320 | fingers_y++; | ||
321 | } | ||
322 | point->num_bits++; | ||
323 | } else { | ||
324 | if (prev_bit) | ||
325 | point = &y_high; | ||
326 | else | ||
327 | point->num_bits = 0; | ||
328 | } | ||
329 | prev_bit = bit; | ||
330 | } | ||
331 | |||
332 | /* | ||
333 | * Fingers can overlap, so we use the maximum count of fingers | ||
334 | * on either axis as the finger count. | ||
335 | */ | ||
336 | fingers = max(fingers_x, fingers_y); | ||
337 | |||
338 | /* | ||
339 | * If total fingers is > 1 but either axis reports only a single | ||
340 | * contact, we have overlapping or adjacent fingers. For the | ||
341 | * purposes of creating a bounding box, divide the single contact | ||
342 | * (roughly) equally between the two points. | ||
343 | */ | ||
344 | if (fingers > 1) { | ||
345 | if (fingers_x == 1) { | ||
346 | i = x_low.num_bits / 2; | ||
347 | x_low.num_bits = x_low.num_bits - i; | ||
348 | x_high.start_bit = x_low.start_bit + i; | ||
349 | x_high.num_bits = max(i, 1); | ||
350 | } else if (fingers_y == 1) { | ||
351 | i = y_low.num_bits / 2; | ||
352 | y_low.num_bits = y_low.num_bits - i; | ||
353 | y_high.start_bit = y_low.start_bit + i; | ||
354 | y_high.num_bits = max(i, 1); | ||
355 | } | ||
356 | } | ||
357 | |||
358 | *x1 = (ALPS_V3_X_MAX * (2 * x_low.start_bit + x_low.num_bits - 1)) / | ||
359 | (2 * (ALPS_BITMAP_X_BITS - 1)); | ||
360 | *y1 = (ALPS_V3_Y_MAX * (2 * y_low.start_bit + y_low.num_bits - 1)) / | ||
361 | (2 * (ALPS_BITMAP_Y_BITS - 1)); | ||
362 | |||
363 | if (fingers > 1) { | ||
364 | *x2 = (ALPS_V3_X_MAX * (2 * x_high.start_bit + x_high.num_bits - 1)) / | ||
365 | (2 * (ALPS_BITMAP_X_BITS - 1)); | ||
366 | *y2 = (ALPS_V3_Y_MAX * (2 * y_high.start_bit + y_high.num_bits - 1)) / | ||
367 | (2 * (ALPS_BITMAP_Y_BITS - 1)); | ||
368 | } | ||
369 | |||
370 | return fingers; | ||
371 | } | ||
372 | |||
373 | static void alps_set_slot(struct input_dev *dev, int slot, bool active, | ||
374 | int x, int y) | ||
375 | { | ||
376 | input_mt_slot(dev, slot); | ||
377 | input_mt_report_slot_state(dev, MT_TOOL_FINGER, active); | ||
378 | if (active) { | ||
379 | input_report_abs(dev, ABS_MT_POSITION_X, x); | ||
380 | input_report_abs(dev, ABS_MT_POSITION_Y, y); | ||
381 | } | ||
382 | } | ||
383 | |||
384 | static void alps_report_semi_mt_data(struct input_dev *dev, int num_fingers, | ||
385 | int x1, int y1, int x2, int y2) | ||
386 | { | ||
387 | alps_set_slot(dev, 0, num_fingers != 0, x1, y1); | ||
388 | alps_set_slot(dev, 1, num_fingers == 2, x2, y2); | ||
389 | } | ||
390 | |||
391 | static void alps_process_trackstick_packet_v3(struct psmouse *psmouse) | ||
392 | { | ||
393 | struct alps_data *priv = psmouse->private; | ||
394 | unsigned char *packet = psmouse->packet; | ||
395 | struct input_dev *dev = priv->dev2; | ||
396 | int x, y, z, left, right, middle; | ||
397 | |||
398 | /* Sanity check packet */ | ||
399 | if (!(packet[0] & 0x40)) { | ||
400 | psmouse_dbg(psmouse, "Bad trackstick packet, discarding\n"); | ||
401 | return; | ||
402 | } | ||
403 | |||
404 | /* | ||
405 | * There's a special packet that seems to indicate the end | ||
406 | * of a stream of trackstick data. Filter these out. | ||
407 | */ | ||
408 | if (packet[1] == 0x7f && packet[2] == 0x7f && packet[4] == 0x7f) | ||
409 | return; | ||
410 | |||
411 | x = (s8)(((packet[0] & 0x20) << 2) | (packet[1] & 0x7f)); | ||
412 | y = (s8)(((packet[0] & 0x10) << 3) | (packet[2] & 0x7f)); | ||
413 | z = (packet[4] & 0x7c) >> 2; | ||
414 | |||
415 | /* | ||
416 | * The x and y values tend to be quite large, and when used | ||
417 | * alone the trackstick is difficult to use. Scale them down | ||
418 | * to compensate. | ||
419 | */ | ||
420 | x /= 8; | ||
421 | y /= 8; | ||
422 | |||
423 | input_report_rel(dev, REL_X, x); | ||
424 | input_report_rel(dev, REL_Y, -y); | ||
425 | |||
426 | /* | ||
427 | * Most ALPS models report the trackstick buttons in the touchpad | ||
428 | * packets, but a few report them here. No reliable way has been | ||
429 | * found to differentiate between the models upfront, so we enable | ||
430 | * the quirk in response to seeing a button press in the trackstick | ||
431 | * packet. | ||
432 | */ | ||
433 | left = packet[3] & 0x01; | ||
434 | right = packet[3] & 0x02; | ||
435 | middle = packet[3] & 0x04; | ||
436 | |||
437 | if (!(priv->quirks & ALPS_QUIRK_TRACKSTICK_BUTTONS) && | ||
438 | (left || right || middle)) | ||
439 | priv->quirks |= ALPS_QUIRK_TRACKSTICK_BUTTONS; | ||
440 | |||
441 | if (priv->quirks & ALPS_QUIRK_TRACKSTICK_BUTTONS) { | ||
442 | input_report_key(dev, BTN_LEFT, left); | ||
443 | input_report_key(dev, BTN_RIGHT, right); | ||
444 | input_report_key(dev, BTN_MIDDLE, middle); | ||
445 | } | ||
446 | |||
447 | input_sync(dev); | ||
448 | return; | ||
449 | } | ||
450 | |||
451 | static void alps_process_touchpad_packet_v3(struct psmouse *psmouse) | ||
452 | { | ||
453 | struct alps_data *priv = psmouse->private; | ||
454 | unsigned char *packet = psmouse->packet; | ||
455 | struct input_dev *dev = psmouse->dev; | ||
456 | struct input_dev *dev2 = priv->dev2; | ||
457 | int x, y, z; | ||
458 | int left, right, middle; | ||
459 | int x1 = 0, y1 = 0, x2 = 0, y2 = 0; | ||
460 | int fingers = 0, bmap_fingers; | ||
461 | unsigned int x_bitmap, y_bitmap; | ||
462 | |||
463 | /* | ||
464 | * There's no single feature of touchpad position and bitmap packets | ||
465 | * that can be used to distinguish between them. We rely on the fact | ||
466 | * that a bitmap packet should always follow a position packet with | ||
467 | * bit 6 of packet[4] set. | ||
468 | */ | ||
469 | if (priv->multi_packet) { | ||
470 | /* | ||
471 | * Sometimes a position packet will indicate a multi-packet | ||
472 | * sequence, but then what follows is another position | ||
473 | * packet. Check for this, and when it happens process the | ||
474 | * position packet as usual. | ||
475 | */ | ||
476 | if (packet[0] & 0x40) { | ||
477 | fingers = (packet[5] & 0x3) + 1; | ||
478 | x_bitmap = ((packet[4] & 0x7e) << 8) | | ||
479 | ((packet[1] & 0x7f) << 2) | | ||
480 | ((packet[0] & 0x30) >> 4); | ||
481 | y_bitmap = ((packet[3] & 0x70) << 4) | | ||
482 | ((packet[2] & 0x7f) << 1) | | ||
483 | (packet[4] & 0x01); | ||
484 | |||
485 | bmap_fingers = alps_process_bitmap(x_bitmap, y_bitmap, | ||
486 | &x1, &y1, &x2, &y2); | ||
487 | |||
488 | /* | ||
489 | * We shouldn't report more than one finger if | ||
490 | * we don't have two coordinates. | ||
491 | */ | ||
492 | if (fingers > 1 && bmap_fingers < 2) | ||
493 | fingers = bmap_fingers; | ||
494 | |||
495 | /* Now process position packet */ | ||
496 | packet = priv->multi_data; | ||
497 | } else { | ||
498 | priv->multi_packet = 0; | ||
499 | } | ||
500 | } | ||
501 | |||
502 | /* | ||
503 | * Bit 6 of byte 0 is not usually set in position packets. The only | ||
504 | * times it seems to be set is in situations where the data is | ||
505 | * suspect anyway, e.g. a palm resting flat on the touchpad. Given | ||
506 | * this combined with the fact that this bit is useful for filtering | ||
507 | * out misidentified bitmap packets, we reject anything with this | ||
508 | * bit set. | ||
509 | */ | ||
510 | if (packet[0] & 0x40) | ||
511 | return; | ||
512 | |||
513 | if (!priv->multi_packet && (packet[4] & 0x40)) { | ||
514 | priv->multi_packet = 1; | ||
515 | memcpy(priv->multi_data, packet, sizeof(priv->multi_data)); | ||
516 | return; | ||
517 | } | ||
518 | |||
519 | priv->multi_packet = 0; | ||
520 | |||
521 | left = packet[3] & 0x01; | ||
522 | right = packet[3] & 0x02; | ||
523 | middle = packet[3] & 0x04; | ||
524 | |||
525 | x = ((packet[1] & 0x7f) << 4) | ((packet[4] & 0x30) >> 2) | | ||
526 | ((packet[0] & 0x30) >> 4); | ||
527 | y = ((packet[2] & 0x7f) << 4) | (packet[4] & 0x0f); | ||
528 | z = packet[5] & 0x7f; | ||
529 | |||
530 | /* | ||
531 | * Sometimes the hardware sends a single packet with z = 0 | ||
532 | * in the middle of a stream. Real releases generate packets | ||
533 | * with x, y, and z all zero, so these seem to be flukes. | ||
534 | * Ignore them. | ||
535 | */ | ||
536 | if (x && y && !z) | ||
537 | return; | ||
538 | |||
539 | /* | ||
540 | * If we don't have MT data or the bitmaps were empty, we have | ||
541 | * to rely on ST data. | ||
542 | */ | ||
543 | if (!fingers) { | ||
544 | x1 = x; | ||
545 | y1 = y; | ||
546 | fingers = z > 0 ? 1 : 0; | ||
547 | } | ||
548 | |||
549 | if (z >= 64) | ||
550 | input_report_key(dev, BTN_TOUCH, 1); | ||
551 | else | ||
552 | input_report_key(dev, BTN_TOUCH, 0); | ||
553 | |||
554 | alps_report_semi_mt_data(dev, fingers, x1, y1, x2, y2); | ||
555 | |||
556 | input_report_key(dev, BTN_TOOL_FINGER, fingers == 1); | ||
557 | input_report_key(dev, BTN_TOOL_DOUBLETAP, fingers == 2); | ||
558 | input_report_key(dev, BTN_TOOL_TRIPLETAP, fingers == 3); | ||
559 | input_report_key(dev, BTN_TOOL_QUADTAP, fingers == 4); | ||
560 | |||
561 | input_report_key(dev, BTN_LEFT, left); | ||
562 | input_report_key(dev, BTN_RIGHT, right); | ||
563 | input_report_key(dev, BTN_MIDDLE, middle); | ||
564 | |||
565 | if (z > 0) { | ||
566 | input_report_abs(dev, ABS_X, x); | ||
567 | input_report_abs(dev, ABS_Y, y); | ||
568 | } | ||
569 | input_report_abs(dev, ABS_PRESSURE, z); | ||
570 | |||
571 | input_sync(dev); | ||
572 | |||
573 | if (!(priv->quirks & ALPS_QUIRK_TRACKSTICK_BUTTONS)) { | ||
574 | left = packet[3] & 0x10; | ||
575 | right = packet[3] & 0x20; | ||
576 | middle = packet[3] & 0x40; | ||
577 | |||
578 | input_report_key(dev2, BTN_LEFT, left); | ||
579 | input_report_key(dev2, BTN_RIGHT, right); | ||
580 | input_report_key(dev2, BTN_MIDDLE, middle); | ||
581 | input_sync(dev2); | ||
582 | } | ||
583 | } | ||
584 | |||
585 | static void alps_process_packet_v3(struct psmouse *psmouse) | ||
586 | { | ||
587 | unsigned char *packet = psmouse->packet; | ||
588 | |||
589 | /* | ||
590 | * v3 protocol packets come in three types, two representing | ||
591 | * touchpad data and one representing trackstick data. | ||
592 | * Trackstick packets seem to be distinguished by always | ||
593 | * having 0x3f in the last byte. This value has never been | ||
594 | * observed in the last byte of either of the other types | ||
595 | * of packets. | ||
596 | */ | ||
597 | if (packet[5] == 0x3f) { | ||
598 | alps_process_trackstick_packet_v3(psmouse); | ||
599 | return; | ||
600 | } | ||
601 | |||
602 | alps_process_touchpad_packet_v3(psmouse); | ||
603 | } | ||
604 | |||
605 | static void alps_process_packet_v4(struct psmouse *psmouse) | ||
606 | { | ||
607 | unsigned char *packet = psmouse->packet; | ||
608 | struct input_dev *dev = psmouse->dev; | ||
609 | int x, y, z; | ||
610 | int left, right; | ||
611 | |||
612 | left = packet[4] & 0x01; | ||
613 | right = packet[4] & 0x02; | ||
614 | |||
615 | x = ((packet[1] & 0x7f) << 4) | ((packet[3] & 0x30) >> 2) | | ||
616 | ((packet[0] & 0x30) >> 4); | ||
617 | y = ((packet[2] & 0x7f) << 4) | (packet[3] & 0x0f); | ||
618 | z = packet[5] & 0x7f; | ||
619 | |||
620 | if (z >= 64) | ||
621 | input_report_key(dev, BTN_TOUCH, 1); | ||
622 | else | ||
623 | input_report_key(dev, BTN_TOUCH, 0); | ||
624 | |||
625 | if (z > 0) { | ||
626 | input_report_abs(dev, ABS_X, x); | ||
627 | input_report_abs(dev, ABS_Y, y); | ||
628 | } | ||
629 | input_report_abs(dev, ABS_PRESSURE, z); | ||
630 | |||
631 | input_report_key(dev, BTN_TOOL_FINGER, z > 0); | ||
632 | input_report_key(dev, BTN_LEFT, left); | ||
633 | input_report_key(dev, BTN_RIGHT, right); | ||
634 | |||
635 | input_sync(dev); | ||
636 | } | ||
637 | |||
638 | static void alps_process_packet(struct psmouse *psmouse) | ||
639 | { | ||
640 | struct alps_data *priv = psmouse->private; | ||
641 | const struct alps_model_info *model = priv->i; | ||
642 | |||
643 | switch (model->proto_version) { | ||
644 | case ALPS_PROTO_V1: | ||
645 | case ALPS_PROTO_V2: | ||
646 | alps_process_packet_v1_v2(psmouse); | ||
647 | break; | ||
648 | case ALPS_PROTO_V3: | ||
649 | alps_process_packet_v3(psmouse); | ||
650 | break; | ||
651 | case ALPS_PROTO_V4: | ||
652 | alps_process_packet_v4(psmouse); | ||
653 | break; | ||
654 | } | ||
655 | } | ||
656 | |||
242 | static void alps_report_bare_ps2_packet(struct psmouse *psmouse, | 657 | static void alps_report_bare_ps2_packet(struct psmouse *psmouse, |
243 | unsigned char packet[], | 658 | unsigned char packet[], |
244 | bool report_buttons) | 659 | bool report_buttons) |
@@ -344,7 +759,7 @@ static void alps_flush_packet(unsigned long data) | |||
344 | 759 | ||
345 | serio_pause_rx(psmouse->ps2dev.serio); | 760 | serio_pause_rx(psmouse->ps2dev.serio); |
346 | 761 | ||
347 | if (psmouse->pktcnt == 6) { | 762 | if (psmouse->pktcnt == psmouse->pktsize) { |
348 | 763 | ||
349 | /* | 764 | /* |
350 | * We did not any more data in reasonable amount of time. | 765 | * We did not any more data in reasonable amount of time. |
@@ -395,8 +810,8 @@ static psmouse_ret_t alps_process_byte(struct psmouse *psmouse) | |||
395 | return PSMOUSE_BAD_DATA; | 810 | return PSMOUSE_BAD_DATA; |
396 | } | 811 | } |
397 | 812 | ||
398 | /* Bytes 2 - 6 should have 0 in the highest bit */ | 813 | /* Bytes 2 - pktsize should have 0 in the highest bit */ |
399 | if (psmouse->pktcnt >= 2 && psmouse->pktcnt <= 6 && | 814 | if (psmouse->pktcnt >= 2 && psmouse->pktcnt <= psmouse->pktsize && |
400 | (psmouse->packet[psmouse->pktcnt - 1] & 0x80)) { | 815 | (psmouse->packet[psmouse->pktcnt - 1] & 0x80)) { |
401 | psmouse_dbg(psmouse, "refusing packet[%i] = %x\n", | 816 | psmouse_dbg(psmouse, "refusing packet[%i] = %x\n", |
402 | psmouse->pktcnt - 1, | 817 | psmouse->pktcnt - 1, |
@@ -404,7 +819,7 @@ static psmouse_ret_t alps_process_byte(struct psmouse *psmouse) | |||
404 | return PSMOUSE_BAD_DATA; | 819 | return PSMOUSE_BAD_DATA; |
405 | } | 820 | } |
406 | 821 | ||
407 | if (psmouse->pktcnt == 6) { | 822 | if (psmouse->pktcnt == psmouse->pktsize) { |
408 | alps_process_packet(psmouse); | 823 | alps_process_packet(psmouse); |
409 | return PSMOUSE_FULL_PACKET; | 824 | return PSMOUSE_FULL_PACKET; |
410 | } | 825 | } |
@@ -412,11 +827,127 @@ static psmouse_ret_t alps_process_byte(struct psmouse *psmouse) | |||
412 | return PSMOUSE_GOOD_DATA; | 827 | return PSMOUSE_GOOD_DATA; |
413 | } | 828 | } |
414 | 829 | ||
830 | static int alps_command_mode_send_nibble(struct psmouse *psmouse, int nibble) | ||
831 | { | ||
832 | struct ps2dev *ps2dev = &psmouse->ps2dev; | ||
833 | struct alps_data *priv = psmouse->private; | ||
834 | int command; | ||
835 | unsigned char *param; | ||
836 | unsigned char dummy[4]; | ||
837 | |||
838 | BUG_ON(nibble > 0xf); | ||
839 | |||
840 | command = priv->nibble_commands[nibble].command; | ||
841 | param = (command & 0x0f00) ? | ||
842 | dummy : (unsigned char *)&priv->nibble_commands[nibble].data; | ||
843 | |||
844 | if (ps2_command(ps2dev, param, command)) | ||
845 | return -1; | ||
846 | |||
847 | return 0; | ||
848 | } | ||
849 | |||
850 | static int alps_command_mode_set_addr(struct psmouse *psmouse, int addr) | ||
851 | { | ||
852 | struct ps2dev *ps2dev = &psmouse->ps2dev; | ||
853 | struct alps_data *priv = psmouse->private; | ||
854 | int i, nibble; | ||
855 | |||
856 | if (ps2_command(ps2dev, NULL, priv->addr_command)) | ||
857 | return -1; | ||
858 | |||
859 | for (i = 12; i >= 0; i -= 4) { | ||
860 | nibble = (addr >> i) & 0xf; | ||
861 | if (alps_command_mode_send_nibble(psmouse, nibble)) | ||
862 | return -1; | ||
863 | } | ||
864 | |||
865 | return 0; | ||
866 | } | ||
867 | |||
868 | static int __alps_command_mode_read_reg(struct psmouse *psmouse, int addr) | ||
869 | { | ||
870 | struct ps2dev *ps2dev = &psmouse->ps2dev; | ||
871 | unsigned char param[4]; | ||
872 | |||
873 | if (ps2_command(ps2dev, param, PSMOUSE_CMD_GETINFO)) | ||
874 | return -1; | ||
875 | |||
876 | /* | ||
877 | * The address being read is returned in the first two bytes | ||
878 | * of the result. Check that this address matches the expected | ||
879 | * address. | ||
880 | */ | ||
881 | if (addr != ((param[0] << 8) | param[1])) | ||
882 | return -1; | ||
883 | |||
884 | return param[2]; | ||
885 | } | ||
886 | |||
887 | static int alps_command_mode_read_reg(struct psmouse *psmouse, int addr) | ||
888 | { | ||
889 | if (alps_command_mode_set_addr(psmouse, addr)) | ||
890 | return -1; | ||
891 | return __alps_command_mode_read_reg(psmouse, addr); | ||
892 | } | ||
893 | |||
894 | static int __alps_command_mode_write_reg(struct psmouse *psmouse, u8 value) | ||
895 | { | ||
896 | if (alps_command_mode_send_nibble(psmouse, (value >> 4) & 0xf)) | ||
897 | return -1; | ||
898 | if (alps_command_mode_send_nibble(psmouse, value & 0xf)) | ||
899 | return -1; | ||
900 | return 0; | ||
901 | } | ||
902 | |||
903 | static int alps_command_mode_write_reg(struct psmouse *psmouse, int addr, | ||
904 | u8 value) | ||
905 | { | ||
906 | if (alps_command_mode_set_addr(psmouse, addr)) | ||
907 | return -1; | ||
908 | return __alps_command_mode_write_reg(psmouse, value); | ||
909 | } | ||
910 | |||
911 | static int alps_enter_command_mode(struct psmouse *psmouse, | ||
912 | unsigned char *resp) | ||
913 | { | ||
914 | unsigned char param[4]; | ||
915 | struct ps2dev *ps2dev = &psmouse->ps2dev; | ||
916 | |||
917 | if (ps2_command(ps2dev, NULL, PSMOUSE_CMD_RESET_WRAP) || | ||
918 | ps2_command(ps2dev, NULL, PSMOUSE_CMD_RESET_WRAP) || | ||
919 | ps2_command(ps2dev, NULL, PSMOUSE_CMD_RESET_WRAP) || | ||
920 | ps2_command(ps2dev, param, PSMOUSE_CMD_GETINFO)) { | ||
921 | psmouse_err(psmouse, "failed to enter command mode\n"); | ||
922 | return -1; | ||
923 | } | ||
924 | |||
925 | if (param[0] != 0x88 && param[1] != 0x07) { | ||
926 | psmouse_dbg(psmouse, | ||
927 | "unknown response while entering command mode: %2.2x %2.2x %2.2x\n", | ||
928 | param[0], param[1], param[2]); | ||
929 | return -1; | ||
930 | } | ||
931 | |||
932 | if (resp) | ||
933 | *resp = param[2]; | ||
934 | return 0; | ||
935 | } | ||
936 | |||
937 | static inline int alps_exit_command_mode(struct psmouse *psmouse) | ||
938 | { | ||
939 | struct ps2dev *ps2dev = &psmouse->ps2dev; | ||
940 | if (ps2_command(ps2dev, NULL, PSMOUSE_CMD_SETSTREAM)) | ||
941 | return -1; | ||
942 | return 0; | ||
943 | } | ||
944 | |||
415 | static const struct alps_model_info *alps_get_model(struct psmouse *psmouse, int *version) | 945 | static const struct alps_model_info *alps_get_model(struct psmouse *psmouse, int *version) |
416 | { | 946 | { |
417 | struct ps2dev *ps2dev = &psmouse->ps2dev; | 947 | struct ps2dev *ps2dev = &psmouse->ps2dev; |
418 | static const unsigned char rates[] = { 0, 10, 20, 40, 60, 80, 100, 200 }; | 948 | static const unsigned char rates[] = { 0, 10, 20, 40, 60, 80, 100, 200 }; |
419 | unsigned char param[4]; | 949 | unsigned char param[4]; |
950 | const struct alps_model_info *model = NULL; | ||
420 | int i; | 951 | int i; |
421 | 952 | ||
422 | /* | 953 | /* |
@@ -464,12 +995,41 @@ static const struct alps_model_info *alps_get_model(struct psmouse *psmouse, int | |||
464 | *version = (param[0] << 8) | (param[1] << 4) | i; | 995 | *version = (param[0] << 8) | (param[1] << 4) | i; |
465 | } | 996 | } |
466 | 997 | ||
467 | for (i = 0; i < ARRAY_SIZE(alps_model_data); i++) | 998 | for (i = 0; i < ARRAY_SIZE(alps_model_data); i++) { |
468 | if (!memcmp(param, alps_model_data[i].signature, | 999 | if (!memcmp(param, alps_model_data[i].signature, |
469 | sizeof(alps_model_data[i].signature))) | 1000 | sizeof(alps_model_data[i].signature))) { |
470 | return alps_model_data + i; | 1001 | model = alps_model_data + i; |
1002 | break; | ||
1003 | } | ||
1004 | } | ||
471 | 1005 | ||
472 | return NULL; | 1006 | if (model && model->proto_version > ALPS_PROTO_V2) { |
1007 | /* | ||
1008 | * Need to check command mode response to identify | ||
1009 | * model | ||
1010 | */ | ||
1011 | model = NULL; | ||
1012 | if (alps_enter_command_mode(psmouse, param)) { | ||
1013 | psmouse_warn(psmouse, | ||
1014 | "touchpad failed to enter command mode\n"); | ||
1015 | } else { | ||
1016 | for (i = 0; i < ARRAY_SIZE(alps_model_data); i++) { | ||
1017 | if (alps_model_data[i].proto_version > ALPS_PROTO_V2 && | ||
1018 | alps_model_data[i].command_mode_resp == param[0]) { | ||
1019 | model = alps_model_data + i; | ||
1020 | break; | ||
1021 | } | ||
1022 | } | ||
1023 | alps_exit_command_mode(psmouse); | ||
1024 | |||
1025 | if (!model) | ||
1026 | psmouse_dbg(psmouse, | ||
1027 | "Unknown command mode response %2.2x\n", | ||
1028 | param[0]); | ||
1029 | } | ||
1030 | } | ||
1031 | |||
1032 | return model; | ||
473 | } | 1033 | } |
474 | 1034 | ||
475 | /* | 1035 | /* |
@@ -477,7 +1037,7 @@ static const struct alps_model_info *alps_get_model(struct psmouse *psmouse, int | |||
477 | * subsequent commands. It looks like glidepad is behind stickpointer, | 1037 | * subsequent commands. It looks like glidepad is behind stickpointer, |
478 | * I'd thought it would be other way around... | 1038 | * I'd thought it would be other way around... |
479 | */ | 1039 | */ |
480 | static int alps_passthrough_mode(struct psmouse *psmouse, bool enable) | 1040 | static int alps_passthrough_mode_v2(struct psmouse *psmouse, bool enable) |
481 | { | 1041 | { |
482 | struct ps2dev *ps2dev = &psmouse->ps2dev; | 1042 | struct ps2dev *ps2dev = &psmouse->ps2dev; |
483 | int cmd = enable ? PSMOUSE_CMD_SETSCALE21 : PSMOUSE_CMD_SETSCALE11; | 1043 | int cmd = enable ? PSMOUSE_CMD_SETSCALE21 : PSMOUSE_CMD_SETSCALE11; |
@@ -494,7 +1054,7 @@ static int alps_passthrough_mode(struct psmouse *psmouse, bool enable) | |||
494 | return 0; | 1054 | return 0; |
495 | } | 1055 | } |
496 | 1056 | ||
497 | static int alps_absolute_mode(struct psmouse *psmouse) | 1057 | static int alps_absolute_mode_v1_v2(struct psmouse *psmouse) |
498 | { | 1058 | { |
499 | struct ps2dev *ps2dev = &psmouse->ps2dev; | 1059 | struct ps2dev *ps2dev = &psmouse->ps2dev; |
500 | 1060 | ||
@@ -565,17 +1125,17 @@ static int alps_tap_mode(struct psmouse *psmouse, int enable) | |||
565 | static int alps_poll(struct psmouse *psmouse) | 1125 | static int alps_poll(struct psmouse *psmouse) |
566 | { | 1126 | { |
567 | struct alps_data *priv = psmouse->private; | 1127 | struct alps_data *priv = psmouse->private; |
568 | unsigned char buf[6]; | 1128 | unsigned char buf[sizeof(psmouse->packet)]; |
569 | bool poll_failed; | 1129 | bool poll_failed; |
570 | 1130 | ||
571 | if (priv->i->flags & ALPS_PASS) | 1131 | if (priv->i->flags & ALPS_PASS) |
572 | alps_passthrough_mode(psmouse, true); | 1132 | alps_passthrough_mode_v2(psmouse, true); |
573 | 1133 | ||
574 | poll_failed = ps2_command(&psmouse->ps2dev, buf, | 1134 | poll_failed = ps2_command(&psmouse->ps2dev, buf, |
575 | PSMOUSE_CMD_POLL | (psmouse->pktsize << 8)) < 0; | 1135 | PSMOUSE_CMD_POLL | (psmouse->pktsize << 8)) < 0; |
576 | 1136 | ||
577 | if (priv->i->flags & ALPS_PASS) | 1137 | if (priv->i->flags & ALPS_PASS) |
578 | alps_passthrough_mode(psmouse, false); | 1138 | alps_passthrough_mode_v2(psmouse, false); |
579 | 1139 | ||
580 | if (poll_failed || (buf[0] & priv->i->mask0) != priv->i->byte0) | 1140 | if (poll_failed || (buf[0] & priv->i->mask0) != priv->i->byte0) |
581 | return -1; | 1141 | return -1; |
@@ -592,13 +1152,13 @@ static int alps_poll(struct psmouse *psmouse) | |||
592 | return 0; | 1152 | return 0; |
593 | } | 1153 | } |
594 | 1154 | ||
595 | static int alps_hw_init(struct psmouse *psmouse) | 1155 | static int alps_hw_init_v1_v2(struct psmouse *psmouse) |
596 | { | 1156 | { |
597 | struct alps_data *priv = psmouse->private; | 1157 | struct alps_data *priv = psmouse->private; |
598 | const struct alps_model_info *model = priv->i; | 1158 | const struct alps_model_info *model = priv->i; |
599 | 1159 | ||
600 | if ((model->flags & ALPS_PASS) && | 1160 | if ((model->flags & ALPS_PASS) && |
601 | alps_passthrough_mode(psmouse, true)) { | 1161 | alps_passthrough_mode_v2(psmouse, true)) { |
602 | return -1; | 1162 | return -1; |
603 | } | 1163 | } |
604 | 1164 | ||
@@ -607,13 +1167,13 @@ static int alps_hw_init(struct psmouse *psmouse) | |||
607 | return -1; | 1167 | return -1; |
608 | } | 1168 | } |
609 | 1169 | ||
610 | if (alps_absolute_mode(psmouse)) { | 1170 | if (alps_absolute_mode_v1_v2(psmouse)) { |
611 | psmouse_err(psmouse, "Failed to enable absolute mode\n"); | 1171 | psmouse_err(psmouse, "Failed to enable absolute mode\n"); |
612 | return -1; | 1172 | return -1; |
613 | } | 1173 | } |
614 | 1174 | ||
615 | if ((model->flags & ALPS_PASS) && | 1175 | if ((model->flags & ALPS_PASS) && |
616 | alps_passthrough_mode(psmouse, false)) { | 1176 | alps_passthrough_mode_v2(psmouse, false)) { |
617 | return -1; | 1177 | return -1; |
618 | } | 1178 | } |
619 | 1179 | ||
@@ -626,6 +1186,297 @@ static int alps_hw_init(struct psmouse *psmouse) | |||
626 | return 0; | 1186 | return 0; |
627 | } | 1187 | } |
628 | 1188 | ||
1189 | /* | ||
1190 | * Enable or disable passthrough mode to the trackstick. Must be in | ||
1191 | * command mode when calling this function. | ||
1192 | */ | ||
1193 | static int alps_passthrough_mode_v3(struct psmouse *psmouse, bool enable) | ||
1194 | { | ||
1195 | int reg_val; | ||
1196 | |||
1197 | reg_val = alps_command_mode_read_reg(psmouse, 0x0008); | ||
1198 | if (reg_val == -1) | ||
1199 | return -1; | ||
1200 | |||
1201 | if (enable) | ||
1202 | reg_val |= 0x01; | ||
1203 | else | ||
1204 | reg_val &= ~0x01; | ||
1205 | |||
1206 | if (__alps_command_mode_write_reg(psmouse, reg_val)) | ||
1207 | return -1; | ||
1208 | |||
1209 | return 0; | ||
1210 | } | ||
1211 | |||
1212 | /* Must be in command mode when calling this function */ | ||
1213 | static int alps_absolute_mode_v3(struct psmouse *psmouse) | ||
1214 | { | ||
1215 | int reg_val; | ||
1216 | |||
1217 | reg_val = alps_command_mode_read_reg(psmouse, 0x0004); | ||
1218 | if (reg_val == -1) | ||
1219 | return -1; | ||
1220 | |||
1221 | reg_val |= 0x06; | ||
1222 | if (__alps_command_mode_write_reg(psmouse, reg_val)) | ||
1223 | return -1; | ||
1224 | |||
1225 | return 0; | ||
1226 | } | ||
1227 | |||
1228 | static int alps_hw_init_v3(struct psmouse *psmouse) | ||
1229 | { | ||
1230 | struct alps_data *priv = psmouse->private; | ||
1231 | struct ps2dev *ps2dev = &psmouse->ps2dev; | ||
1232 | int reg_val; | ||
1233 | unsigned char param[4]; | ||
1234 | |||
1235 | priv->nibble_commands = alps_v3_nibble_commands; | ||
1236 | priv->addr_command = PSMOUSE_CMD_RESET_WRAP; | ||
1237 | |||
1238 | if (alps_enter_command_mode(psmouse, NULL)) | ||
1239 | goto error; | ||
1240 | |||
1241 | /* Check for trackstick */ | ||
1242 | reg_val = alps_command_mode_read_reg(psmouse, 0x0008); | ||
1243 | if (reg_val == -1) | ||
1244 | goto error; | ||
1245 | if (reg_val & 0x80) { | ||
1246 | if (alps_passthrough_mode_v3(psmouse, true)) | ||
1247 | goto error; | ||
1248 | if (alps_exit_command_mode(psmouse)) | ||
1249 | goto error; | ||
1250 | |||
1251 | /* | ||
1252 | * E7 report for the trackstick | ||
1253 | * | ||
1254 | * There have been reports of failures to seem to trace back | ||
1255 | * to the above trackstick check failing. When these occur | ||
1256 | * this E7 report fails, so when that happens we continue | ||
1257 | * with the assumption that there isn't a trackstick after | ||
1258 | * all. | ||
1259 | */ | ||
1260 | param[0] = 0x64; | ||
1261 | if (ps2_command(ps2dev, NULL, PSMOUSE_CMD_SETSCALE21) || | ||
1262 | ps2_command(ps2dev, NULL, PSMOUSE_CMD_SETSCALE21) || | ||
1263 | ps2_command(ps2dev, NULL, PSMOUSE_CMD_SETSCALE21) || | ||
1264 | ps2_command(ps2dev, param, PSMOUSE_CMD_GETINFO)) { | ||
1265 | psmouse_warn(psmouse, "trackstick E7 report failed\n"); | ||
1266 | } else { | ||
1267 | psmouse_dbg(psmouse, | ||
1268 | "trackstick E7 report: %2.2x %2.2x %2.2x\n", | ||
1269 | param[0], param[1], param[2]); | ||
1270 | |||
1271 | /* | ||
1272 | * Not sure what this does, but it is absolutely | ||
1273 | * essential. Without it, the touchpad does not | ||
1274 | * work at all and the trackstick just emits normal | ||
1275 | * PS/2 packets. | ||
1276 | */ | ||
1277 | if (ps2_command(ps2dev, NULL, PSMOUSE_CMD_SETSCALE11) || | ||
1278 | ps2_command(ps2dev, NULL, PSMOUSE_CMD_SETSCALE11) || | ||
1279 | ps2_command(ps2dev, NULL, PSMOUSE_CMD_SETSCALE11) || | ||
1280 | alps_command_mode_send_nibble(psmouse, 0x9) || | ||
1281 | alps_command_mode_send_nibble(psmouse, 0x4)) { | ||
1282 | psmouse_err(psmouse, | ||
1283 | "Error sending magic E6 sequence\n"); | ||
1284 | goto error_passthrough; | ||
1285 | } | ||
1286 | } | ||
1287 | |||
1288 | if (alps_enter_command_mode(psmouse, NULL)) | ||
1289 | goto error_passthrough; | ||
1290 | if (alps_passthrough_mode_v3(psmouse, false)) | ||
1291 | goto error; | ||
1292 | } | ||
1293 | |||
1294 | if (alps_absolute_mode_v3(psmouse)) { | ||
1295 | psmouse_err(psmouse, "Failed to enter absolute mode\n"); | ||
1296 | goto error; | ||
1297 | } | ||
1298 | |||
1299 | reg_val = alps_command_mode_read_reg(psmouse, 0x0006); | ||
1300 | if (reg_val == -1) | ||
1301 | goto error; | ||
1302 | if (__alps_command_mode_write_reg(psmouse, reg_val | 0x01)) | ||
1303 | goto error; | ||
1304 | |||
1305 | reg_val = alps_command_mode_read_reg(psmouse, 0x0007); | ||
1306 | if (reg_val == -1) | ||
1307 | goto error; | ||
1308 | if (__alps_command_mode_write_reg(psmouse, reg_val | 0x01)) | ||
1309 | goto error; | ||
1310 | |||
1311 | if (alps_command_mode_read_reg(psmouse, 0x0144) == -1) | ||
1312 | goto error; | ||
1313 | if (__alps_command_mode_write_reg(psmouse, 0x04)) | ||
1314 | goto error; | ||
1315 | |||
1316 | if (alps_command_mode_read_reg(psmouse, 0x0159) == -1) | ||
1317 | goto error; | ||
1318 | if (__alps_command_mode_write_reg(psmouse, 0x03)) | ||
1319 | goto error; | ||
1320 | |||
1321 | if (alps_command_mode_read_reg(psmouse, 0x0163) == -1) | ||
1322 | goto error; | ||
1323 | if (alps_command_mode_write_reg(psmouse, 0x0163, 0x03)) | ||
1324 | goto error; | ||
1325 | |||
1326 | if (alps_command_mode_read_reg(psmouse, 0x0162) == -1) | ||
1327 | goto error; | ||
1328 | if (alps_command_mode_write_reg(psmouse, 0x0162, 0x04)) | ||
1329 | goto error; | ||
1330 | |||
1331 | /* | ||
1332 | * This ensures the trackstick packets are in the format | ||
1333 | * supported by this driver. If bit 1 isn't set the packet | ||
1334 | * format is different. | ||
1335 | */ | ||
1336 | if (alps_command_mode_write_reg(psmouse, 0x0008, 0x82)) | ||
1337 | goto error; | ||
1338 | |||
1339 | alps_exit_command_mode(psmouse); | ||
1340 | |||
1341 | /* Set rate and enable data reporting */ | ||
1342 | param[0] = 0x64; | ||
1343 | if (ps2_command(ps2dev, param, PSMOUSE_CMD_SETRATE) || | ||
1344 | ps2_command(ps2dev, NULL, PSMOUSE_CMD_ENABLE)) { | ||
1345 | psmouse_err(psmouse, "Failed to enable data reporting\n"); | ||
1346 | return -1; | ||
1347 | } | ||
1348 | |||
1349 | return 0; | ||
1350 | |||
1351 | error_passthrough: | ||
1352 | /* Something failed while in passthrough mode, so try to get out */ | ||
1353 | if (!alps_enter_command_mode(psmouse, NULL)) | ||
1354 | alps_passthrough_mode_v3(psmouse, false); | ||
1355 | error: | ||
1356 | /* | ||
1357 | * Leaving the touchpad in command mode will essentially render | ||
1358 | * it unusable until the machine reboots, so exit it here just | ||
1359 | * to be safe | ||
1360 | */ | ||
1361 | alps_exit_command_mode(psmouse); | ||
1362 | return -1; | ||
1363 | } | ||
1364 | |||
1365 | /* Must be in command mode when calling this function */ | ||
1366 | static int alps_absolute_mode_v4(struct psmouse *psmouse) | ||
1367 | { | ||
1368 | int reg_val; | ||
1369 | |||
1370 | reg_val = alps_command_mode_read_reg(psmouse, 0x0004); | ||
1371 | if (reg_val == -1) | ||
1372 | return -1; | ||
1373 | |||
1374 | reg_val |= 0x02; | ||
1375 | if (__alps_command_mode_write_reg(psmouse, reg_val)) | ||
1376 | return -1; | ||
1377 | |||
1378 | return 0; | ||
1379 | } | ||
1380 | |||
1381 | static int alps_hw_init_v4(struct psmouse *psmouse) | ||
1382 | { | ||
1383 | struct alps_data *priv = psmouse->private; | ||
1384 | struct ps2dev *ps2dev = &psmouse->ps2dev; | ||
1385 | unsigned char param[4]; | ||
1386 | |||
1387 | priv->nibble_commands = alps_v4_nibble_commands; | ||
1388 | priv->addr_command = PSMOUSE_CMD_DISABLE; | ||
1389 | |||
1390 | if (alps_enter_command_mode(psmouse, NULL)) | ||
1391 | goto error; | ||
1392 | |||
1393 | if (alps_absolute_mode_v4(psmouse)) { | ||
1394 | psmouse_err(psmouse, "Failed to enter absolute mode\n"); | ||
1395 | goto error; | ||
1396 | } | ||
1397 | |||
1398 | if (alps_command_mode_write_reg(psmouse, 0x0007, 0x8c)) | ||
1399 | goto error; | ||
1400 | |||
1401 | if (alps_command_mode_write_reg(psmouse, 0x0149, 0x03)) | ||
1402 | goto error; | ||
1403 | |||
1404 | if (alps_command_mode_write_reg(psmouse, 0x0160, 0x03)) | ||
1405 | goto error; | ||
1406 | |||
1407 | if (alps_command_mode_write_reg(psmouse, 0x017f, 0x15)) | ||
1408 | goto error; | ||
1409 | |||
1410 | if (alps_command_mode_write_reg(psmouse, 0x0151, 0x01)) | ||
1411 | goto error; | ||
1412 | |||
1413 | if (alps_command_mode_write_reg(psmouse, 0x0168, 0x03)) | ||
1414 | goto error; | ||
1415 | |||
1416 | if (alps_command_mode_write_reg(psmouse, 0x014a, 0x03)) | ||
1417 | goto error; | ||
1418 | |||
1419 | if (alps_command_mode_write_reg(psmouse, 0x0161, 0x03)) | ||
1420 | goto error; | ||
1421 | |||
1422 | alps_exit_command_mode(psmouse); | ||
1423 | |||
1424 | /* | ||
1425 | * This sequence changes the output from a 9-byte to an | ||
1426 | * 8-byte format. All the same data seems to be present, | ||
1427 | * just in a more compact format. | ||
1428 | */ | ||
1429 | param[0] = 0xc8; | ||
1430 | param[1] = 0x64; | ||
1431 | param[2] = 0x50; | ||
1432 | if (ps2_command(ps2dev, ¶m[0], PSMOUSE_CMD_SETRATE) || | ||
1433 | ps2_command(ps2dev, ¶m[1], PSMOUSE_CMD_SETRATE) || | ||
1434 | ps2_command(ps2dev, ¶m[2], PSMOUSE_CMD_SETRATE) || | ||
1435 | ps2_command(ps2dev, param, PSMOUSE_CMD_GETID)) | ||
1436 | return -1; | ||
1437 | |||
1438 | /* Set rate and enable data reporting */ | ||
1439 | param[0] = 0x64; | ||
1440 | if (ps2_command(ps2dev, param, PSMOUSE_CMD_SETRATE) || | ||
1441 | ps2_command(ps2dev, NULL, PSMOUSE_CMD_ENABLE)) { | ||
1442 | psmouse_err(psmouse, "Failed to enable data reporting\n"); | ||
1443 | return -1; | ||
1444 | } | ||
1445 | |||
1446 | return 0; | ||
1447 | |||
1448 | error: | ||
1449 | /* | ||
1450 | * Leaving the touchpad in command mode will essentially render | ||
1451 | * it unusable until the machine reboots, so exit it here just | ||
1452 | * to be safe | ||
1453 | */ | ||
1454 | alps_exit_command_mode(psmouse); | ||
1455 | return -1; | ||
1456 | } | ||
1457 | |||
1458 | static int alps_hw_init(struct psmouse *psmouse) | ||
1459 | { | ||
1460 | struct alps_data *priv = psmouse->private; | ||
1461 | const struct alps_model_info *model = priv->i; | ||
1462 | int ret = -1; | ||
1463 | |||
1464 | switch (model->proto_version) { | ||
1465 | case ALPS_PROTO_V1: | ||
1466 | case ALPS_PROTO_V2: | ||
1467 | ret = alps_hw_init_v1_v2(psmouse); | ||
1468 | break; | ||
1469 | case ALPS_PROTO_V3: | ||
1470 | ret = alps_hw_init_v3(psmouse); | ||
1471 | break; | ||
1472 | case ALPS_PROTO_V4: | ||
1473 | ret = alps_hw_init_v4(psmouse); | ||
1474 | break; | ||
1475 | } | ||
1476 | |||
1477 | return ret; | ||
1478 | } | ||
1479 | |||
629 | static int alps_reconnect(struct psmouse *psmouse) | 1480 | static int alps_reconnect(struct psmouse *psmouse) |
630 | { | 1481 | { |
631 | const struct alps_model_info *model; | 1482 | const struct alps_model_info *model; |
@@ -666,6 +1517,8 @@ int alps_init(struct psmouse *psmouse) | |||
666 | 1517 | ||
667 | psmouse->private = priv; | 1518 | psmouse->private = priv; |
668 | 1519 | ||
1520 | psmouse_reset(psmouse); | ||
1521 | |||
669 | model = alps_get_model(psmouse, &version); | 1522 | model = alps_get_model(psmouse, &version); |
670 | if (!model) | 1523 | if (!model) |
671 | goto init_fail; | 1524 | goto init_fail; |
@@ -693,8 +1546,29 @@ int alps_init(struct psmouse *psmouse) | |||
693 | BIT_MASK(BTN_LEFT) | BIT_MASK(BTN_RIGHT); | 1546 | BIT_MASK(BTN_LEFT) | BIT_MASK(BTN_RIGHT); |
694 | 1547 | ||
695 | dev1->evbit[BIT_WORD(EV_ABS)] |= BIT_MASK(EV_ABS); | 1548 | dev1->evbit[BIT_WORD(EV_ABS)] |= BIT_MASK(EV_ABS); |
696 | input_set_abs_params(dev1, ABS_X, 0, 1023, 0, 0); | 1549 | |
697 | input_set_abs_params(dev1, ABS_Y, 0, 767, 0, 0); | 1550 | switch (model->proto_version) { |
1551 | case ALPS_PROTO_V1: | ||
1552 | case ALPS_PROTO_V2: | ||
1553 | input_set_abs_params(dev1, ABS_X, 0, 1023, 0, 0); | ||
1554 | input_set_abs_params(dev1, ABS_Y, 0, 767, 0, 0); | ||
1555 | break; | ||
1556 | case ALPS_PROTO_V3: | ||
1557 | set_bit(INPUT_PROP_SEMI_MT, dev1->propbit); | ||
1558 | input_mt_init_slots(dev1, 2); | ||
1559 | input_set_abs_params(dev1, ABS_MT_POSITION_X, 0, ALPS_V3_X_MAX, 0, 0); | ||
1560 | input_set_abs_params(dev1, ABS_MT_POSITION_Y, 0, ALPS_V3_Y_MAX, 0, 0); | ||
1561 | |||
1562 | set_bit(BTN_TOOL_DOUBLETAP, dev1->keybit); | ||
1563 | set_bit(BTN_TOOL_TRIPLETAP, dev1->keybit); | ||
1564 | set_bit(BTN_TOOL_QUADTAP, dev1->keybit); | ||
1565 | /* fall through */ | ||
1566 | case ALPS_PROTO_V4: | ||
1567 | input_set_abs_params(dev1, ABS_X, 0, ALPS_V3_X_MAX, 0, 0); | ||
1568 | input_set_abs_params(dev1, ABS_Y, 0, ALPS_V3_Y_MAX, 0, 0); | ||
1569 | break; | ||
1570 | } | ||
1571 | |||
698 | input_set_abs_params(dev1, ABS_PRESSURE, 0, 127, 0, 0); | 1572 | input_set_abs_params(dev1, ABS_PRESSURE, 0, 127, 0, 0); |
699 | 1573 | ||
700 | if (model->flags & ALPS_WHEEL) { | 1574 | if (model->flags & ALPS_WHEEL) { |
@@ -737,7 +1611,7 @@ int alps_init(struct psmouse *psmouse) | |||
737 | psmouse->poll = alps_poll; | 1611 | psmouse->poll = alps_poll; |
738 | psmouse->disconnect = alps_disconnect; | 1612 | psmouse->disconnect = alps_disconnect; |
739 | psmouse->reconnect = alps_reconnect; | 1613 | psmouse->reconnect = alps_reconnect; |
740 | psmouse->pktsize = 6; | 1614 | psmouse->pktsize = model->proto_version == ALPS_PROTO_V4 ? 8 : 6; |
741 | 1615 | ||
742 | /* We are having trouble resyncing ALPS touchpads so disable it for now */ | 1616 | /* We are having trouble resyncing ALPS touchpads so disable it for now */ |
743 | psmouse->resync_time = 0; | 1617 | psmouse->resync_time = 0; |