aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrederic Bompart <frederic@unknown.openembedded.org>2005-10-03 16:16:28 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2005-10-03 16:16:28 +0000
commitdcd5991ec103e8c07fe0bb68f7e9c4de0568ae05 (patch)
tree2a273a46b8f223fdb1b8ddcd6cabe42877b864bd
parentb55d713e016c253d5b471eeefd239c5c4d9a1090 (diff)
downloadopenembedded-dcd5991ec103e8c07fe0bb68f7e9c4de0568ae05.tar.gz
let tslib on simpad work with both kernel 2.4 and 2.6
-rw-r--r--packages/tslib/tslib/simpad/tslib.sh14
-rw-r--r--packages/tslib/tslib/ts.conf-simpad (renamed from packages/tslib/tslib/simpad/ts.conf)0
-rw-r--r--packages/tslib/tslib/ts.conf-simpad-2.45
-rw-r--r--packages/tslib/tslib_cvs.bb8
4 files changed, 25 insertions, 2 deletions
diff --git a/packages/tslib/tslib/simpad/tslib.sh b/packages/tslib/tslib/simpad/tslib.sh
index e87a2095c4..8bb94a037f 100644
--- 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
index 09309719f2..09309719f2 100644
--- a/packages/tslib/tslib/simpad/ts.conf
+++ b/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
index 0000000000..035e794cb4
--- /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 9e6c4e26d3..f0267a6814 100644
--- 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