patches/linuxwacom-01-no-usb.diff
author jurikm
Sun, 12 Feb 2012 14:04:10 +0000
changeset 8245 383896da4129
parent 2185 42f2be129be9
permissions -rw-r--r--
SFEsauerbraten.spec: add IPS package name
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2185
42f2be129be9 2009-09-20 Albert Lee <[email protected]>
trisk
parents: 1571
diff changeset
     1
--- linuxwacom-0.8.4-2.orig/src/xdrv/xf86Wacom.c	2009-09-16 15:54:04.000000000 -0400
42f2be129be9 2009-09-20 Albert Lee <[email protected]>
trisk
parents: 1571
diff changeset
     2
+++ linuxwacom-0.8.4-2/src/xdrv/xf86Wacom.c	2009-09-20 15:24:01.299896648 -0400
42f2be129be9 2009-09-20 Albert Lee <[email protected]>
trisk
parents: 1571
diff changeset
     3
@@ -984,7 +984,11 @@
42f2be129be9 2009-09-20 Albert Lee <[email protected]>
trisk
parents: 1571
diff changeset
     4
 	/* while there are whole packets present, check the packet length
42f2be129be9 2009-09-20 Albert Lee <[email protected]>
trisk
parents: 1571
diff changeset
     5
 	 * for serial ISDv4 packet since it's different for pen and touch
42f2be129be9 2009-09-20 Albert Lee <[email protected]>
trisk
parents: 1571
diff changeset
     6
 	 */
42f2be129be9 2009-09-20 Albert Lee <[email protected]>
trisk
parents: 1571
diff changeset
     7
+#ifdef WCM_ENABLE_LINUXINPUT
42f2be129be9 2009-09-20 Albert Lee <[email protected]>
trisk
parents: 1571
diff changeset
     8
 	if (common->wcmForceDevice == DEVICE_ISDV4 && common->wcmDevCls != &gWacomUSBDevice) 
42f2be129be9 2009-09-20 Albert Lee <[email protected]>
trisk
parents: 1571
diff changeset
     9
+#else
42f2be129be9 2009-09-20 Albert Lee <[email protected]>
trisk
parents: 1571
diff changeset
    10
+	if (common->wcmForceDevice == DEVICE_ISDV4)
42f2be129be9 2009-09-20 Albert Lee <[email protected]>
trisk
parents: 1571
diff changeset
    11
+#endif
42f2be129be9 2009-09-20 Albert Lee <[email protected]>
trisk
parents: 1571
diff changeset
    12
 	{
42f2be129be9 2009-09-20 Albert Lee <[email protected]>
trisk
parents: 1571
diff changeset
    13
 		common->wcmPktLength = 9;
42f2be129be9 2009-09-20 Albert Lee <[email protected]>
trisk
parents: 1571
diff changeset
    14
 		data = common->buffer;
42f2be129be9 2009-09-20 Albert Lee <[email protected]>
trisk
parents: 1571
diff changeset
    15
@@ -1008,7 +1012,9 @@
1571
209756768793 2008-12-16 Albert Lee <[email protected]>
trisk
parents:
diff changeset
    16
 		}
209756768793 2008-12-16 Albert Lee <[email protected]>
trisk
parents:
diff changeset
    17
 		pos += cnt;
209756768793 2008-12-16 Albert Lee <[email protected]>
trisk
parents:
diff changeset
    18
 
209756768793 2008-12-16 Albert Lee <[email protected]>
trisk
parents:
diff changeset
    19
+#ifdef WCM_ENABLE_LINUXINPUT
209756768793 2008-12-16 Albert Lee <[email protected]>
trisk
parents:
diff changeset
    20
 		if (common->wcmDevCls != &gWacomUSBDevice) 
209756768793 2008-12-16 Albert Lee <[email protected]>
trisk
parents:
diff changeset
    21
+#endif
209756768793 2008-12-16 Albert Lee <[email protected]>
trisk
parents:
diff changeset
    22
 		{
209756768793 2008-12-16 Albert Lee <[email protected]>
trisk
parents:
diff changeset
    23
 			data = common->buffer + pos;
2185
42f2be129be9 2009-09-20 Albert Lee <[email protected]>
trisk
parents: 1571
diff changeset
    24
 			if ( data[0] & 0x18 )