Moved the CommData struct from synaptics.h to synproto.h so

that ps2comm.c and eventcomm.c don't have to define SYNAPTICS_PRIVATE.

1 files changed, 15 insertions, 0 deletions

diff --git a/synproto.h b/synproto.h
index b653ad6..a7c63c0 100644
--- a/synproto.h
+++ b/synproto.h
@@ -21,6 +21,7 @@
 
 #include <sys/ioctl.h>
 #include <xf86Xinput.h>
+#include <xisb.h>
 
 /*
  * A structure to describe the state of the touchpad hardware (buttons and pad)
@@ -48,6 +49,20 @@ struct SynapticsHwState {
     int  guest_dy;
 };
 
+struct CommData {
+    XISBuffer *buffer;
+    unsigned char protoBuf[6];		/* Buffer for Packet */
+    unsigned char lastByte;		/* Last read byte. Use for reset sequence detection. */
+    int outOfSync;			/* How many consecutive incorrect packets we
+					   have received */
+    int protoBufTail;
+
+    /* Used for keeping track of partial HwState updates. */
+    struct SynapticsHwState hwState;
+    Bool oneFinger;
+    Bool twoFingers;
+    Bool threeFingers;
+};
 
 enum SynapticsProtocol {
     SYN_PROTO_PSAUX,		/* Raw psaux device */