From 1d9f26262aef6d63ff65eba0fd5f1583f342b69b Mon Sep 17 00:00:00 2001 From: Sebastian Kapfer Date: Tue, 15 Dec 2009 08:39:50 -0800 Subject: 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 Signed-off-by: Dmitry Torokhov --- drivers/input/mouse/alps.h | 1 + 1 file changed, 1 insertion(+) (limited to 'drivers/input/mouse/alps.h') diff --git a/drivers/input/mouse/alps.h b/drivers/input/mouse/alps.h index bc87936..904ed8b 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 -- cgit v1.1