Merge changes from mainline OE to try and keep us in sync.

git-svn-id: https://svn.o-hand.com/repos/poky@127 311d38ba-8fff-0310-9ca6-ca027cbcb966

5 files changed, 35 insertions, 15 deletions

diff --git a/openembedded/packages/tslib/tslib/h3900/tslib.sh b/openembedded/packages/tslib/tslib/h3900/tslib.sh
index c885ccc9d..be9448b1d 100644
--- a/openembedded/packages/tslib/tslib/h3900/tslib.sh
+++ b/openembedded/packages/tslib/tslib/h3900/tslib.sh
@@ -11,15 +11,7 @@ case `uname -r` in
 	;;
 *)
 	TSLIB_TSDEVICE=`detect-stylus --device`
-	case `module_id` in
-	"HP iPAQ H2200")
-		# h2200 needs special linearizing thing
-		TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h2200
-		;;
-	*)
-		TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h3600
-		;;
-	esac
+	TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h3600
 	;;
 esac
 
diff --git a/openembedded/packages/tslib/tslib/simpad/tslib.sh b/openembedded/packages/tslib/tslib/simpad/tslib.sh
index e87a2095c..8bb94a037 100644
--- a/openembedded/packages/tslib/tslib/simpad/tslib.sh
+++ b/openembedded/packages/tslib/tslib/simpad/tslib.sh
@@ -1,5 +1,15 @@
 #!/bin/sh
 
-TSLIB_TSDEVICE=/dev/input/event0
+case `uname -r` in
+2.4*)
+	TSLIB_TSDEVICE=/dev/touchscreen/ucb1x00
+	TSLIB_CONFFILE=/usr/share/tslib/ts.conf-simpad-2.4
+	;;
+*)
+	TSLIB_TSDEVICE=/dev/input/event0
+	TSLIB_CONFFILE=/usr/share/tslib/ts.conf-simpad
+	;;
+esac
+
+export TSLIB_TSDEVICE TSLIB_CONFFILE
 
-export TSLIB_TSDEVICE
diff --git a/openembedded/packages/tslib/tslib/ts.conf-simpad b/openembedded/packages/tslib/tslib/ts.conf-simpad
new file mode 100644
index 000000000..09309719f
--- /dev/null
+++ b/openembedded/packages/tslib/tslib/ts.conf-simpad
@@ -0,0 +1,5 @@
+module_raw input
+module pthres pmin=1
+module variance delta=30
+module dejitter delta=100
+module linear
diff --git a/openembedded/packages/tslib/tslib/ts.conf-simpad-2.4 b/openembedded/packages/tslib/tslib/ts.conf-simpad-2.4
new file mode 100644
index 000000000..035e794cb
--- /dev/null
+++ b/openembedded/packages/tslib/tslib/ts.conf-simpad-2.4
@@ -0,0 +1,5 @@
+module_raw ucb1x00
+module pthres pmin=1
+module variance delta=10
+module dejitter delta=150
+module linear
diff --git a/openembedded/packages/tslib/tslib_cvs.bb b/openembedded/packages/tslib/tslib_cvs.bb
index 5c52147e1..0a79a492a 100644
--- a/openembedded/packages/tslib/tslib_cvs.bb
+++ b/openembedded/packages/tslib/tslib_cvs.bb
@@ -1,7 +1,7 @@
 SECTION = "base"
 DESCRIPTION = "tslib is a touchscreen access library."
 PV = "0.0cvs${CVSDATE}"
-PR = "r31"
+PR = "r32"
 
 SRC_URI_OVERRIDES_PACKAGE_ARCH = "0"
 PACKAGE_ARCH_tslib-conf = "${MACHINE}"
@@ -9,8 +9,9 @@ PACKAGE_ARCH_mnci = "${MACHINE}"
 
 SRC_URI = "cvs://cvs:@pubcvs.arm.linux.org.uk/mnt/src/cvsroot;module=tslib \
 	   file://ts.conf \
-	   file://ts.conf-h3600 file://ts.conf-h3600-2.4 file://ts.conf-h2200 file://ts.conf-h6300 \
+	   file://ts.conf-h3600 file://ts.conf-h3600-2.4 file://ts.conf-h6300 \
 	   file://ts.conf-corgi file://ts.conf-corgi-2.4 \
+	   file://ts.conf-simpad file://ts.conf-simpad-2.4 \
 	   file://tslib.sh"
 SRC_URI_append_mnci += " file://devfs.patch;patch=1"
 SRC_URI_append_mnci += " file://event1.patch;patch=1"
@@ -40,9 +41,9 @@ do_install_append() {
 	install -d ${D}${sysconfdir}/profile.d/
 	install -m 0755 ${WORKDIR}/tslib.sh ${D}${sysconfdir}/profile.d/
 	case ${MACHINE} in
-	h3600 | h3900 | h1940 | h6300 | ipaq-pxa270)
+	h3600 | h3900 | h1940 | h6300 | h2200 | ipaq-pxa270)
 		install -d ${D}${datadir}/tslib
-		for f in ts.conf-h3600 ts.conf-h3600-2.4 ts.conf-h2200 ts.conf-h6300; do
+		for f in ts.conf-h3600 ts.conf-h3600-2.4 ts.conf-h6300; do
 			install -m 0644 ${WORKDIR}/$f ${D}${datadir}/tslib/
 		done
 		rm -f ${D}${sysconfdir}/ts.conf
@@ -54,6 +55,13 @@ do_install_append() {
 		done
 		rm -f ${D}${sysconfdir}/ts.conf
 		;;
+	simpad )
+		install -d ${D}${datadir}/tslib
+		for f in ts.conf-simpad ts.conf-simpad-2.4; do
+			install -m 0644 ${WORKDIR}/$f ${D}${datadir}/tslib/
+		done
+		rm -f ${D}${sysconfdir}/ts.conf
+		;;
 	*)
 		;;
 	esac