11 files changed, 8 insertions, 53 deletions
diff --git a/packages/tslib/tslib/h2200/tslib.sh b/packages/tslib/tslib/h2200/tslib.sh
index b096bfb96e..586d5c7deb 100644
--- a/packages/tslib/tslib/h2200/tslib.sh
+++ b/packages/tslib/tslib/h2200/tslib.sh
@@ -3,12 +3,4 @@
 TSLIB_TSDEVICE=/dev/input/touchscreen0
 TSLIB_CONFFILE=/etc/ts.conf
 
-case `uname -r` in
-2.4*)
-	TSLIB_TSDEVICE=/dev/touchscreen/0raw
-	TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h3600-2.4
-	;;
-esac
-
 export TSLIB_TSDEVICE TSLIB_CONFFILE
-
diff --git a/packages/tslib/tslib/h3600/tslib.sh b/packages/tslib/tslib/h3600/tslib.sh
index 6c480f46af..f73e39c5d9 100644
--- a/packages/tslib/tslib/h3600/tslib.sh
+++ b/packages/tslib/tslib/h3600/tslib.sh
@@ -1,14 +1,7 @@
 #!/bin/sh
 
-TSLIB_TSDEVICE=`detect-stylus --device`
+TSLIB_TSDEVICE=/dev/input/touchscreen0
 TSLIB_CONFFILE=/etc/ts.conf
 
-case `uname -r` in
-2.4*)
-	TSLIB_TSDEVICE=/dev/touchscreen/0raw
-	TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h3600-2.4
-	;;
-esac
-
 export TSLIB_TSDEVICE TSLIB_CONFFILE
 
diff --git a/packages/tslib/tslib/h3900/tslib.sh b/packages/tslib/tslib/h3900/tslib.sh
index 6c480f46af..f73e39c5d9 100644
--- a/packages/tslib/tslib/h3900/tslib.sh
+++ b/packages/tslib/tslib/h3900/tslib.sh
@@ -1,14 +1,7 @@
 #!/bin/sh
 
-TSLIB_TSDEVICE=`detect-stylus --device`
+TSLIB_TSDEVICE=/dev/input/touchscreen0
 TSLIB_CONFFILE=/etc/ts.conf
 
-case `uname -r` in
-2.4*)
-	TSLIB_TSDEVICE=/dev/touchscreen/0raw
-	TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h3600-2.4
-	;;
-esac
-
 export TSLIB_TSDEVICE TSLIB_CONFFILE
 
diff --git a/packages/tslib/tslib/h4000/tslib.sh b/packages/tslib/tslib/h4000/tslib.sh
index 6c480f46af..f73e39c5d9 100644
--- a/packages/tslib/tslib/h4000/tslib.sh
+++ b/packages/tslib/tslib/h4000/tslib.sh
@@ -1,14 +1,7 @@
 #!/bin/sh
 
-TSLIB_TSDEVICE=`detect-stylus --device`
+TSLIB_TSDEVICE=/dev/input/touchscreen0
 TSLIB_CONFFILE=/etc/ts.conf
 
-case `uname -r` in
-2.4*)
-	TSLIB_TSDEVICE=/dev/touchscreen/0raw
-	TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h3600-2.4
-	;;
-esac
-
 export TSLIB_TSDEVICE TSLIB_CONFFILE
 
diff --git a/packages/tslib/tslib/h5000/tslib.sh b/packages/tslib/tslib/h5000/tslib.sh
index b096bfb96e..586d5c7deb 100644
--- a/packages/tslib/tslib/h5000/tslib.sh
+++ b/packages/tslib/tslib/h5000/tslib.sh
@@ -3,12 +3,4 @@
 TSLIB_TSDEVICE=/dev/input/touchscreen0
 TSLIB_CONFFILE=/etc/ts.conf
 
-case `uname -r` in
-2.4*)
-	TSLIB_TSDEVICE=/dev/touchscreen/0raw
-	TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h3600-2.4
-	;;
-esac
-
 export TSLIB_TSDEVICE TSLIB_CONFFILE
-
diff --git a/packages/tslib/tslib/h6300/tslib.sh b/packages/tslib/tslib/h6300/tslib.sh
index b3318fd820..586d5c7deb 100644
--- a/packages/tslib/tslib/h6300/tslib.sh
+++ b/packages/tslib/tslib/h6300/tslib.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 
-TSLIB_TSDEVICE=`detect-stylus --device`
+TSLIB_TSDEVICE=/dev/input/touchscreen0
 TSLIB_CONFFILE=/etc/ts.conf
 
 export TSLIB_TSDEVICE TSLIB_CONFFILE
-
diff --git a/packages/tslib/tslib/ipaq-pxa270/.mtn2git_empty b/packages/tslib/tslib/htcblueangel/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/tslib/tslib/ipaq-pxa270/.mtn2git_empty
+++ b/packages/tslib/tslib/htcblueangel/.mtn2git_empty
diff --git a/packages/tslib/tslib/ipaq-pxa270/tslib.sh b/packages/tslib/tslib/htcblueangel/tslib.sh
index 586d5c7deb..586d5c7deb 100644
--- a/packages/tslib/tslib/ipaq-pxa270/tslib.sh
+++ b/packages/tslib/tslib/htcblueangel/tslib.sh
diff --git a/packages/tslib/tslib/htcuniversal/ts.conf b/packages/tslib/tslib/htcuniversal/ts.conf
deleted file mode 100644
index 09309719f2..0000000000
--- a/packages/tslib/tslib/htcuniversal/ts.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-module_raw input
-module pthres pmin=1
-module variance delta=30
-module dejitter delta=100
-module linear
diff --git a/packages/tslib/tslib/htcuniversal/tslib.sh b/packages/tslib/tslib/htcuniversal/tslib.sh
index cc7e6b724a..586d5c7deb 100644
--- a/packages/tslib/tslib/htcuniversal/tslib.sh
+++ b/packages/tslib/tslib/htcuniversal/tslib.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-TSLIB_TSDEVICE=`detect-stylus --device`
+TSLIB_TSDEVICE=/dev/input/touchscreen0
 TSLIB_CONFFILE=/etc/ts.conf
 
 export TSLIB_TSDEVICE TSLIB_CONFFILE
diff --git a/packages/tslib/tslib_1.0.bb b/packages/tslib/tslib_1.0.bb
index 165c6396ce..579a8ee51a 100644
--- a/packages/tslib/tslib_1.0.bb
+++ b/packages/tslib/tslib_1.0.bb
@@ -4,7 +4,7 @@ AUTHOR = "Russell King w/ plugins by Chris Larson et. al."
 SECTION = "base"
 LICENSE = "LGPL"
 
-PR = "r5"
+PR = "r6"
 
 SRC_URI = "http://download.berlios.de/tslib/tslib-1.0.tar.bz2 \
            file://ts.conf \
@@ -33,7 +33,7 @@ do_install_append() {
 	install -d ${D}${sysconfdir}/profile.d/
 	install -m 0755 ${WORKDIR}/tslib.sh ${D}${sysconfdir}/profile.d/
 	case ${MACHINE} in
-	a780 | e680 | h3600 | h3900 | h5000 | h1940 | h6300 | h2200 | ipaq-pxa270 | hx4700 | hx2000 | blueangel | h4000)
+	a780 | e680 )
 		install -d ${D}${datadir}/tslib
 		install -m 0644 ${WORKDIR}/ts.conf-h3600-2.4 ${D}${datadir}/tslib/
 		;;
@@ -59,9 +59,7 @@ SRC_URI_OVERRIDES_PACKAGE_ARCH = "0"
 
 # People should consider using udev's /dev/input/touchscreen0 symlink 
 # instead of detect-stylus
-RDEPENDS_tslib-conf_h3600 = "detect-stylus"
-RDEPENDS_tslib-conf_h3900 = "detect-stylus"
-RDEPENDS_tslib-conf_blueangel = "detect-stylus"
+#RDEPENDS_tslib-conf_weird-machine = "detect-stylus"
 RPROVIDES_tslib-conf = "libts-0.0-conf"
 
 PACKAGE_ARCH_tslib-conf = "${MACHINE_ARCH}"