diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-04-21 11:12:42 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-04-21 11:12:42 -0700 |
| commit | 48853389f206b689260ddfd3006816779ca7a52a (patch) | |
| tree | 8abc3be612779c3252190bc54a38eb0b3c258e19 /Documentation | |
| parent | 85a3685852d9ac7d92be9d824533c915a4597fa4 (diff) | |
| parent | c9eeb5084b27ffede2709e8775827729d0c7c46c (diff) | |
Merge branch 'next' into for-linus
Prepare second round of updates for 4.1 merge window.
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/input/alps.txt | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Documentation/input/alps.txt b/Documentation/input/alps.txt index 92ae734c00c3..e301887d8523 100644 --- a/Documentation/input/alps.txt +++ b/Documentation/input/alps.txt @@ -94,6 +94,10 @@ PS/2 packet format Note that the device never signals overflow condition. +For protocol version 2 devices when the trackpoint is used, and no fingers +are on the touchpad, the M R L bits signal the combined status of both the +pointingstick and touchpad buttons. + ALPS Absolute Mode - Protocol Version 1 -------------------------------------- @@ -107,7 +111,7 @@ ALPS Absolute Mode - Protocol Version 1 ALPS Absolute Mode - Protocol Version 2 --------------------------------------- - byte 0: 1 ? ? ? 1 ? ? ? + byte 0: 1 ? ? ? 1 PSM PSR PSL byte 1: 0 x6 x5 x4 x3 x2 x1 x0 byte 2: 0 x10 x9 x8 x7 ? fin ges byte 3: 0 y9 y8 y7 1 M R L @@ -115,7 +119,8 @@ ALPS Absolute Mode - Protocol Version 2 byte 5: 0 z6 z5 z4 z3 z2 z1 z0 Protocol Version 2 DualPoint devices send standard PS/2 mouse packets for -the DualPoint Stick. +the DualPoint Stick. For non interleaved dualpoint devices the pointingstick +buttons get reported separately in the PSM, PSR and PSL bits. Dualpoint device -- interleaved packet format --------------------------------------------- |