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

4 files changed, 23 insertions, 11 deletions

diff --git a/openembedded/packages/tslib/tslib/h3900/tslib.sh b/openembedded/packages/tslib/tslib/h3900/tslib.sh
index c885ccc9d2..be9448b1dc 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 e87a2095c4..8bb94a037f 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 0000000000..09309719f2
--- /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 0000000000..035e794cb4
--- /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