diff options
| author | Sebastian Kapfer <sebastian_kapfer@gmx.net> | 2009-12-15 17:39:50 +0100 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-12-16 07:15:25 +0100 |
| commit | 1d9f26262aef6d63ff65eba0fd5f1583f342b69b (patch) | |
| tree | b2ed8e81376d0650cc6637e7c68abc27f013f819 /drivers/input/mouse/alps.h | |
| parent | Input: keyboard - don't override beep with a bell (diff) | |
| download | linux-1d9f26262aef6d63ff65eba0fd5f1583f342b69b.tar.xz linux-1d9f26262aef6d63ff65eba0fd5f1583f342b69b.zip | |
Input: ALPS - add interleaved protocol support (Dell E6x00 series)
Properly handle version of the protocol where standard PS/2 packets
from trackpoint are stuffed into middle (byte 3-6) of the standard
ALPS packets when both the touchpad and trackpoint are used together.
The patch is based on work done by Matthew Chapman and additional
research done by David Kubicek and Erik Osterholm:
https://bugs.launchpad.net/ubuntu/+source/linux/+bug/296610
Many thanks to David Kubicek for his efforts in researching fine points
of this new version of the protocol, especially interaction between pad
and stick in these models.
Signed-off-by: Sebastian Kapfer <sebastian_kapfer@gmx.net>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input/mouse/alps.h')
| -rw-r--r-- | drivers/input/mouse/alps.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/input/mouse/alps.h b/drivers/input/mouse/alps.h index bc87936fee1a..904ed8b3c8be 100644 --- a/drivers/input/mouse/alps.h +++ b/drivers/input/mouse/alps.h @@ -23,6 +23,7 @@ struct alps_data { char phys[32]; /* Phys */ const struct alps_model_info *i;/* Info */ int prev_fin; /* Finger bit from previous packet */ + struct timer_list timer; }; #ifdef CONFIG_MOUSE_PS2_ALPS |