tslib: Sync major cleanup I made in OE.dev

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

diff --git a/meta/packages/tslib/tslib/a780/tslib.sh b/meta/packages/tslib/tslib/a780/tslib.sh
new file mode 100644 (file)
index 0000000..51cd0f1
--- /dev/null
+++ b/meta/packages/tslib/tslib/a780/tslib.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+TSLIB_TSDEVICE=/dev/input/event1
+TSLIB_CONFFILE=/etc/ts.conf
+
+export TSLIB_TSDEVICE TSLIB_CONFFILE

diff --git a/meta/packages/tslib/tslib/akita/tslib.sh b/meta/packages/tslib/tslib/akita/tslib.sh
index 0c8b1a12b9b59304bbb848214222de2db9faf29b..0ff219b31fd650e076ab3ac6ce7a94bf37bb2d4a 100644 (file)
--- a/meta/packages/tslib/tslib/akita/tslib.sh
+++ b/meta/packages/tslib/tslib/akita/tslib.sh
@@ -1,16 +1,13 @@
 #!/bin/sh
 
+TSLIB_TSDEVICE=/dev/input/touchscreen0
+TSLIB_CONFFILE=/etc/ts.conf
+
 case `uname -r` in
 2.4*)
        TSLIB_TSDEVICE=/dev/ts
-       TSLIB_TSEVENTTYPE=CORGI
        TSLIB_CONFFILE=/usr/share/tslib/ts.conf-corgi-2.4
        ;;
-*)
-       TSLIB_TSDEVICE=/dev/input/touchscreen0
-       TSLIB_TSEVENTTYPE=INPUT
-       TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf
-       ;;
 esac
 
-export TSLIB_TSDEVICE TSLIB_TSEVENTTYPE TSLIB_CONFFILE
+export TSLIB_TSDEVICE TSLIB_CONFFILE

diff --git a/meta/packages/tslib/tslib/c7x0/tslib.sh b/meta/packages/tslib/tslib/c7x0/tslib.sh
index 0c8b1a12b9b59304bbb848214222de2db9faf29b..0ff219b31fd650e076ab3ac6ce7a94bf37bb2d4a 100644 (file)
--- a/meta/packages/tslib/tslib/c7x0/tslib.sh
+++ b/meta/packages/tslib/tslib/c7x0/tslib.sh
@@ -1,16 +1,13 @@
 #!/bin/sh
 
+TSLIB_TSDEVICE=/dev/input/touchscreen0
+TSLIB_CONFFILE=/etc/ts.conf
+
 case `uname -r` in
 2.4*)
        TSLIB_TSDEVICE=/dev/ts
-       TSLIB_TSEVENTTYPE=CORGI
        TSLIB_CONFFILE=/usr/share/tslib/ts.conf-corgi-2.4
        ;;
-*)
-       TSLIB_TSDEVICE=/dev/input/touchscreen0
-       TSLIB_TSEVENTTYPE=INPUT
-       TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf
-       ;;
 esac
 
-export TSLIB_TSDEVICE TSLIB_TSEVENTTYPE TSLIB_CONFFILE
+export TSLIB_TSDEVICE TSLIB_CONFFILE

diff --git a/meta/packages/tslib/tslib/collie/tslib.sh b/meta/packages/tslib/tslib/collie/tslib.sh
index 759d5cf091f427560f72ef3e9ef0f8e4b4b39d8e..664bda426ada7bfbbd7c2a375873d05ac2635fbd 100644 (file)
--- a/meta/packages/tslib/tslib/collie/tslib.sh
+++ b/meta/packages/tslib/tslib/collie/tslib.sh
@@ -1,16 +1,13 @@
 #!/bin/sh
 
+TSLIB_TSDEVICE=/dev/input/touchscreen0
+TSLIB_CONFFILE=/etc/ts.conf
+
 case `uname -r` in
 2.4*)
        TSLIB_TSDEVICE=/dev/ts
-       TSLIB_TSEVENTTYPE=COLLIE
        TSLIB_CONFFILE=/usr/share/tslib/ts.conf-collie-2.4
        ;;
-*)
-       TSLIB_TSDEVICE=/dev/input/touchscreen0
-       TSLIB_TSEVENTTYPE=INPUT
-       TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf
-       ;;
 esac
 
-export TSLIB_TSDEVICE TSLIB_TSEVENTTYPE TSLIB_CONFFILE
+export TSLIB_TSDEVICE TSLIB_CONFFILE

diff --git a/meta/packages/tslib/tslib/e680/tslib.sh b/meta/packages/tslib/tslib/e680/tslib.sh
new file mode 100644 (file)
index 0000000..51cd0f1
--- /dev/null
+++ b/meta/packages/tslib/tslib/e680/tslib.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+TSLIB_TSDEVICE=/dev/input/event1
+TSLIB_CONFFILE=/etc/ts.conf
+
+export TSLIB_TSDEVICE TSLIB_CONFFILE

diff --git a/meta/packages/tslib/tslib/h1940/tslib.sh b/meta/packages/tslib/tslib/h1940/tslib.sh
index d83673e2599e2a9162e659c58ae47ff37bade90a..7dbf4ae9f13e7538e404abac1bf3864d11723a3a 100644 (file)
--- a/meta/packages/tslib/tslib/h1940/tslib.sh
+++ b/meta/packages/tslib/tslib/h1940/tslib.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 TSLIB_TSDEVICE=`detect-stylus --device`
-TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf
+TSLIB_CONFFILE=/etc/ts.conf
 QWS_MOUSE_PROTO=TPanel
 
 export TSLIB_TSDEVICE TSLIB_CONFFILE QWS_MOUSE_PROTO

diff --git a/meta/packages/tslib/tslib/h2200/tslib.sh b/meta/packages/tslib/tslib/h2200/tslib.sh
new file mode 100644 (file)
index 0000000..b096bfb
--- /dev/null
+++ b/meta/packages/tslib/tslib/h2200/tslib.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+TSLIB_TSDEVICE=/dev/input/touchscreen0
+TSLIB_CONFFILE=/etc/ts.conf
+
+case `uname -r` in
+2.4*)
+       TSLIB_TSDEVICE=/dev/touchscreen/0raw
+       TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h3600-2.4
+       ;;
+esac
+
+export TSLIB_TSDEVICE TSLIB_CONFFILE
+

diff --git a/meta/packages/tslib/tslib/h3600/tslib.sh b/meta/packages/tslib/tslib/h3600/tslib.sh
index 3c27b075f7a4b2e8bf5dd55a8572a99f5a81570b..6c480f46afcc849d0a9ebccbe5f4445afd4ce428 100644 (file)
--- a/meta/packages/tslib/tslib/h3600/tslib.sh
+++ b/meta/packages/tslib/tslib/h3600/tslib.sh
@@ -1,14 +1,13 @@
 #!/bin/sh
 
+TSLIB_TSDEVICE=`detect-stylus --device`
+TSLIB_CONFFILE=/etc/ts.conf
+
 case `uname -r` in
 2.4*)
        TSLIB_TSDEVICE=/dev/touchscreen/0raw
        TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h3600-2.4
        ;;
-*)
-       TSLIB_TSDEVICE=`detect-stylus --device`
-       TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf
-       ;;
 esac
 
 export TSLIB_TSDEVICE TSLIB_CONFFILE

diff --git a/meta/packages/tslib/tslib/h3900/tslib.sh b/meta/packages/tslib/tslib/h3900/tslib.sh
index 0de3534a51eb3c9706d759cdd318bf6183e76a6b..6c480f46afcc849d0a9ebccbe5f4445afd4ce428 100644 (file)
--- a/meta/packages/tslib/tslib/h3900/tslib.sh
+++ b/meta/packages/tslib/tslib/h3900/tslib.sh
@@ -1,18 +1,13 @@
 #!/bin/sh
 
-module_id() {
-    awk 'BEGIN { FS=": " } /Hardware/ { print $2 } ' </proc/cpuinfo
-}
+TSLIB_TSDEVICE=`detect-stylus --device`
+TSLIB_CONFFILE=/etc/ts.conf
 
 case `uname -r` in
 2.4*)
        TSLIB_TSDEVICE=/dev/touchscreen/0raw
        TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h3600-2.4
        ;;
-*)
-       TSLIB_TSDEVICE=`detect-stylus --device`
-       TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf
-       ;;
 esac
 
 export TSLIB_TSDEVICE TSLIB_CONFFILE

diff --git a/meta/packages/tslib/tslib/h4000/tslib.sh b/meta/packages/tslib/tslib/h4000/tslib.sh
new file mode 100644 (file)
index 0000000..6c480f4
--- /dev/null
+++ b/meta/packages/tslib/tslib/h4000/tslib.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+TSLIB_TSDEVICE=`detect-stylus --device`
+TSLIB_CONFFILE=/etc/ts.conf
+
+case `uname -r` in
+2.4*)
+       TSLIB_TSDEVICE=/dev/touchscreen/0raw
+       TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h3600-2.4
+       ;;
+esac
+
+export TSLIB_TSDEVICE TSLIB_CONFFILE
+

diff --git a/meta/packages/tslib/tslib/h5xxx/tslib.sh b/meta/packages/tslib/tslib/h5xxx/tslib.sh
new file mode 100644 (file)
index 0000000..b096bfb
--- /dev/null
+++ b/meta/packages/tslib/tslib/h5xxx/tslib.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+TSLIB_TSDEVICE=/dev/input/touchscreen0
+TSLIB_CONFFILE=/etc/ts.conf
+
+case `uname -r` in
+2.4*)
+       TSLIB_TSDEVICE=/dev/touchscreen/0raw
+       TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h3600-2.4
+       ;;
+esac
+
+export TSLIB_TSDEVICE TSLIB_CONFFILE
+

diff --git a/meta/packages/tslib/tslib/h6300/tslib.sh b/meta/packages/tslib/tslib/h6300/tslib.sh
index 548bc918ff12cf42429483d477e3428707cebe9a..b3318fd820be7d5830d84d3faa2351f32392f581 100644 (file)
--- a/meta/packages/tslib/tslib/h6300/tslib.sh
+++ b/meta/packages/tslib/tslib/h6300/tslib.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 TSLIB_TSDEVICE=`detect-stylus --device`
-TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf
+TSLIB_CONFFILE=/etc/ts.conf
 
 export TSLIB_TSDEVICE TSLIB_CONFFILE
 

diff --git a/meta/packages/tslib/tslib/nokia770/ts.conf b/meta/packages/tslib/tslib/htcuniversal/ts.conf
similarity index 100%
rename from meta/packages/tslib/tslib/nokia770/ts.conf
rename to meta/packages/tslib/tslib/htcuniversal/ts.conf

diff --git a/meta/packages/tslib/tslib/htcuniversal/tslib.sh b/meta/packages/tslib/tslib/htcuniversal/tslib.sh
new file mode 100644 (file)
index 0000000..cc7e6b7
--- /dev/null
+++ b/meta/packages/tslib/tslib/htcuniversal/tslib.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+TSLIB_TSDEVICE=`detect-stylus --device`
+TSLIB_CONFFILE=/etc/ts.conf
+
+export TSLIB_TSDEVICE TSLIB_CONFFILE

diff --git a/meta/packages/tslib/tslib/hx2000/tslib.sh b/meta/packages/tslib/tslib/hx2000/tslib.sh
new file mode 100644 (file)
index 0000000..586d5c7
--- /dev/null
+++ b/meta/packages/tslib/tslib/hx2000/tslib.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+TSLIB_TSDEVICE=/dev/input/touchscreen0
+TSLIB_CONFFILE=/etc/ts.conf
+
+export TSLIB_TSDEVICE TSLIB_CONFFILE

diff --git a/meta/packages/tslib/tslib/hx4700/tslib.sh b/meta/packages/tslib/tslib/hx4700/tslib.sh
new file mode 100644 (file)
index 0000000..586d5c7
--- /dev/null
+++ b/meta/packages/tslib/tslib/hx4700/tslib.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+TSLIB_TSDEVICE=/dev/input/touchscreen0
+TSLIB_CONFFILE=/etc/ts.conf
+
+export TSLIB_TSDEVICE TSLIB_CONFFILE

diff --git a/meta/packages/tslib/tslib/ipaq-pxa270/tslib.sh b/meta/packages/tslib/tslib/ipaq-pxa270/tslib.sh
index 3a6ba78c50df4f91a1b825943d210cf77a4e0219..586d5c7deb795bbacc86eb27a0afc8637fff5046 100644 (file)
--- a/meta/packages/tslib/tslib/ipaq-pxa270/tslib.sh
+++ b/meta/packages/tslib/tslib/ipaq-pxa270/tslib.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 TSLIB_TSDEVICE=/dev/input/touchscreen0
-TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf
+TSLIB_CONFFILE=/etc/ts.conf
 
 export TSLIB_TSDEVICE TSLIB_CONFFILE

diff --git a/meta/packages/tslib/tslib/jornada56x/tslib.sh b/meta/packages/tslib/tslib/jornada56x/tslib.sh
index a93d2d3ef00a6c702ce11109734803ac4d8a094f..8f907b0755357be3742c5bebdd20c17c6ad0b9ff 100644 (file)
--- a/meta/packages/tslib/tslib/jornada56x/tslib.sh
+++ b/meta/packages/tslib/tslib/jornada56x/tslib.sh
@@ -1,6 +1,5 @@
 #!/bin/sh
 
 TSLIB_TSDEVICE=/dev/input/tsraw0
-TSLIB_TSEVENTTYPE=H3600
 
-export TSLIB_TSDEVICE TSLIB_TSEVENTTYPE
+export TSLIB_TSDEVICE

diff --git a/meta/packages/tslib/tslib/jornada6xx/tslib.sh b/meta/packages/tslib/tslib/jornada6xx/tslib.sh
index e64f644b748b7d485f3d118299b392acd0ef9d2b..1b5db781c1e6aa7813f7c94d451b847bef550e81 100644 (file)
--- a/meta/packages/tslib/tslib/jornada6xx/tslib.sh
+++ b/meta/packages/tslib/tslib/jornada6xx/tslib.sh
@@ -1,6 +1,5 @@
 #!/bin/sh
 
 TSLIB_TSDEVICE=/dev/input/ts0
-TSLIB_TSEVENTTYPE=H3600
 
-export TSLIB_TSDEVICE TSLIB_TSEVENTTYPE
+export TSLIB_TSDEVICE

diff --git a/meta/packages/tslib/tslib/jornada7xx/tslib.sh b/meta/packages/tslib/tslib/jornada7xx/tslib.sh
index a93d2d3ef00a6c702ce11109734803ac4d8a094f..1b5db781c1e6aa7813f7c94d451b847bef550e81 100644 (file)
--- a/meta/packages/tslib/tslib/jornada7xx/tslib.sh
+++ b/meta/packages/tslib/tslib/jornada7xx/tslib.sh
@@ -1,6 +1,5 @@
 #!/bin/sh
 
-TSLIB_TSDEVICE=/dev/input/tsraw0
-TSLIB_TSEVENTTYPE=H3600
+TSLIB_TSDEVICE=/dev/input/ts0
 
-export TSLIB_TSDEVICE TSLIB_TSEVENTTYPE
+export TSLIB_TSDEVICE

diff --git a/meta/packages/tslib/tslib/netbook-pro/ts.conf b/meta/packages/tslib/tslib/netbook-pro/ts.conf
new file mode 100644 (file)
index 0000000..6d94a8f
--- /dev/null
+++ b/meta/packages/tslib/tslib/netbook-pro/ts.conf
@@ -0,0 +1,5 @@
+module_raw input
+module variance delta=80
+#module dejitter delta=2
+module linear
+

diff --git a/meta/packages/tslib/tslib/netbook-pro/tslib.sh b/meta/packages/tslib/tslib/netbook-pro/tslib.sh
new file mode 100644 (file)
index 0000000..d31bc76
--- /dev/null
+++ b/meta/packages/tslib/tslib/netbook-pro/tslib.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+TSLIB_TSDEVICE=`detect-stylus --device`
+
+export TSLIB_TSDEVICE

diff --git a/meta/packages/tslib/tslib/nokia770/tslib.sh b/meta/packages/tslib/tslib/nokia770/tslib.sh
index bcfe94a6b8b75a2079a64b1818d905e65e192a29..b7acc274c0cf2a3a5640667946470e7720efdb86 100644 (file)
--- a/meta/packages/tslib/tslib/nokia770/tslib.sh
+++ b/meta/packages/tslib/tslib/nokia770/tslib.sh
@@ -1,7 +1,5 @@
 #!/bin/sh
 
 TSLIB_TSDEVICE=/dev/input/touchscreen0
-TSLIB_TSEVENTTYPE=INPUT
-TSLIB_CONFFILE=/etc/ts.conf
 
-export TSLIB_TSDEVICE TSLIB_TSEVENTTYPE TSLIB_CONFFILE
+export TSLIB_TSDEVICE

diff --git a/meta/packages/tslib/tslib/omap1610h2/ts.conf b/meta/packages/tslib/tslib/omap1610h2/ts.conf
deleted file mode 100644 (file)
index 0930971..0000000
--- a/meta/packages/tslib/tslib/omap1610h2/ts.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-module_raw input
-module pthres pmin=1
-module variance delta=30
-module dejitter delta=100
-module linear

diff --git a/meta/packages/tslib/tslib/omap5912osk/ts.conf b/meta/packages/tslib/tslib/omap5912osk/ts.conf
deleted file mode 100644 (file)
index dc377cf..0000000
--- a/meta/packages/tslib/tslib/omap5912osk/ts.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-module_raw input
-
-module pthres pmin=1
-module variance delta=30
-module dejitter delta=100
-module linear

diff --git a/meta/packages/tslib/tslib/poodle/tslib.sh b/meta/packages/tslib/tslib/poodle/tslib.sh
index 759d5cf091f427560f72ef3e9ef0f8e4b4b39d8e..664bda426ada7bfbbd7c2a375873d05ac2635fbd 100644 (file)
--- a/meta/packages/tslib/tslib/poodle/tslib.sh
+++ b/meta/packages/tslib/tslib/poodle/tslib.sh
@@ -1,16 +1,13 @@
 #!/bin/sh
 
+TSLIB_TSDEVICE=/dev/input/touchscreen0
+TSLIB_CONFFILE=/etc/ts.conf
+
 case `uname -r` in
 2.4*)
        TSLIB_TSDEVICE=/dev/ts
-       TSLIB_TSEVENTTYPE=COLLIE
        TSLIB_CONFFILE=/usr/share/tslib/ts.conf-collie-2.4
        ;;
-*)
-       TSLIB_TSDEVICE=/dev/input/touchscreen0
-       TSLIB_TSEVENTTYPE=INPUT
-       TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf
-       ;;
 esac
 
-export TSLIB_TSDEVICE TSLIB_TSEVENTTYPE TSLIB_CONFFILE
+export TSLIB_TSDEVICE TSLIB_CONFFILE

diff --git a/meta/packages/tslib/tslib/qemuarm/ts.conf b/meta/packages/tslib/tslib/qemuarm/ts.conf
deleted file mode 100644 (file)
index 0930971..0000000
--- a/meta/packages/tslib/tslib/qemuarm/ts.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-module_raw input
-module pthres pmin=1
-module variance delta=30
-module dejitter delta=100
-module linear

diff --git a/meta/packages/tslib/tslib/qemuarm/tslib.sh b/meta/packages/tslib/tslib/qemuarm/tslib.sh
index 0bc0d454e734f16ce8045478617a30a37abacf59..b7acc274c0cf2a3a5640667946470e7720efdb86 100644 (file)
--- a/meta/packages/tslib/tslib/qemuarm/tslib.sh
+++ b/meta/packages/tslib/tslib/qemuarm/tslib.sh
@@ -1,6 +1,5 @@
 #!/bin/sh
 
 TSLIB_TSDEVICE=/dev/input/touchscreen0
-TSLIB_TSEVENTTYPE=INPUT
 
-export TSLIB_TSDEVICE TSLIB_TSEVENTTYPE
+export TSLIB_TSDEVICE

diff --git a/meta/packages/tslib/tslib/simpad/tslib.sh b/meta/packages/tslib/tslib/simpad/tslib.sh
index 39b1c4ba58c502d7876457742480cf28843cac05..9c4eb1e0f9b21fd6701f9930a13fb5e41dbb3bf2 100644 (file)
--- a/meta/packages/tslib/tslib/simpad/tslib.sh
+++ b/meta/packages/tslib/tslib/simpad/tslib.sh
@@ -1,14 +1,13 @@
 #!/bin/sh
 
+TSLIB_TSDEVICE=/dev/input/touchscreen0
+TSLIB_CONFFILE=/etc/ts.conf
+
 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/touchscreen0
-       TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf
-       ;;
 esac
 
 export TSLIB_TSDEVICE TSLIB_CONFFILE

diff --git a/meta/packages/tslib/tslib/tosa/tslib.sh b/meta/packages/tslib/tslib/tosa/tslib.sh
index 0c8b1a12b9b59304bbb848214222de2db9faf29b..0ff219b31fd650e076ab3ac6ce7a94bf37bb2d4a 100644 (file)
--- a/meta/packages/tslib/tslib/tosa/tslib.sh
+++ b/meta/packages/tslib/tslib/tosa/tslib.sh
@@ -1,16 +1,13 @@
 #!/bin/sh
 
+TSLIB_TSDEVICE=/dev/input/touchscreen0
+TSLIB_CONFFILE=/etc/ts.conf
+
 case `uname -r` in
 2.4*)
        TSLIB_TSDEVICE=/dev/ts
-       TSLIB_TSEVENTTYPE=CORGI
        TSLIB_CONFFILE=/usr/share/tslib/ts.conf-corgi-2.4
        ;;
-*)
-       TSLIB_TSDEVICE=/dev/input/touchscreen0
-       TSLIB_TSEVENTTYPE=INPUT
-       TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf
-       ;;
 esac
 
-export TSLIB_TSDEVICE TSLIB_TSEVENTTYPE TSLIB_CONFFILE
+export TSLIB_TSDEVICE TSLIB_CONFFILE

diff --git a/meta/packages/tslib/tslib/ts-2.6.conf b/meta/packages/tslib/tslib/ts-2.6.conf
deleted file mode 100644 (file)
index 0930971..0000000
--- a/meta/packages/tslib/tslib/ts-2.6.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-module_raw input
-module pthres pmin=1
-module variance delta=30
-module dejitter delta=100
-module linear

diff --git a/meta/packages/tslib/tslib/ts.conf b/meta/packages/tslib/tslib/ts.conf
index dc5c4ded091ca597ee11c3fce4cf894ff88a21aa..1b0da937e8098b61d049be3f68938debebd4abac 100644 (file)
--- a/meta/packages/tslib/tslib/ts.conf
+++ b/meta/packages/tslib/tslib/ts.conf
@@ -1,5 +1,5 @@
 # Uncomment if you wish to use the linux input layer event interface
-# module_raw input
+module_raw input
 
 # Uncomment if you're using a Sharp Zaurus SL-5500/SL-5000d
 # module_raw collie

diff --git a/meta/packages/tslib/tslib/usec_fix.patch b/meta/packages/tslib/tslib/usec_fix.patch
deleted file mode 100644 (file)
index a791b39..0000000
--- a/meta/packages/tslib/tslib/usec_fix.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: work/tslib-0.0cvs20051201-r32/tslib/plugins/collie-raw.c
-===================================================================
---- tslib.orig/plugins/collie-raw.c    2005-12-04 10:09:33.000000000 +0100
-+++ tslib/plugins/collie-raw.c 2005-12-04 10:16:05.000000000 +0100
-@@ -29,7 +29,7 @@
- #ifdef DEBUG
-         fprintf(stderr,"RAW---------------------------> %d %d %d\n",samp->x,samp->y,samp->pressure);
- #endif /*DEBUG*/
--                      samp->tv.tv_usec = collie_evt->millisecs % 1000;
-+                      samp->tv.tv_usec = (collie_evt->millisecs % 1000) * 1000;
-                       samp->tv.tv_sec = collie_evt->millisecs / 1000;
-                       samp++;
-                       collie_evt++;
-Index: work/tslib-0.0cvs20051201-r32/tslib/plugins/corgi-raw.c
-===================================================================
---- tslib.orig/plugins/corgi-raw.c     2005-12-04 10:10:19.000000000 +0100
-+++ tslib/plugins/corgi-raw.c  2005-12-04 10:16:15.000000000 +0100
-@@ -29,7 +29,7 @@
- #ifdef DEBUG
-         fprintf(stderr,"RAW---------------------------> %d %d %d\n",samp->x,samp->y,samp->pressure);
- #endif /*DEBUG*/
--                      samp->tv.tv_usec = corgi_evt->millisecs % 1000;
-+                      samp->tv.tv_usec = (corgi_evt->millisecs % 1000) * 1000;
-                       samp->tv.tv_sec = corgi_evt->millisecs / 1000;
-                       samp++;
-                       corgi_evt++;

diff --git a/meta/packages/tslib/tslib_1.0.bb b/meta/packages/tslib/tslib_1.0.bb
index f63a8ddc7aa2f383ead6714fe6efd6d7828c5e74..5e5f61cb352c6703ccd0147c84a86881b6ee8261 100644 (file)
--- a/meta/packages/tslib/tslib_1.0.bb
+++ b/meta/packages/tslib/tslib_1.0.bb
@@ -1,35 +1,31 @@
+DESCRIPTION = "tslib is a plugin-based flexible touchscreen access library."
+HOMEPAGE = "http://cvs.arm.linux.org.uk/"
+AUTHOR = "Russell King w/ plugins by Chris Larson et. al."
 SECTION = "base"
-DESCRIPTION = "tslib is a touchscreen access library."
-PR = "r3"
-SRCDATE_tslib = "now"
+LICENSE = "LGPL"
 
-SRC_URI_OVERRIDES_PACKAGE_ARCH = "0"
-PACKAGE_ARCH_tslib-conf = "${MACHINE_ARCH}"
-PACKAGE_ARCH_mnci = "${MACHINE_ARCH}"
+PR = "r3"
 
-SRC_URI = "svn://svn.berlios.de/svnroot/repos/tslib/tags/tslib;module=${PV};proto=http \
-           file://ts.conf file://ts-2.6.conf \
-           file://ts.conf-h3600-2.4 file://ts.conf-simpad-2.4 \
-           file://ts.conf-corgi-2.4 file://ts.conf-collie-2.4 \
-          file://tslib.sh"
+SRC_URI = "http://download.berlios.de/tslib/tslib-1.0.tar.bz2 \
+           file://ts.conf \
+           file://ts.conf-h3600-2.4 \
+           file://ts.conf-simpad-2.4 \
+           file://ts.conf-corgi-2.4 \
+           file://ts.conf-collie-2.4 \
+           file://tslib.sh"
 SRC_URI_append_mnci += " file://devfs.patch;patch=1"
 SRC_URI_append_mnci += " file://event1.patch;patch=1"
-S = "${WORKDIR}/${PV}"
-LICENSE = "LGPL"
-CONFFILES_${PN} = "${sysconfdir}/ts.conf"
 
 inherit autotools pkgconfig
 
-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 () {
-autotools_stage_all
+do_stage() {
+       autotools_stage_all
 }
 
-do_install_prepend () {
+do_install_prepend() {
        install -m 0644 ${WORKDIR}/ts.conf ${S}/etc/ts.conf
 }
 
@@ -37,44 +33,55 @@ 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 | h6300 | h2200 | ipaq-pxa270 | blueangel)
+       a780 | e680 | h3600 | h3900 | h5xxx | h1940 | h6300 | h2200 | ipaq-pxa270 | hx4700 | hx2000 | blueangel | h4000)
                install -d ${D}${datadir}/tslib
-               for f in ts-2.6.conf ts.conf-h3600-2.4; do
-                       install -m 0644 ${WORKDIR}/$f ${D}${datadir}/tslib/
-               done
-               rm -f ${D}${sysconfdir}/ts.conf
+               install -m 0644 ${WORKDIR}/ts.conf-h3600-2.4 ${D}${datadir}/tslib/
                ;;
        c7x0 | spitz | akita | tosa )
                install -d ${D}${datadir}/tslib
-               for f in ts-2.6.conf ts.conf-corgi-2.4; do
-                       install -m 0644 ${WORKDIR}/$f ${D}${datadir}/tslib/
-               done
-               rm -f ${D}${sysconfdir}/ts.conf
+               install -m 0644 ${WORKDIR}/ts.conf-corgi-2.4 ${D}${datadir}/tslib/
                ;;
        collie | poodle )
                install -d ${D}${datadir}/tslib
-               for f in ts-2.6.conf ts.conf-collie-2.4; do
-                       install -m 0644 ${WORKDIR}/$f ${D}${datadir}/tslib/
-               done
-               rm -f ${D}${sysconfdir}/ts.conf
+               install -m 0644 ${WORKDIR}/ts.conf-collie-2.4 ${D}${datadir}/tslib/
                ;;
 
        simpad )
                install -d ${D}${datadir}/tslib
-               for f in ts-2.6.conf ts.conf-simpad-2.4; do
-                       install -m 0644 ${WORKDIR}/$f ${D}${datadir}/tslib/
-               done
-               rm -f ${D}${sysconfdir}/ts.conf
+               install -m 0644 ${WORKDIR}/ts.conf-simpad-2.4 ${D}${datadir}/tslib/
                ;;
        *)
                ;;
        esac
 }
 
-RDEPENDS_libts = "tslib-conf"
+SRC_URI_OVERRIDES_PACKAGE_ARCH = "0"
+
+# People should consider using udev's /dev/input/touchscreen0 symlink 
+# instead of detect-stylus
+RDEPENDS_tslib-conf_h1940 = "detect-stylus"
+RDEPENDS_tslib-conf_h3600 = "detect-stylus"
+RDEPENDS_tslib-conf_h3900 = "detect-stylus"
+RDEPENDS_tslib-conf_h6300 = "detect-stylus"
+RDEPENDS_tslib-conf_blueangel = "detect-stylus"
+RDEPENDS_tslib-conf_htcuniversal = "detect-stylus"
+RDEPENDS_tslib-conf_h4000 = "detect-stylus"
+RPROVIDES_tslib-conf = "libts-0.0-conf"
+
+PACKAGE_ARCH_tslib-conf = "${MACHINE_ARCH}"
+PACKAGE_ARCH_mnci = "${MACHINE_ARCH}"
+
+PACKAGES =+ "tslib-conf libts-dev tslib-tests tslib-calibrate"
+DEBIAN_NOAUTONAME_tslib-conf = "1"
+DEBIAN_NOAUTONAME_tslib-tests = "1"
+DEBIAN_NOAUTONAME_tslib-calibrate = "1"
+
+RDEPENDS_${PN} = "tslib-conf"
+
 
+FILES_${PN}-dbg += "${libdir}/ts/.debug*"
 FILES_tslib-conf = "${sysconfdir}/ts.conf ${sysconfdir}/profile.d/tslib.sh ${datadir}/tslib"
-FILES_libts = "${libdir}/*.so.* ${libdir}/ts/*.so*"
+FILES_${PN} = "${libdir}/*.so.* ${libdir}/ts/*.so*"
 FILES_libts-dev = "${FILES_tslib-dev}"
 FILES_tslib-calibrate += "${bindir}/ts_calibrate"
 FILES_tslib-tests = "${bindir}/ts_harvest ${bindir}/ts_print ${bindir}/ts_print_raw ${bindir}/ts_test"