[Xorg-commit] xc/programs/Xserver/hw/xfree86/input/wacom xf86Wacom.c,1.1.4.3,1.1.4.4

[Kaleb Keithley]

Committed by: kaleb

Update of /cvs/xorg/xc/programs/Xserver/hw/xfree86/input/wacom
In directory pdx:/home/kaleb/xorg/xc.XORG-CURRENT/programs/Xserver/hw/xfree86/input/wacom

Modified Files:
      Tag: XORG-CURRENT
	xf86Wacom.c 
Log Message:
merge most of XFree86 RC3 (4.3.99.903) from vendor branch.
bug #214


Index: xf86Wacom.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/input/wacom/xf86Wacom.c,v
retrieving revision 1.1.4.3
retrieving revision 1.1.4.4
diff -u -d -r1.1.4.3 -r1.1.4.4
--- a/xf86Wacom.c	18 Dec 2003 19:29:14 -0000	1.1.4.3
+++ b/xf86Wacom.c	23 Feb 2004 21:36:39 -0000	1.1.4.4
@@ -23,7 +23,7 @@
  *
  */
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/input/wacom/xf86Wacom.c,v 1.43 2003/11/29 02:57:49 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/input/wacom/xf86Wacom.c,v 1.45 2003/12/31 01:18:45 tsi Exp $ */
 
 /*
  * This driver is only able to handle the Wacom IV and Wacom V protocols.
@@ -1149,7 +1149,7 @@
     WacomDeviceState* ds;
     struct input_event* event;
 
-    #define MOD_BUTTONS(bit, value) do { \
+#   define MOD_BUTTONS(bit, value) do { \
 		ds->buttons = (((value) != 0) ? \
                 (ds->buttons | (bit)) : (ds->buttons & ~(bit))); \
                 } while (0)
@@ -1724,7 +1724,7 @@
 			const unsigned char* data)
 {
     int n;
-    int is_stylus=0, have_data=0;
+    int have_data=0;
     int channel;
     WacomDeviceState* ds;
 
@@ -1777,7 +1777,6 @@
     /* General pen packet or eraser packet or airbrush first packet
      * airbrush second packet */
     else if (((data[0] & 0xb8) == 0xa0) || ((data[0] & 0xbe) == 0xb4)) {
-	is_stylus = 1;
 	ds->x = (((data[1] & 0x7f) << 9) | ((data[2] & 0x7f) << 2) |
                                 ((data[3] & 0x60) >> 5));
 	ds->y = (((data[3] & 0x1f) << 11) | ((data[4] & 0x7f) << 4) |
@@ -1802,7 +1801,6 @@
 
     /* 4D mouse 1st packet or Lens cursor packet or 2D mouse packet*/
     else if (((data[0] & 0xbe) == 0xa8) || ((data[0] & 0xbe) == 0xb0)) {
-	is_stylus = 0;
 	ds->x = (((data[1] & 0x7f) << 9) | ((data[2] & 0x7f) << 2) |
                                 ((data[3] & 0x60) >> 5));
 	ds->y = (((data[3] & 0x1f) << 11) | ((data[4] & 0x7f) << 4) |
@@ -1826,7 +1824,6 @@
 	ds->proximity = (data[0] & PROXIMITY_BIT);
     } /* end 4D mouse 1st packet */
     else if ((data[0] & 0xbe) == 0xaa) { /* 4D mouse 2nd packet */
-	is_stylus = 0;
 	ds->x = (((data[1] & 0x7f) << 9) | ((data[2] & 0x7f) << 2) |
                         ((data[3] & 0x60) >> 5));
 	ds->y = (((data[3] & 0x1f) << 11) | ((data[4] & 0x7f) << 4) |
@@ -3385,7 +3382,7 @@
 xf86WcmDevReadInput(LocalDevicePtr local)
 {
     int loop=0;
-    #define MAX_READ_LOOPS 10
+#   define MAX_READ_LOOPS 10
 
     WacomCommonPtr common = ((WacomDevicePtr)local->private)->common;
 
@@ -3702,7 +3699,7 @@
 
 	/* User-requested transformations come last */
 
-	#if 0
+#if 0
 
 	/* not quite ready for prime-time;
 	 * it needs to be possible to disable,
@@ -3743,7 +3740,7 @@
 	else
 	    priv->throttleLimit = priv->throttleStart + ticks;
 
-	#endif /* throttle */
+#endif /* throttle */
 
 	/* force out-prox when height is greater than 112.
 	 * This only applies to USB protocol V tablets
@@ -4564,7 +4561,7 @@
 	}
 	case 4:
 	{
-	    DBG(10,ErrorF("xf86WcmDevChangeControl: %p, %p\n", (void *)param, (void *)value));
+	    DBG(10,ErrorF("xf86WcmDevChangeControl: 0x%x, 0x%x\n", param, value));
 	    return xf86WcmSetParam(local,param,value);
 	}
 	default: