summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2006-11-21 09:58:11 +0000
committerRichard Purdie <richard@openedhand.com>2006-11-21 09:58:11 +0000
commitc24ce903757193dd686ce2f6614ee548d919646a (patch)
treea7548c1854ef15655d28de430eca4de92b7f5b57 /meta
parentc0d040f1e7656d13c098474cc13c44683a742391 (diff)
downloadpoky-c24ce903757193dd686ce2f6614ee548d919646a.tar.gz
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
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/tslib/tslib/a780/tslib.sh6
-rw-r--r--meta/packages/tslib/tslib/akita/tslib.sh11
-rw-r--r--meta/packages/tslib/tslib/c7x0/tslib.sh11
-rw-r--r--meta/packages/tslib/tslib/collie/tslib.sh11
-rw-r--r--meta/packages/tslib/tslib/e680/tslib.sh6
-rw-r--r--meta/packages/tslib/tslib/h1940/tslib.sh2
-rw-r--r--meta/packages/tslib/tslib/h2200/tslib.sh14
-rw-r--r--meta/packages/tslib/tslib/h3600/tslib.sh7
-rw-r--r--meta/packages/tslib/tslib/h3900/tslib.sh9
-rw-r--r--meta/packages/tslib/tslib/h4000/tslib.sh14
-rw-r--r--meta/packages/tslib/tslib/h5xxx/tslib.sh14
-rw-r--r--meta/packages/tslib/tslib/h6300/tslib.sh2
-rw-r--r--meta/packages/tslib/tslib/htcuniversal/ts.conf (renamed from meta/packages/tslib/tslib/nokia770/ts.conf)0
-rw-r--r--meta/packages/tslib/tslib/htcuniversal/tslib.sh6
-rw-r--r--meta/packages/tslib/tslib/hx2000/tslib.sh6
-rw-r--r--meta/packages/tslib/tslib/hx4700/tslib.sh6
-rw-r--r--meta/packages/tslib/tslib/ipaq-pxa270/tslib.sh2
-rw-r--r--meta/packages/tslib/tslib/jornada56x/tslib.sh3
-rw-r--r--meta/packages/tslib/tslib/jornada6xx/tslib.sh3
-rw-r--r--meta/packages/tslib/tslib/jornada7xx/tslib.sh5
-rw-r--r--meta/packages/tslib/tslib/netbook-pro/ts.conf5
-rw-r--r--meta/packages/tslib/tslib/netbook-pro/tslib.sh5
-rw-r--r--meta/packages/tslib/tslib/nokia770/tslib.sh4
-rw-r--r--meta/packages/tslib/tslib/omap1610h2/ts.conf5
-rw-r--r--meta/packages/tslib/tslib/omap5912osk/ts.conf6
-rw-r--r--meta/packages/tslib/tslib/poodle/tslib.sh11
-rw-r--r--meta/packages/tslib/tslib/qemuarm/ts.conf5
-rw-r--r--meta/packages/tslib/tslib/qemuarm/tslib.sh3
-rw-r--r--meta/packages/tslib/tslib/simpad/tslib.sh7
-rw-r--r--meta/packages/tslib/tslib/tosa/tslib.sh11
-rw-r--r--meta/packages/tslib/tslib/ts-2.6.conf5
-rw-r--r--meta/packages/tslib/tslib/ts.conf2
-rw-r--r--meta/packages/tslib/tslib/usec_fix.patch26
-rw-r--r--meta/packages/tslib/tslib_1.0.bb83
34 files changed, 165 insertions, 151 deletions
diff --git a/meta/packages/tslib/tslib/a780/tslib.sh b/meta/packages/tslib/tslib/a780/tslib.sh
new file mode 100644
index 0000000000..51cd0f1f36
--- /dev/null
+++ b/meta/packages/tslib/tslib/a780/tslib.sh
@@ -0,0 +1,6 @@
1#!/bin/sh
2
3TSLIB_TSDEVICE=/dev/input/event1
4TSLIB_CONFFILE=/etc/ts.conf
5
6export TSLIB_TSDEVICE TSLIB_CONFFILE
diff --git a/meta/packages/tslib/tslib/akita/tslib.sh b/meta/packages/tslib/tslib/akita/tslib.sh
index 0c8b1a12b9..0ff219b31f 100644
--- a/meta/packages/tslib/tslib/akita/tslib.sh
+++ b/meta/packages/tslib/tslib/akita/tslib.sh
@@ -1,16 +1,13 @@
1#!/bin/sh 1#!/bin/sh
2 2
3TSLIB_TSDEVICE=/dev/input/touchscreen0
4TSLIB_CONFFILE=/etc/ts.conf
5
3case `uname -r` in 6case `uname -r` in
42.4*) 72.4*)
5 TSLIB_TSDEVICE=/dev/ts 8 TSLIB_TSDEVICE=/dev/ts
6 TSLIB_TSEVENTTYPE=CORGI
7 TSLIB_CONFFILE=/usr/share/tslib/ts.conf-corgi-2.4 9 TSLIB_CONFFILE=/usr/share/tslib/ts.conf-corgi-2.4
8 ;; 10 ;;
9*)
10 TSLIB_TSDEVICE=/dev/input/touchscreen0
11 TSLIB_TSEVENTTYPE=INPUT
12 TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf
13 ;;
14esac 11esac
15 12
16export TSLIB_TSDEVICE TSLIB_TSEVENTTYPE TSLIB_CONFFILE 13export TSLIB_TSDEVICE TSLIB_CONFFILE
diff --git a/meta/packages/tslib/tslib/c7x0/tslib.sh b/meta/packages/tslib/tslib/c7x0/tslib.sh
index 0c8b1a12b9..0ff219b31f 100644
--- a/meta/packages/tslib/tslib/c7x0/tslib.sh
+++ b/meta/packages/tslib/tslib/c7x0/tslib.sh
@@ -1,16 +1,13 @@
1#!/bin/sh 1#!/bin/sh
2 2
3TSLIB_TSDEVICE=/dev/input/touchscreen0
4TSLIB_CONFFILE=/etc/ts.conf
5
3case `uname -r` in 6case `uname -r` in
42.4*) 72.4*)
5 TSLIB_TSDEVICE=/dev/ts 8 TSLIB_TSDEVICE=/dev/ts
6 TSLIB_TSEVENTTYPE=CORGI
7 TSLIB_CONFFILE=/usr/share/tslib/ts.conf-corgi-2.4 9 TSLIB_CONFFILE=/usr/share/tslib/ts.conf-corgi-2.4
8 ;; 10 ;;
9*)
10 TSLIB_TSDEVICE=/dev/input/touchscreen0
11 TSLIB_TSEVENTTYPE=INPUT
12 TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf
13 ;;
14esac 11esac
15 12
16export TSLIB_TSDEVICE TSLIB_TSEVENTTYPE TSLIB_CONFFILE 13export TSLIB_TSDEVICE TSLIB_CONFFILE
diff --git a/meta/packages/tslib/tslib/collie/tslib.sh b/meta/packages/tslib/tslib/collie/tslib.sh
index 759d5cf091..664bda426a 100644
--- a/meta/packages/tslib/tslib/collie/tslib.sh
+++ b/meta/packages/tslib/tslib/collie/tslib.sh
@@ -1,16 +1,13 @@
1#!/bin/sh 1#!/bin/sh
2 2
3TSLIB_TSDEVICE=/dev/input/touchscreen0
4TSLIB_CONFFILE=/etc/ts.conf
5
3case `uname -r` in 6case `uname -r` in
42.4*) 72.4*)
5 TSLIB_TSDEVICE=/dev/ts 8 TSLIB_TSDEVICE=/dev/ts
6 TSLIB_TSEVENTTYPE=COLLIE
7 TSLIB_CONFFILE=/usr/share/tslib/ts.conf-collie-2.4 9 TSLIB_CONFFILE=/usr/share/tslib/ts.conf-collie-2.4
8 ;; 10 ;;
9*)
10 TSLIB_TSDEVICE=/dev/input/touchscreen0
11 TSLIB_TSEVENTTYPE=INPUT
12 TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf
13 ;;
14esac 11esac
15 12
16export TSLIB_TSDEVICE TSLIB_TSEVENTTYPE TSLIB_CONFFILE 13export 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
index 0000000000..51cd0f1f36
--- /dev/null
+++ b/meta/packages/tslib/tslib/e680/tslib.sh
@@ -0,0 +1,6 @@
1#!/bin/sh
2
3TSLIB_TSDEVICE=/dev/input/event1
4TSLIB_CONFFILE=/etc/ts.conf
5
6export TSLIB_TSDEVICE TSLIB_CONFFILE
diff --git a/meta/packages/tslib/tslib/h1940/tslib.sh b/meta/packages/tslib/tslib/h1940/tslib.sh
index d83673e259..7dbf4ae9f1 100644
--- a/meta/packages/tslib/tslib/h1940/tslib.sh
+++ b/meta/packages/tslib/tslib/h1940/tslib.sh
@@ -1,7 +1,7 @@
1#!/bin/sh 1#!/bin/sh
2 2
3TSLIB_TSDEVICE=`detect-stylus --device` 3TSLIB_TSDEVICE=`detect-stylus --device`
4TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf 4TSLIB_CONFFILE=/etc/ts.conf
5QWS_MOUSE_PROTO=TPanel 5QWS_MOUSE_PROTO=TPanel
6 6
7export TSLIB_TSDEVICE TSLIB_CONFFILE QWS_MOUSE_PROTO 7export 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
index 0000000000..b096bfb96e
--- /dev/null
+++ b/meta/packages/tslib/tslib/h2200/tslib.sh
@@ -0,0 +1,14 @@
1#!/bin/sh
2
3TSLIB_TSDEVICE=/dev/input/touchscreen0
4TSLIB_CONFFILE=/etc/ts.conf
5
6case `uname -r` in
72.4*)
8 TSLIB_TSDEVICE=/dev/touchscreen/0raw
9 TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h3600-2.4
10 ;;
11esac
12
13export TSLIB_TSDEVICE TSLIB_CONFFILE
14
diff --git a/meta/packages/tslib/tslib/h3600/tslib.sh b/meta/packages/tslib/tslib/h3600/tslib.sh
index 3c27b075f7..6c480f46af 100644
--- a/meta/packages/tslib/tslib/h3600/tslib.sh
+++ b/meta/packages/tslib/tslib/h3600/tslib.sh
@@ -1,14 +1,13 @@
1#!/bin/sh 1#!/bin/sh
2 2
3TSLIB_TSDEVICE=`detect-stylus --device`
4TSLIB_CONFFILE=/etc/ts.conf
5
3case `uname -r` in 6case `uname -r` in
42.4*) 72.4*)
5 TSLIB_TSDEVICE=/dev/touchscreen/0raw 8 TSLIB_TSDEVICE=/dev/touchscreen/0raw
6 TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h3600-2.4 9 TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h3600-2.4
7 ;; 10 ;;
8*)
9 TSLIB_TSDEVICE=`detect-stylus --device`
10 TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf
11 ;;
12esac 11esac
13 12
14export TSLIB_TSDEVICE TSLIB_CONFFILE 13export TSLIB_TSDEVICE TSLIB_CONFFILE
diff --git a/meta/packages/tslib/tslib/h3900/tslib.sh b/meta/packages/tslib/tslib/h3900/tslib.sh
index 0de3534a51..6c480f46af 100644
--- a/meta/packages/tslib/tslib/h3900/tslib.sh
+++ b/meta/packages/tslib/tslib/h3900/tslib.sh
@@ -1,18 +1,13 @@
1#!/bin/sh 1#!/bin/sh
2 2
3module_id() { 3TSLIB_TSDEVICE=`detect-stylus --device`
4 awk 'BEGIN { FS=": " } /Hardware/ { print $2 } ' </proc/cpuinfo 4TSLIB_CONFFILE=/etc/ts.conf
5}
6 5
7case `uname -r` in 6case `uname -r` in
82.4*) 72.4*)
9 TSLIB_TSDEVICE=/dev/touchscreen/0raw 8 TSLIB_TSDEVICE=/dev/touchscreen/0raw
10 TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h3600-2.4 9 TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h3600-2.4
11 ;; 10 ;;
12*)
13 TSLIB_TSDEVICE=`detect-stylus --device`
14 TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf
15 ;;
16esac 11esac
17 12
18export TSLIB_TSDEVICE TSLIB_CONFFILE 13export 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
index 0000000000..6c480f46af
--- /dev/null
+++ b/meta/packages/tslib/tslib/h4000/tslib.sh
@@ -0,0 +1,14 @@
1#!/bin/sh
2
3TSLIB_TSDEVICE=`detect-stylus --device`
4TSLIB_CONFFILE=/etc/ts.conf
5
6case `uname -r` in
72.4*)
8 TSLIB_TSDEVICE=/dev/touchscreen/0raw
9 TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h3600-2.4
10 ;;
11esac
12
13export TSLIB_TSDEVICE TSLIB_CONFFILE
14
diff --git a/meta/packages/tslib/tslib/h5xxx/tslib.sh b/meta/packages/tslib/tslib/h5xxx/tslib.sh
new file mode 100644
index 0000000000..b096bfb96e
--- /dev/null
+++ b/meta/packages/tslib/tslib/h5xxx/tslib.sh
@@ -0,0 +1,14 @@
1#!/bin/sh
2
3TSLIB_TSDEVICE=/dev/input/touchscreen0
4TSLIB_CONFFILE=/etc/ts.conf
5
6case `uname -r` in
72.4*)
8 TSLIB_TSDEVICE=/dev/touchscreen/0raw
9 TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h3600-2.4
10 ;;
11esac
12
13export TSLIB_TSDEVICE TSLIB_CONFFILE
14
diff --git a/meta/packages/tslib/tslib/h6300/tslib.sh b/meta/packages/tslib/tslib/h6300/tslib.sh
index 548bc918ff..b3318fd820 100644
--- a/meta/packages/tslib/tslib/h6300/tslib.sh
+++ b/meta/packages/tslib/tslib/h6300/tslib.sh
@@ -1,7 +1,7 @@
1#!/bin/sh 1#!/bin/sh
2 2
3TSLIB_TSDEVICE=`detect-stylus --device` 3TSLIB_TSDEVICE=`detect-stylus --device`
4TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf 4TSLIB_CONFFILE=/etc/ts.conf
5 5
6export TSLIB_TSDEVICE TSLIB_CONFFILE 6export TSLIB_TSDEVICE TSLIB_CONFFILE
7 7
diff --git a/meta/packages/tslib/tslib/nokia770/ts.conf b/meta/packages/tslib/tslib/htcuniversal/ts.conf
index 09309719f2..09309719f2 100644
--- a/meta/packages/tslib/tslib/nokia770/ts.conf
+++ b/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
index 0000000000..cc7e6b724a
--- /dev/null
+++ b/meta/packages/tslib/tslib/htcuniversal/tslib.sh
@@ -0,0 +1,6 @@
1#!/bin/sh
2
3TSLIB_TSDEVICE=`detect-stylus --device`
4TSLIB_CONFFILE=/etc/ts.conf
5
6export 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
index 0000000000..586d5c7deb
--- /dev/null
+++ b/meta/packages/tslib/tslib/hx2000/tslib.sh
@@ -0,0 +1,6 @@
1#!/bin/sh
2
3TSLIB_TSDEVICE=/dev/input/touchscreen0
4TSLIB_CONFFILE=/etc/ts.conf
5
6export 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
index 0000000000..586d5c7deb
--- /dev/null
+++ b/meta/packages/tslib/tslib/hx4700/tslib.sh
@@ -0,0 +1,6 @@
1#!/bin/sh
2
3TSLIB_TSDEVICE=/dev/input/touchscreen0
4TSLIB_CONFFILE=/etc/ts.conf
5
6export 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 3a6ba78c50..586d5c7deb 100644
--- a/meta/packages/tslib/tslib/ipaq-pxa270/tslib.sh
+++ b/meta/packages/tslib/tslib/ipaq-pxa270/tslib.sh
@@ -1,6 +1,6 @@
1#!/bin/sh 1#!/bin/sh
2 2
3TSLIB_TSDEVICE=/dev/input/touchscreen0 3TSLIB_TSDEVICE=/dev/input/touchscreen0
4TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf 4TSLIB_CONFFILE=/etc/ts.conf
5 5
6export TSLIB_TSDEVICE TSLIB_CONFFILE 6export TSLIB_TSDEVICE TSLIB_CONFFILE
diff --git a/meta/packages/tslib/tslib/jornada56x/tslib.sh b/meta/packages/tslib/tslib/jornada56x/tslib.sh
index a93d2d3ef0..8f907b0755 100644
--- a/meta/packages/tslib/tslib/jornada56x/tslib.sh
+++ b/meta/packages/tslib/tslib/jornada56x/tslib.sh
@@ -1,6 +1,5 @@
1#!/bin/sh 1#!/bin/sh
2 2
3TSLIB_TSDEVICE=/dev/input/tsraw0 3TSLIB_TSDEVICE=/dev/input/tsraw0
4TSLIB_TSEVENTTYPE=H3600
5 4
6export TSLIB_TSDEVICE TSLIB_TSEVENTTYPE 5export TSLIB_TSDEVICE
diff --git a/meta/packages/tslib/tslib/jornada6xx/tslib.sh b/meta/packages/tslib/tslib/jornada6xx/tslib.sh
index e64f644b74..1b5db781c1 100644
--- a/meta/packages/tslib/tslib/jornada6xx/tslib.sh
+++ b/meta/packages/tslib/tslib/jornada6xx/tslib.sh
@@ -1,6 +1,5 @@
1#!/bin/sh 1#!/bin/sh
2 2
3TSLIB_TSDEVICE=/dev/input/ts0 3TSLIB_TSDEVICE=/dev/input/ts0
4TSLIB_TSEVENTTYPE=H3600
5 4
6export TSLIB_TSDEVICE TSLIB_TSEVENTTYPE 5export TSLIB_TSDEVICE
diff --git a/meta/packages/tslib/tslib/jornada7xx/tslib.sh b/meta/packages/tslib/tslib/jornada7xx/tslib.sh
index a93d2d3ef0..1b5db781c1 100644
--- a/meta/packages/tslib/tslib/jornada7xx/tslib.sh
+++ b/meta/packages/tslib/tslib/jornada7xx/tslib.sh
@@ -1,6 +1,5 @@
1#!/bin/sh 1#!/bin/sh
2 2
3TSLIB_TSDEVICE=/dev/input/tsraw0 3TSLIB_TSDEVICE=/dev/input/ts0
4TSLIB_TSEVENTTYPE=H3600
5 4
6export TSLIB_TSDEVICE TSLIB_TSEVENTTYPE 5export 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
index 0000000000..6d94a8f468
--- /dev/null
+++ b/meta/packages/tslib/tslib/netbook-pro/ts.conf
@@ -0,0 +1,5 @@
1module_raw input
2module variance delta=80
3#module dejitter delta=2
4module linear
5
diff --git a/meta/packages/tslib/tslib/netbook-pro/tslib.sh b/meta/packages/tslib/tslib/netbook-pro/tslib.sh
new file mode 100644
index 0000000000..d31bc76368
--- /dev/null
+++ b/meta/packages/tslib/tslib/netbook-pro/tslib.sh
@@ -0,0 +1,5 @@
1#!/bin/sh
2
3TSLIB_TSDEVICE=`detect-stylus --device`
4
5export TSLIB_TSDEVICE
diff --git a/meta/packages/tslib/tslib/nokia770/tslib.sh b/meta/packages/tslib/tslib/nokia770/tslib.sh
index bcfe94a6b8..b7acc274c0 100644
--- a/meta/packages/tslib/tslib/nokia770/tslib.sh
+++ b/meta/packages/tslib/tslib/nokia770/tslib.sh
@@ -1,7 +1,5 @@
1#!/bin/sh 1#!/bin/sh
2 2
3TSLIB_TSDEVICE=/dev/input/touchscreen0 3TSLIB_TSDEVICE=/dev/input/touchscreen0
4TSLIB_TSEVENTTYPE=INPUT
5TSLIB_CONFFILE=/etc/ts.conf
6 4
7export TSLIB_TSDEVICE TSLIB_TSEVENTTYPE TSLIB_CONFFILE 5export TSLIB_TSDEVICE
diff --git a/meta/packages/tslib/tslib/omap1610h2/ts.conf b/meta/packages/tslib/tslib/omap1610h2/ts.conf
deleted file mode 100644
index 09309719f2..0000000000
--- a/meta/packages/tslib/tslib/omap1610h2/ts.conf
+++ /dev/null
@@ -1,5 +0,0 @@
1module_raw input
2module pthres pmin=1
3module variance delta=30
4module dejitter delta=100
5module linear
diff --git a/meta/packages/tslib/tslib/omap5912osk/ts.conf b/meta/packages/tslib/tslib/omap5912osk/ts.conf
deleted file mode 100644
index dc377cf86e..0000000000
--- a/meta/packages/tslib/tslib/omap5912osk/ts.conf
+++ /dev/null
@@ -1,6 +0,0 @@
1module_raw input
2
3module pthres pmin=1
4module variance delta=30
5module dejitter delta=100
6module linear
diff --git a/meta/packages/tslib/tslib/poodle/tslib.sh b/meta/packages/tslib/tslib/poodle/tslib.sh
index 759d5cf091..664bda426a 100644
--- a/meta/packages/tslib/tslib/poodle/tslib.sh
+++ b/meta/packages/tslib/tslib/poodle/tslib.sh
@@ -1,16 +1,13 @@
1#!/bin/sh 1#!/bin/sh
2 2
3TSLIB_TSDEVICE=/dev/input/touchscreen0
4TSLIB_CONFFILE=/etc/ts.conf
5
3case `uname -r` in 6case `uname -r` in
42.4*) 72.4*)
5 TSLIB_TSDEVICE=/dev/ts 8 TSLIB_TSDEVICE=/dev/ts
6 TSLIB_TSEVENTTYPE=COLLIE
7 TSLIB_CONFFILE=/usr/share/tslib/ts.conf-collie-2.4 9 TSLIB_CONFFILE=/usr/share/tslib/ts.conf-collie-2.4
8 ;; 10 ;;
9*)
10 TSLIB_TSDEVICE=/dev/input/touchscreen0
11 TSLIB_TSEVENTTYPE=INPUT
12 TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf
13 ;;
14esac 11esac
15 12
16export TSLIB_TSDEVICE TSLIB_TSEVENTTYPE TSLIB_CONFFILE 13export 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
index 09309719f2..0000000000
--- a/meta/packages/tslib/tslib/qemuarm/ts.conf
+++ /dev/null
@@ -1,5 +0,0 @@
1module_raw input
2module pthres pmin=1
3module variance delta=30
4module dejitter delta=100
5module linear
diff --git a/meta/packages/tslib/tslib/qemuarm/tslib.sh b/meta/packages/tslib/tslib/qemuarm/tslib.sh
index 0bc0d454e7..b7acc274c0 100644
--- a/meta/packages/tslib/tslib/qemuarm/tslib.sh
+++ b/meta/packages/tslib/tslib/qemuarm/tslib.sh
@@ -1,6 +1,5 @@
1#!/bin/sh 1#!/bin/sh
2 2
3TSLIB_TSDEVICE=/dev/input/touchscreen0 3TSLIB_TSDEVICE=/dev/input/touchscreen0
4TSLIB_TSEVENTTYPE=INPUT
5 4
6export TSLIB_TSDEVICE TSLIB_TSEVENTTYPE 5export TSLIB_TSDEVICE
diff --git a/meta/packages/tslib/tslib/simpad/tslib.sh b/meta/packages/tslib/tslib/simpad/tslib.sh
index 39b1c4ba58..9c4eb1e0f9 100644
--- a/meta/packages/tslib/tslib/simpad/tslib.sh
+++ b/meta/packages/tslib/tslib/simpad/tslib.sh
@@ -1,14 +1,13 @@
1#!/bin/sh 1#!/bin/sh
2 2
3TSLIB_TSDEVICE=/dev/input/touchscreen0
4TSLIB_CONFFILE=/etc/ts.conf
5
3case `uname -r` in 6case `uname -r` in
42.4*) 72.4*)
5 TSLIB_TSDEVICE=/dev/touchscreen/ucb1x00 8 TSLIB_TSDEVICE=/dev/touchscreen/ucb1x00
6 TSLIB_CONFFILE=/usr/share/tslib/ts.conf-simpad-2.4 9 TSLIB_CONFFILE=/usr/share/tslib/ts.conf-simpad-2.4
7 ;; 10 ;;
8*)
9 TSLIB_TSDEVICE=/dev/input/touchscreen0
10 TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf
11 ;;
12esac 11esac
13 12
14export TSLIB_TSDEVICE TSLIB_CONFFILE 13export TSLIB_TSDEVICE TSLIB_CONFFILE
diff --git a/meta/packages/tslib/tslib/tosa/tslib.sh b/meta/packages/tslib/tslib/tosa/tslib.sh
index 0c8b1a12b9..0ff219b31f 100644
--- a/meta/packages/tslib/tslib/tosa/tslib.sh
+++ b/meta/packages/tslib/tslib/tosa/tslib.sh
@@ -1,16 +1,13 @@
1#!/bin/sh 1#!/bin/sh
2 2
3TSLIB_TSDEVICE=/dev/input/touchscreen0
4TSLIB_CONFFILE=/etc/ts.conf
5
3case `uname -r` in 6case `uname -r` in
42.4*) 72.4*)
5 TSLIB_TSDEVICE=/dev/ts 8 TSLIB_TSDEVICE=/dev/ts
6 TSLIB_TSEVENTTYPE=CORGI
7 TSLIB_CONFFILE=/usr/share/tslib/ts.conf-corgi-2.4 9 TSLIB_CONFFILE=/usr/share/tslib/ts.conf-corgi-2.4
8 ;; 10 ;;
9*)
10 TSLIB_TSDEVICE=/dev/input/touchscreen0
11 TSLIB_TSEVENTTYPE=INPUT
12 TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf
13 ;;
14esac 11esac
15 12
16export TSLIB_TSDEVICE TSLIB_TSEVENTTYPE TSLIB_CONFFILE 13export 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
index 09309719f2..0000000000
--- a/meta/packages/tslib/tslib/ts-2.6.conf
+++ /dev/null
@@ -1,5 +0,0 @@
1module_raw input
2module pthres pmin=1
3module variance delta=30
4module dejitter delta=100
5module linear
diff --git a/meta/packages/tslib/tslib/ts.conf b/meta/packages/tslib/tslib/ts.conf
index dc5c4ded09..1b0da937e8 100644
--- a/meta/packages/tslib/tslib/ts.conf
+++ b/meta/packages/tslib/tslib/ts.conf
@@ -1,5 +1,5 @@
1# Uncomment if you wish to use the linux input layer event interface 1# Uncomment if you wish to use the linux input layer event interface
2# module_raw input 2module_raw input
3 3
4# Uncomment if you're using a Sharp Zaurus SL-5500/SL-5000d 4# Uncomment if you're using a Sharp Zaurus SL-5500/SL-5000d
5# module_raw collie 5# 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
index a791b39a3c..0000000000
--- a/meta/packages/tslib/tslib/usec_fix.patch
+++ /dev/null
@@ -1,26 +0,0 @@
1Index: work/tslib-0.0cvs20051201-r32/tslib/plugins/collie-raw.c
2===================================================================
3--- tslib.orig/plugins/collie-raw.c 2005-12-04 10:09:33.000000000 +0100
4+++ tslib/plugins/collie-raw.c 2005-12-04 10:16:05.000000000 +0100
5@@ -29,7 +29,7 @@
6 #ifdef DEBUG
7 fprintf(stderr,"RAW---------------------------> %d %d %d\n",samp->x,samp->y,samp->pressure);
8 #endif /*DEBUG*/
9- samp->tv.tv_usec = collie_evt->millisecs % 1000;
10+ samp->tv.tv_usec = (collie_evt->millisecs % 1000) * 1000;
11 samp->tv.tv_sec = collie_evt->millisecs / 1000;
12 samp++;
13 collie_evt++;
14Index: work/tslib-0.0cvs20051201-r32/tslib/plugins/corgi-raw.c
15===================================================================
16--- tslib.orig/plugins/corgi-raw.c 2005-12-04 10:10:19.000000000 +0100
17+++ tslib/plugins/corgi-raw.c 2005-12-04 10:16:15.000000000 +0100
18@@ -29,7 +29,7 @@
19 #ifdef DEBUG
20 fprintf(stderr,"RAW---------------------------> %d %d %d\n",samp->x,samp->y,samp->pressure);
21 #endif /*DEBUG*/
22- samp->tv.tv_usec = corgi_evt->millisecs % 1000;
23+ samp->tv.tv_usec = (corgi_evt->millisecs % 1000) * 1000;
24 samp->tv.tv_sec = corgi_evt->millisecs / 1000;
25 samp++;
26 corgi_evt++;
diff --git a/meta/packages/tslib/tslib_1.0.bb b/meta/packages/tslib/tslib_1.0.bb
index f63a8ddc7a..5e5f61cb35 100644
--- a/meta/packages/tslib/tslib_1.0.bb
+++ b/meta/packages/tslib/tslib_1.0.bb
@@ -1,35 +1,31 @@
1DESCRIPTION = "tslib is a plugin-based flexible touchscreen access library."
2HOMEPAGE = "http://cvs.arm.linux.org.uk/"
3AUTHOR = "Russell King w/ plugins by Chris Larson et. al."
1SECTION = "base" 4SECTION = "base"
2DESCRIPTION = "tslib is a touchscreen access library." 5LICENSE = "LGPL"
3PR = "r3"
4SRCDATE_tslib = "now"
5 6
6SRC_URI_OVERRIDES_PACKAGE_ARCH = "0" 7PR = "r3"
7PACKAGE_ARCH_tslib-conf = "${MACHINE_ARCH}"
8PACKAGE_ARCH_mnci = "${MACHINE_ARCH}"
9 8
10SRC_URI = "svn://svn.berlios.de/svnroot/repos/tslib/tags/tslib;module=${PV};proto=http \ 9SRC_URI = "http://download.berlios.de/tslib/tslib-1.0.tar.bz2 \
11 file://ts.conf file://ts-2.6.conf \ 10 file://ts.conf \
12 file://ts.conf-h3600-2.4 file://ts.conf-simpad-2.4 \ 11 file://ts.conf-h3600-2.4 \
13 file://ts.conf-corgi-2.4 file://ts.conf-collie-2.4 \ 12 file://ts.conf-simpad-2.4 \
14 file://tslib.sh" 13 file://ts.conf-corgi-2.4 \
14 file://ts.conf-collie-2.4 \
15 file://tslib.sh"
15SRC_URI_append_mnci += " file://devfs.patch;patch=1" 16SRC_URI_append_mnci += " file://devfs.patch;patch=1"
16SRC_URI_append_mnci += " file://event1.patch;patch=1" 17SRC_URI_append_mnci += " file://event1.patch;patch=1"
17S = "${WORKDIR}/${PV}"
18LICENSE = "LGPL"
19CONFFILES_${PN} = "${sysconfdir}/ts.conf"
20 18
21inherit autotools pkgconfig 19inherit autotools pkgconfig
22 20
23PACKAGES = "tslib-conf libts libts-dev tslib-tests tslib-calibrate"
24EXTRA_OECONF = "--enable-shared" 21EXTRA_OECONF = "--enable-shared"
25EXTRA_OECONF_mnci = "--enable-shared --disable-h3600 --enable-input --disable-corgi --disable-collie --disable-mk712 --disable-arctic2 --disable-ucb1x00 " 22EXTRA_OECONF_mnci = "--enable-shared --disable-h3600 --enable-input --disable-corgi --disable-collie --disable-mk712 --disable-arctic2 --disable-ucb1x00 "
26EXTRA_OECONF_beagle = "--enable-shared --enable-h3600 --disable-input --disable-corgi --disable-collie --disable-mk712 --disable-arctic2 --disable-ucb1x00 "
27 23
28do_stage () { 24do_stage() {
29autotools_stage_all 25 autotools_stage_all
30} 26}
31 27
32do_install_prepend () { 28do_install_prepend() {
33 install -m 0644 ${WORKDIR}/ts.conf ${S}/etc/ts.conf 29 install -m 0644 ${WORKDIR}/ts.conf ${S}/etc/ts.conf
34} 30}
35 31
@@ -37,44 +33,55 @@ do_install_append() {
37 install -d ${D}${sysconfdir}/profile.d/ 33 install -d ${D}${sysconfdir}/profile.d/
38 install -m 0755 ${WORKDIR}/tslib.sh ${D}${sysconfdir}/profile.d/ 34 install -m 0755 ${WORKDIR}/tslib.sh ${D}${sysconfdir}/profile.d/
39 case ${MACHINE} in 35 case ${MACHINE} in
40 h3600 | h3900 | h1940 | h6300 | h2200 | ipaq-pxa270 | blueangel) 36 a780 | e680 | h3600 | h3900 | h5xxx | h1940 | h6300 | h2200 | ipaq-pxa270 | hx4700 | hx2000 | blueangel | h4000)
41 install -d ${D}${datadir}/tslib 37 install -d ${D}${datadir}/tslib
42 for f in ts-2.6.conf ts.conf-h3600-2.4; do 38 install -m 0644 ${WORKDIR}/ts.conf-h3600-2.4 ${D}${datadir}/tslib/
43 install -m 0644 ${WORKDIR}/$f ${D}${datadir}/tslib/
44 done
45 rm -f ${D}${sysconfdir}/ts.conf
46 ;; 39 ;;
47 c7x0 | spitz | akita | tosa ) 40 c7x0 | spitz | akita | tosa )
48 install -d ${D}${datadir}/tslib 41 install -d ${D}${datadir}/tslib
49 for f in ts-2.6.conf ts.conf-corgi-2.4; do 42 install -m 0644 ${WORKDIR}/ts.conf-corgi-2.4 ${D}${datadir}/tslib/
50 install -m 0644 ${WORKDIR}/$f ${D}${datadir}/tslib/
51 done
52 rm -f ${D}${sysconfdir}/ts.conf
53 ;; 43 ;;
54 collie | poodle ) 44 collie | poodle )
55 install -d ${D}${datadir}/tslib 45 install -d ${D}${datadir}/tslib
56 for f in ts-2.6.conf ts.conf-collie-2.4; do 46 install -m 0644 ${WORKDIR}/ts.conf-collie-2.4 ${D}${datadir}/tslib/
57 install -m 0644 ${WORKDIR}/$f ${D}${datadir}/tslib/
58 done
59 rm -f ${D}${sysconfdir}/ts.conf
60 ;; 47 ;;
61 48
62 simpad ) 49 simpad )
63 install -d ${D}${datadir}/tslib 50 install -d ${D}${datadir}/tslib
64 for f in ts-2.6.conf ts.conf-simpad-2.4; do 51 install -m 0644 ${WORKDIR}/ts.conf-simpad-2.4 ${D}${datadir}/tslib/
65 install -m 0644 ${WORKDIR}/$f ${D}${datadir}/tslib/
66 done
67 rm -f ${D}${sysconfdir}/ts.conf
68 ;; 52 ;;
69 *) 53 *)
70 ;; 54 ;;
71 esac 55 esac
72} 56}
73 57
74RDEPENDS_libts = "tslib-conf" 58SRC_URI_OVERRIDES_PACKAGE_ARCH = "0"
59
60# People should consider using udev's /dev/input/touchscreen0 symlink
61# instead of detect-stylus
62RDEPENDS_tslib-conf_h1940 = "detect-stylus"
63RDEPENDS_tslib-conf_h3600 = "detect-stylus"
64RDEPENDS_tslib-conf_h3900 = "detect-stylus"
65RDEPENDS_tslib-conf_h6300 = "detect-stylus"
66RDEPENDS_tslib-conf_blueangel = "detect-stylus"
67RDEPENDS_tslib-conf_htcuniversal = "detect-stylus"
68RDEPENDS_tslib-conf_h4000 = "detect-stylus"
69RPROVIDES_tslib-conf = "libts-0.0-conf"
70
71PACKAGE_ARCH_tslib-conf = "${MACHINE_ARCH}"
72PACKAGE_ARCH_mnci = "${MACHINE_ARCH}"
73
74PACKAGES =+ "tslib-conf libts-dev tslib-tests tslib-calibrate"
75DEBIAN_NOAUTONAME_tslib-conf = "1"
76DEBIAN_NOAUTONAME_tslib-tests = "1"
77DEBIAN_NOAUTONAME_tslib-calibrate = "1"
78
79RDEPENDS_${PN} = "tslib-conf"
80
75 81
82FILES_${PN}-dbg += "${libdir}/ts/.debug*"
76FILES_tslib-conf = "${sysconfdir}/ts.conf ${sysconfdir}/profile.d/tslib.sh ${datadir}/tslib" 83FILES_tslib-conf = "${sysconfdir}/ts.conf ${sysconfdir}/profile.d/tslib.sh ${datadir}/tslib"
77FILES_libts = "${libdir}/*.so.* ${libdir}/ts/*.so*" 84FILES_${PN} = "${libdir}/*.so.* ${libdir}/ts/*.so*"
78FILES_libts-dev = "${FILES_tslib-dev}" 85FILES_libts-dev = "${FILES_tslib-dev}"
79FILES_tslib-calibrate += "${bindir}/ts_calibrate" 86FILES_tslib-calibrate += "${bindir}/ts_calibrate"
80FILES_tslib-tests = "${bindir}/ts_harvest ${bindir}/ts_print ${bindir}/ts_print_raw ${bindir}/ts_test" 87FILES_tslib-tests = "${bindir}/ts_harvest ${bindir}/ts_print ${bindir}/ts_print_raw ${bindir}/ts_test"