diff options
| author | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2004-03-17 20:31:15 +0000 |
|---|---|---|
| committer | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2004-03-17 20:31:15 +0000 |
| commit | 8c16ef08c9e9d6831df6f7ac6337e4792553f938 (patch) | |
| tree | 0c9eae7ef408a240cf74d2f27e823fe138b3c8f5 | |
| parent | 4b1ef06b77c87bb5bd943a607130e556042bd61c (diff) | |
merge with XORG-RELEASE-1 (tag XORG-CYGWIN-LAST-MERGE)CYGWIN-RELEASE-1-MERGE
| -rw-r--r-- | man/aiptek.man | 2 | ||||
| -rw-r--r-- | src/xf86Aiptek.c | 6 | ||||
| -rw-r--r-- | src/xf86Aiptek.h | 4 |
3 files changed, 8 insertions, 4 deletions
diff --git a/man/aiptek.man b/man/aiptek.man index 466c871..f2ea668 100644 --- a/man/aiptek.man +++ b/man/aiptek.man @@ -1,4 +1,4 @@ -.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/aiptek/aiptek.man,v 1.1 2003/06/30 16:52:57 eich Exp $ +.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/aiptek/aiptek.man,v 0.0 2003/03/23 00:00:00 bheadley Exp $ .\" shorthand for double quote that works everywhere. .ds q \N'34' .TH AIPTEK __drivermansuffix__ __vendorversion__ diff --git a/src/xf86Aiptek.c b/src/xf86Aiptek.c index 39b8f9d..1f52f9c 100644 --- a/src/xf86Aiptek.c +++ b/src/xf86Aiptek.c @@ -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.1tsi Exp $ */ /* * @@ -1681,7 +1681,7 @@ xf86AiptekSwitchMode(ClientPtr client, DeviceIntPtr dev, int mode) 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 @@ xf86AiptekSwitchMode(ClientPtr client, DeviceIntPtr dev, int mode) 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; } diff --git a/src/xf86Aiptek.h b/src/xf86Aiptek.h index 2ed4751..846bcfe 100644 --- a/src/xf86Aiptek.h +++ b/src/xf86Aiptek.h @@ -34,6 +34,7 @@ * TORTIOUS ACTIONS, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/input/aiptek/xf86Aiptek.h,v 1.1.4.1.4.2 2004/03/04 20:16:38 kaleb Exp $ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/input/aiptek/xf86Aiptek.h,v 1.2 2003/11/03 05:36:32 tsi Exp $ */ #ifndef _AIPTEK_H_ @@ -43,6 +44,9 @@ #ifdef LINUX_INPUT # include <asm/types.h> # include <linux/input.h> +# ifndef EV_MSC +# define EV_MSC 0x04 +# endif /* keithp - a hack to avoid redefinitions of these in xf86str.h */ # ifdef BUS_PCI # undef BUS_PCI |