aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/mouse/alps.h
diff options
context:
space:
mode:
authorKevin Cernekee <cernekee@gmail.com>2013-02-13 22:19:59 -0800
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2013-02-14 09:17:57 -0800
commitb5d6b851eab7f346ea5e69f46247b363b32b3670 (patch)
tree10ada693aa80f6ea6bce2aacef57dee3b51d74df /drivers/input/mouse/alps.h
parentInput: ALPS - introduce helper function for repeated commands (diff)
downloadlinux-dev-b5d6b851eab7f346ea5e69f46247b363b32b3670.tar.xz
linux-dev-b5d6b851eab7f346ea5e69f46247b363b32b3670.zip
Input: ALPS - rework detection sequence
If the E6 report test passes, get the E7 and EC reports right away and then try to match an entry in the table. Pass in the alps_data struct, so that the detection code will be able to set operating parameters based on information found during detection. Change the version (psmouse->model) to report the protocol version only, in preparation for supporting models that do not show up in the ID table. Signed-off-by: Kevin Cernekee <cernekee@gmail.com> Tested-by: Dave Turvene <dturvene@dahetral.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input/mouse/alps.h')
-rw-r--r--drivers/input/mouse/alps.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/input/mouse/alps.h b/drivers/input/mouse/alps.h
index efd0eea9f001..a81b31830454 100644
--- a/drivers/input/mouse/alps.h
+++ b/drivers/input/mouse/alps.h
@@ -12,10 +12,10 @@
#ifndef _ALPS_H
#define _ALPS_H
-#define ALPS_PROTO_V1 0
-#define ALPS_PROTO_V2 1
-#define ALPS_PROTO_V3 2
-#define ALPS_PROTO_V4 3
+#define ALPS_PROTO_V1 1
+#define ALPS_PROTO_V2 2
+#define ALPS_PROTO_V3 3
+#define ALPS_PROTO_V4 4
/**
* struct alps_model_info - touchpad ID table