summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2005-09-04 20:19:21 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2005-09-04 20:19:21 +0000
commit0acb94784151b5776fa5fdc267441611a583668a (patch)
tree162bfd978bb4f417e1d4d789f40f14b92b05b0e6
parentcaa73dbb000b08b6d0dde1782133000ce211a63d (diff)
parentfcf2bc353dc7fe5d9ff9a1b52e64a2870e89d691 (diff)
merge of 42c2ebb949d65887341284ca09de93294c715b77
and edffa7178fc26b4b3fa5f13fc20d230d47136d23
-rw-r--r--packages/tslib/tslib/h6300/.mtn2git_empty0
-rw-r--r--packages/tslib/tslib/h6300/tslib.sh7
-rw-r--r--packages/tslib/tslib/ts.conf-h63005
-rw-r--r--packages/tslib/tslib_cvs.bb7
4 files changed, 16 insertions, 3 deletions
diff --git a/packages/tslib/tslib/h6300/.mtn2git_empty b/packages/tslib/tslib/h6300/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/tslib/tslib/h6300/.mtn2git_empty
diff --git a/packages/tslib/tslib/h6300/tslib.sh b/packages/tslib/tslib/h6300/tslib.sh
new file mode 100644
index 0000000000..21aaad9ca4
--- /dev/null
+++ b/packages/tslib/tslib/h6300/tslib.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+TSLIB_TSDEVICE=`detect-stylus --device`
+TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h6300
+
+export TSLIB_TSDEVICE TSLIB_CONFFILE
+
diff --git a/packages/tslib/tslib/ts.conf-h6300 b/packages/tslib/tslib/ts.conf-h6300
new file mode 100644
index 0000000000..09309719f2
--- /dev/null
+++ b/packages/tslib/tslib/ts.conf-h6300
@@ -0,0 +1,5 @@
+module_raw input
+module pthres pmin=1
+module variance delta=30
+module dejitter delta=100
+module linear
diff --git a/packages/tslib/tslib_cvs.bb b/packages/tslib/tslib_cvs.bb
index e010333994..d5a4c7ed30 100644
--- a/packages/tslib/tslib_cvs.bb
+++ b/packages/tslib/tslib_cvs.bb
@@ -9,7 +9,7 @@ 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-h3600 file://ts.conf-h3600-2.4 file://ts.conf-h2200 file://ts.conf-h6300 \
file://ts.conf-corgi file://ts.conf-corgi-2.4 \
file://tslib.sh"
SRC_URI_append_mnci += " file://devfs.patch;patch=1"
@@ -23,6 +23,7 @@ inherit autotools
PACKAGES = "tslib-conf libts libts-dev tslib-tests tslib-calibrate"
EXTRA_OECONF = "--enable-shared"
EXTRA_OECONF_mnci = "--enable-shared --disable-h3600 --enable-input --disable-corgi --disable-collie --disable-mk712 --disable-arctic2 --disable-ucb1x00 "
+EXTRA_OECONF_beagle = "--enable-shared --enable-h3600 --disable-input --disable-corgi --disable-collie --disable-mk712 --disable-arctic2 --disable-ucb1x00 "
do_stage () {
oe_libinstall -so -C src libts-0.0 ${STAGING_LIBDIR}
@@ -39,9 +40,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 | ipaq-pxa270)
+ h3600 | h3900 | h1940 | h6300 | ipaq-pxa270)
install -d ${D}${datadir}/tslib
- for f in ts.conf-h3600 ts.conf-h3600-2.4 ts.conf-h2200; do
+ for f in ts.conf-h3600 ts.conf-h3600-2.4 ts.conf-h2200 ts.conf-h6300; do
install -m 0644 ${WORKDIR}/$f ${D}${datadir}/tslib/
done
rm -f ${D}${sysconfdir}/ts.conf