aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Rydberg <rydberg@euromail.se>2008-11-04 21:17:06 +0100
committerHenrik Rydberg <rydberg@euromail.se>2008-11-04 21:17:06 +0100
commit18a82383c0fde45dcfc1e4ab8a180e312d98d748 (patch)
treeb7baf15cfac1015c527da868a9f61f7984b9cd33
parentbe3fe0da9995e59d32b4eb52368a012c0c18de85 (diff)
downloadxorg-input-kobomultitouch-18a82383c0fde45dcfc1e4ab8a180e312d98d748.tar.gz
xorg-input-kobomultitouch-18a82383c0fde45dcfc1e4ab8a180e312d98d748.tar.bz2
xorg-input-kobomultitouch-18a82383c0fde45dcfc1e4ab8a180e312d98d748.zip
Try again, after adding the defines from synaptics
Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
-rw-r--r--Makefile2
-rw-r--r--src/multitouch.c13
2 files changed, 13 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index b8c7ec6..22934f5 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ MODULES = src
o_src = multitouch
-TARGETS = #$(addsuffix /test,$(MODULES))
+TARGETS = $(addsuffix /test,$(MODULES))
OBJECTS = $(addsuffix .o,\
$(foreach mod,$(MODULES),\
diff --git a/src/multitouch.c b/src/multitouch.c
index 2c9b98a..2dfba79 100644
--- a/src/multitouch.c
+++ b/src/multitouch.c
@@ -25,8 +25,19 @@
#include <xf86.h>
#include <xf86_OSproc.h>
#include <xf86Xinput.h>
-#include <exevents.h>
+//#include <exevents.h>
#include <linux/input.h>
+#include <errno.h>
+
+////////////////////////////////////////////////////////////////////////////
+
+#define SYSCALL(call) while (((call) == -1) && (errno == EINTR))
+
+#define LONG_BITS (sizeof(long) * 8)
+#define NBITS(x) (((x) + LONG_BITS - 1) / LONG_BITS)
+#define OFF(x) ((x) % LONG_BITS)
+#define LONG(x) ((x) / LONG_BITS)
+#define TEST_BIT(bit, array) (array[LONG(bit)] & (1 << OFF(bit)))
////////////////////////////////////////////////////////////////////////////