[Xorg-commit] xc/programs/Xserver/hw/xfree86/input/aiptek xf86Aiptek.c,1.1,1.1.4.1

[Kaleb Keithley]

Committed by: kaleb

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

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


Index: xf86Aiptek.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/input/aiptek/xf86Aiptek.c,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -d -r1.1 -r1.1.4.1
--- a/xf86Aiptek.c	25 Nov 2003 19:28:46 -0000	1.1
+++ b/xf86Aiptek.c	23 Feb 2004 21:36:36 -0000	1.1.4.1
@@ -35,7 +35,7 @@
  * TORTIOUS ACTIONS, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/input/aiptek/xf86Aiptek.c,v 1.1 2003/06/25 18:06:25 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/input/aiptek/xf86Aiptek.c,v 1.2 2003/12/22 17:48:10 tsi Exp $ */
 
 /*
  *
@@ -1681,7 +1681,7 @@
     LocalDevicePtr  local  = (LocalDevicePtr)dev->public.devicePrivate;
     AiptekDevicePtr device = (AiptekDevicePtr)(local->private);
 
-    DBG(3, ErrorF("xf86AiptekSwitchMode() dev=0x%02x mode=%d\n", dev, mode));
+    DBG(3, ErrorF("xf86AiptekSwitchMode() dev=%p mode=%d\n", dev, mode));
 
     switch(mode)
     {
@@ -1699,7 +1699,7 @@
 
         default:
         {
-            DBG(1, ErrorF("xf86AiptekSwitchMode dev=0x%02x invalid mode=%d\n",
+            DBG(1, ErrorF("xf86AiptekSwitchMode dev=%p invalid mode=%d\n",
                    dev, mode));
             return BadMatch;
         }