diff options
author | Seth Forshee <seth.forshee@canonical.com> | 2011-11-07 22:53:24 -0500 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-11-08 01:22:10 -0500 |
commit | fa629ef5222193214da9a2b3c94369f79353bec9 (patch) | |
tree | 07221f6fa39181d1bfb8bf51ff4cb86c8e36a6d3 /drivers/input/mouse/alps.h | |
parent | d4b347b29b4d14647c7394f7167bf6785dc98e50 (diff) |
Input: ALPS - add protocol version field in alps_model_info
In preparation for adding support for more ALPS protocol versions,
add a field for the protocol version to the model info instead of
using a field in the flags. OLDPROTO and !OLDPROTO are now called
version 1 and version 2, repsectively.
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
Acked-by: Chase Douglas <chase.douglas@canonical.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input/mouse/alps.h')
-rw-r--r-- | drivers/input/mouse/alps.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/input/mouse/alps.h b/drivers/input/mouse/alps.h index 904ed8b3c8be..4ce9bba6a3cd 100644 --- a/drivers/input/mouse/alps.h +++ b/drivers/input/mouse/alps.h | |||
@@ -12,8 +12,12 @@ | |||
12 | #ifndef _ALPS_H | 12 | #ifndef _ALPS_H |
13 | #define _ALPS_H | 13 | #define _ALPS_H |
14 | 14 | ||
15 | #define ALPS_PROTO_V1 0 | ||
16 | #define ALPS_PROTO_V2 1 | ||
17 | |||
15 | struct alps_model_info { | 18 | struct alps_model_info { |
16 | unsigned char signature[3]; | 19 | unsigned char signature[3]; |
20 | unsigned char proto_version; | ||
17 | unsigned char byte0, mask0; | 21 | unsigned char byte0, mask0; |
18 | unsigned char flags; | 22 | unsigned char flags; |
19 | }; | 23 | }; |