tslib: Fix nokia770 support files

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

4 files changed, 9 insertions, 22 deletions

diff --git a/meta/packages/tslib/tslib/nokia770/ts.conf b/meta/packages/tslib/tslib/nokia770/ts.conf
index 1b0da937e8..09309719f2 100644
--- a/meta/packages/tslib/tslib/nokia770/ts.conf
+++ b/meta/packages/tslib/tslib/nokia770/ts.conf
@@ -1,24 +1,4 @@
-# Uncomment if you wish to use the linux input layer event interface
 module_raw input
-
-# Uncomment if you're using a Sharp Zaurus SL-5500/SL-5000d
-# module_raw collie
-
-# Uncomment if you're using a Sharp Zaurus SL-C700/C750/C760/C860
-# module_raw corgi
-
-# Uncomment if you're using a device with a UCB1200/1300/1400 TS interface
-# module_raw ucb1x00
-
-# Uncomment if you're using an HP iPaq h3600 or similar
-# module_raw h3600
-
-# Uncomment if you're using a Hitachi Webpad
-# module_raw mk712
-
-# Uncomment if you're using an IBM Arctic II
-# module_raw arctic2
-
 module pthres pmin=1
 module variance delta=30
 module dejitter delta=100
diff --git a/meta/packages/tslib/tslib/nokia770/tslib.sh b/meta/packages/tslib/tslib/nokia770/tslib.sh
new file mode 100644
index 0000000000..bcfe94a6b8
--- /dev/null
+++ b/meta/packages/tslib/tslib/nokia770/tslib.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+TSLIB_TSDEVICE=/dev/input/touchscreen0
+TSLIB_TSEVENTTYPE=INPUT
+TSLIB_CONFFILE=/etc/ts.conf
+
+export TSLIB_TSDEVICE TSLIB_TSEVENTTYPE TSLIB_CONFFILE
diff --git a/meta/packages/tslib/tslib_1.0.bb b/meta/packages/tslib/tslib_1.0.bb
index e44d077a92..9d2ec50a6f 100644
--- a/meta/packages/tslib/tslib_1.0.bb
+++ b/meta/packages/tslib/tslib_1.0.bb
@@ -1,6 +1,6 @@
 SECTION = "base"
 DESCRIPTION = "tslib is a touchscreen access library."
-PR = "r0"
+PR = "r1"
 SRCDATE_tslib = "now"
 
 SRC_URI_OVERRIDES_PACKAGE_ARCH = "0"
diff --git a/meta/packages/tslib/tslib_cvs.bb b/meta/packages/tslib/tslib_cvs.bb
index 3fd8813537..ff3450e163 100644
--- a/meta/packages/tslib/tslib_cvs.bb
+++ b/meta/packages/tslib/tslib_cvs.bb
@@ -1,7 +1,7 @@
 SECTION = "base"
 DESCRIPTION = "tslib is a touchscreen access library."
 PV = "0.0+cvs${SRCDATE}"
-PR = "r35"
+PR = "r36"
 
 SRC_URI_OVERRIDES_PACKAGE_ARCH = "0"
 PACKAGE_ARCH_tslib-conf = "${MACHINE_ARCH}"