let tslib on simpad work with both kernel 2.4 and 2.6

diff --git a/packages/tslib/tslib/simpad/tslib.sh b/packages/tslib/tslib/simpad/tslib.sh
index e87a209..8bb94a0 100644 (file)
--- a/packages/tslib/tslib/simpad/tslib.sh
+++ b/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/packages/tslib/tslib/simpad/ts.conf b/packages/tslib/tslib/ts.conf-simpad
similarity index 100%
rename from packages/tslib/tslib/simpad/ts.conf
rename to packages/tslib/tslib/ts.conf-simpad

diff --git a/packages/tslib/tslib/ts.conf-simpad-2.4 b/packages/tslib/tslib/ts.conf-simpad-2.4
new file mode 100644 (file)
index 0000000..035e794
--- /dev/null
+++ b/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/packages/tslib/tslib_cvs.bb b/packages/tslib/tslib_cvs.bb
index 9e6c4e2..f0267a6 100644 (file)
--- a/packages/tslib/tslib_cvs.bb
+++ b/packages/tslib/tslib_cvs.bb
@@ -11,6 +11,7 @@ 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-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"
@@ -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