summaryrefslogtreecommitdiffstats
path: root/drivers/input/mouse/alps.h
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2014-07-26 07:37:15 +0200
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2014-07-26 23:03:13 +0200
commit40e8f53bffe074e6cd409cf484e4b55c114c93d6 (patch)
tree817d57a759b1d434a9ed1778b90fdfed715bda59 /drivers/input/mouse/alps.h
parentInput: alps - improve 2-finger reporting on v3 models (diff)
downloadlinux-40e8f53bffe074e6cd409cf484e4b55c114c93d6.tar.xz
linux-40e8f53bffe074e6cd409cf484e4b55c114c93d6.zip
Input: alps - process_bitmap: don't invert the Y-axis on Rushmore
Rushmore models don't have the Y-axis data in the bitmap inverted. Since we now have 2 different Y orientations, make the Y bitmap data processing use a forward loop like the X bitmap data processing, unifying the 2, and invert the data later, except on Rushmore. So far no-one has noticed this because the synaptics driver only uses the non mt coordinates (except on clickpads, and there are no alps clickpads using process_bitmap). Signed-off-by: Hans de Goede <hdegoede@redhat.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.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/mouse/alps.h b/drivers/input/mouse/alps.h
index 03f88b6940c7..6d2666c0d63a 100644
--- a/drivers/input/mouse/alps.h
+++ b/drivers/input/mouse/alps.h
@@ -46,7 +46,7 @@ struct alps_model_info {
unsigned char command_mode_resp;
unsigned char proto_version;
unsigned char byte0, mask0;
- unsigned char flags;
+ int flags;
};
/**
@@ -142,7 +142,7 @@ struct alps_data {
int addr_command;
unsigned char proto_version;
unsigned char byte0, mask0;
- unsigned char flags;
+ int flags;
int x_max;
int y_max;
int x_bits;