Experimental mainline MT supportHEADmaster

This patchset is in flux, and a cooperative effort between
Takashi Iwai, Chase Douglas, Chris Bagwell and myself.

Signed-off-by: Henrik Rydberg <rydberg@euromail.se>

1 files changed, 9 insertions, 1 deletions

diff --git a/usr/src/dkms_source_tree/synaptics.h b/usr/src/dkms_source_tree/synaptics.h
index 80907d0..c3653e1 100644
--- a/usr/src/dkms_source_tree/synaptics.h
+++ b/usr/src/dkms_source_tree/synaptics.h
@@ -6,6 +6,8 @@
  * the Free Software Foundation.
  */
 
+#include "input-mt.h"
+
 #ifndef _SYNAPTICS_H
 #define _SYNAPTICS_H
 
@@ -53,6 +55,7 @@
 #define SYN_CAP_PRODUCT_ID(ec)          (((ec) & 0xff0000) >> 16)
 #define SYN_CAP_CLICKPAD(ex0c)          ((ex0c) & 0x100100)
 #define SYN_CAP_MAX_DIMENSIONS(ex0c)    ((ex0c) & 0x020000)
+#define SYN_CAP_MULTITOUCH(ex0c)        ((ex0c) & 0x080000)
 
 /* synaptics modes query bits */
 #define SYN_MODE_ABSOLUTE(m)            ((m) & (1 << 7))
@@ -110,7 +113,12 @@ struct synaptics_data {
         unsigned char pkt_type;                 /* packet type - old, new, etc */
         unsigned char mode;                     /* current mode byte */
         int scroll;
-        struct synaptics_hw_state prev_hw;
+
+        struct serio *pt_port;                  /* Pass-through serio port */
+
+        int multitouch;                         /* device provides MT data */
+        int mt_pkt;                             /* received MT packet */
+        struct synaptics_hw_state mt;           /* current MT packet */
 };
 
 void synaptics_module_init(void);