Clean up the remnant USE_INPUT_API bits, as noted by Wolfram Sang

Signed-off-by: Chris Larson <clarson@kergoth.com>
libts · Nov 20, 2008 · fd5c1c6 · fd5c1c6
1 parent 87da12f
commit fd5c1c6
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 47 deletions.
diff --git a/src/ts_open.c b/src/ts_open.c
@@ -18,10 +18,6 @@
 #endif
 #include <sys/fcntl.h>
 
-#ifdef USE_INPUT_API
-#include <linux/input.h>
-#endif /* USE_INPUT_API */
-
 #include "tslib-private.h"
 
 extern struct tslib_module_info __ts_raw;

diff --git a/tests/ts_calibrate.c b/tests/ts_calibrate.c
@@ -204,11 +204,8 @@ int main()
 	if( (tsdevice = getenv("TSLIB_TSDEVICE")) != NULL ) {
 		ts = ts_open(tsdevice,0);
 	} else {
-#ifdef USE_INPUT_API
-		ts = ts_open("/dev/input/event0", 0);
-#else
-		ts = ts_open("/dev/touchscreen/ucb1x00", 0);
-#endif /* USE_INPUT_API */
+		if (!(ts = ts_open("/dev/input/event0", 0)))
+			ts = ts_open("/dev/touchscreen/ucb1x00", 0)
 	}
 
 	if (!ts) {

diff --git a/tests/ts_harvest.c b/tests/ts_harvest.c
@@ -74,18 +74,15 @@ int main()
 	signal(SIGINT, sig);
 	signal(SIGTERM, sig);
 
-	if ((tsdevice = getenv("TSLIB_TSDEVICE")) == NULL) {
-#ifdef USE_INPUT_API
-		tsdevice = strdup ("/dev/input/event0");
-#else
-		tsdevice = strdup ("/dev/touchscreen/ucb1x00");
-#endif /* USE_INPUT_API */
-        }
-
-	ts = ts_open (tsdevice, 0);
+	if( (tsdevice = getenv("TSLIB_TSDEVICE")) != NULL ) {
+		ts = ts_open(tsdevice,0);
+	} else {
+		if (!(ts = ts_open("/dev/input/event0", 0)))
+			ts = ts_open("/dev/touchscreen/ucb1x00", 0)
+	}
 
 	if (!ts) {
-		perror (tsdevice);
+		perror("ts_open");
 		exit(1);
 	}
 

diff --git a/tests/ts_print.c b/tests/ts_print.c
@@ -25,15 +25,12 @@ int main()
 	struct tsdev *ts;
 	char *tsdevice=NULL;
 
-        if( (tsdevice = getenv("TSLIB_TSDEVICE")) != NULL ) {
-                ts = ts_open(tsdevice,0);
-        } else {
-#ifdef USE_INPUT_API
-                ts = ts_open("/dev/input/event0", 0);
-#else
-                ts = ts_open("/dev/touchscreen/ucb1x00", 0);
-#endif /* USE_INPUT_API */
-        }
+	if( (tsdevice = getenv("TSLIB_TSDEVICE")) != NULL ) {
+		ts = ts_open(tsdevice,0);
+	} else {
+		if (!(ts = ts_open("/dev/input/event0", 0)))
+			ts = ts_open("/dev/touchscreen/ucb1x00", 0)
+	}
 
 	if (!ts) {
 		perror("ts_open");

diff --git a/tests/ts_print_raw.c b/tests/ts_print_raw.c
@@ -25,15 +25,12 @@ int main()
 	struct tsdev *ts;
 	char *tsdevice=NULL;
 
-        if( (tsdevice = getenv("TSLIB_TSDEVICE")) != NULL ) {
-                ts = ts_open(tsdevice,0);
-        } else {
-#ifdef USE_INPUT_API
-                ts = ts_open("/dev/input/event0", 0);
-#else
-                ts = ts_open("/dev/touchscreen/ucb1x00", 0);
-#endif /* USE_INPUT_API */
-        }
+	if( (tsdevice = getenv("TSLIB_TSDEVICE")) != NULL ) {
+		ts = ts_open(tsdevice,0);
+	} else {
+		if (!(ts = ts_open("/dev/input/event0", 0)))
+			ts = ts_open("/dev/touchscreen/ucb1x00", 0)
+	}
 
 	if (!ts) {
 		perror("ts_open");

diff --git a/tests/ts_test.c b/tests/ts_test.c
@@ -120,18 +120,15 @@ int main()
 	signal(SIGINT, sig);
 	signal(SIGTERM, sig);
 
-	if ((tsdevice = getenv("TSLIB_TSDEVICE")) == NULL) {
-#ifdef USE_INPUT_API
-		tsdevice = strdup ("/dev/input/event0");
-#else
-		tsdevice = strdup ("/dev/touchscreen/ucb1x00");
-#endif /* USE_INPUT_API */
-        }
-
-	ts = ts_open (tsdevice, 0);
+	if( (tsdevice = getenv("TSLIB_TSDEVICE")) != NULL ) {
+		ts = ts_open(tsdevice,0);
+	} else {
+		if (!(ts = ts_open("/dev/input/event0", 0)))
+			ts = ts_open("/dev/touchscreen/ucb1x00", 0)
+	}
 
 	if (!ts) {
-		perror (tsdevice);
+		perror("ts_open");
 		exit(1);
 	}