diff options
author | Ingo Molnar <mingo@kernel.org> | 2015-04-08 09:01:54 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2015-04-08 09:01:54 +0200 |
commit | 4bcc7827b02feea2c762fa6d46a1bffb300d7403 (patch) | |
tree | 45fd2b64247cd44201fe519720494d4bf01b7014 /Documentation/input/alps.txt | |
parent | x86, selftests: Add sigreturn selftest (diff) | |
parent | Linux 4.0-rc7 (diff) | |
download | linux-4bcc7827b02feea2c762fa6d46a1bffb300d7403.tar.xz linux-4bcc7827b02feea2c762fa6d46a1bffb300d7403.zip |
Merge tag 'v4.0-rc7' into x86/asm, to resolve conflicts
Conflicts:
arch/x86/kernel/entry_64.S
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'Documentation/input/alps.txt')
-rw-r--r-- | Documentation/input/alps.txt | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Documentation/input/alps.txt b/Documentation/input/alps.txt index a63e5e013a8c..92ae734c00c3 100644 --- a/Documentation/input/alps.txt +++ b/Documentation/input/alps.txt @@ -114,6 +114,9 @@ ALPS Absolute Mode - Protocol Version 2 byte 4: 0 y6 y5 y4 y3 y2 y1 y0 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. + Dualpoint device -- interleaved packet format --------------------------------------------- @@ -127,6 +130,11 @@ Dualpoint device -- interleaved packet format byte 7: 0 y6 y5 y4 y3 y2 y1 y0 byte 8: 0 z6 z5 z4 z3 z2 z1 z0 +Devices which use the interleaving format normally send standard PS/2 mouse +packets for the DualPoint Stick + ALPS Absolute Mode packets for the +touchpad, switching to the interleaved packet format when both the stick and +the touchpad are used at the same time. + ALPS Absolute Mode - Protocol Version 3 --------------------------------------- |