summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPing Cheng <pinglinux@gmail.com>2013-03-05 16:44:52 -0800
committerJason Gerecke <killertofu@gmail.com>2013-03-06 10:19:30 -0800
commit6f9826217f50df8e315d3a7d694a4daf62f32c38 (patch)
tree54aab7b8a1ddcb0e71b631158b8051d249bba672
parent1bca5eefa22afcce1ebe33812e7d17872ceeafca (diff)
downloadxf86-input-wacom-6f9826217f50df8e315d3a7d694a4daf62f32c38.tar.gz
Update MAX_CHANNELS definition
Make room to report pen and touch events simultaneously Signed-off-by: Ping Cheng <pingc@wacom.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Jason Gerecke <killertofu@gmail.com>
-rw-r--r--src/xf86WacomDefs.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/xf86WacomDefs.h b/src/xf86WacomDefs.h
index fe078ec..3170ea0 100644
--- a/src/xf86WacomDefs.h
+++ b/src/xf86WacomDefs.h
@@ -1,6 +1,6 @@
/*
* Copyright 1995-2002 by Frederic Lepied, France. <Lepied@XFree86.org>
- * Copyright 2002-2010 by Ping Cheng, Wacom. <pingc@wacom.com>
+ * Copyright 2002-2013 by Ping Cheng, Wacom. <pingc@wacom.com>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -397,9 +397,9 @@ extern WacomDeviceClass gWacomISDV4Device;
#define TILT_REQUEST_FLAG 1
#define TILT_ENABLED_FLAG 2
-#define MAX_CHANNELS 17
+#define MAX_FINGERS 16
+#define MAX_CHANNELS (MAX_FINGERS+2) /* one channel for stylus/mouse. The other one for pad */
#define PAD_CHANNEL (MAX_CHANNELS-1)
-#define MAX_FINGERS (MAX_CHANNELS-1)
typedef struct {
int wcmZoomDistance; /* minimum distance for a zoom touch gesture */