Merge tag 'omap-for-v3.14/fixes-against-rc1' of git://git.kernel.org/pub/scm/linux...

[karo-tx-linux.git] / drivers / input / mouse / alps.h

diff --git a/drivers/input/mouse/alps.h b/drivers/input/mouse/alps.h
index 704f0f9243076190213b1c1876ef833348e61c99..03f88b6940c7c4e4b2f61c529adcf7dce0aaf96d 100644 (file)
--- a/drivers/input/mouse/alps.h
+++ b/drivers/input/mouse/alps.h
@@ -19,6 +19,10 @@
 #define ALPS_PROTO_V5  5
 #define ALPS_PROTO_V6  6
 
+#define DOLPHIN_COUNT_PER_ELECTRODE    64
+#define DOLPHIN_PROFILE_XOFFSET                8       /* x-electrode offset */
+#define DOLPHIN_PROFILE_YOFFSET                1       /* y-electrode offset */
+
 /**
  * struct alps_model_info - touchpad ID table
  * @signature: E7 response string to match.
@@ -146,7 +150,8 @@ struct alps_data {
 
        int (*hw_init)(struct psmouse *psmouse);
        void (*process_packet)(struct psmouse *psmouse);
-       void (*decode_fields)(struct alps_fields *f, unsigned char *p);
+       void (*decode_fields)(struct alps_fields *f, unsigned char *p,
+                             struct psmouse *psmouse);
        void (*set_abs_params)(struct alps_data *priv, struct input_dev *dev1);
 
        int prev_fin;