tslib: Add 2.6 kernel handling for collie/poodle. Instead of every device using a...

diff --git a/packages/tslib/tslib/akita/tslib.sh b/packages/tslib/tslib/akita/tslib.sh
index dc7484c..218da07 100644 (file)
--- a/packages/tslib/tslib/akita/tslib.sh
+++ b/packages/tslib/tslib/akita/tslib.sh
@@ -9,7 +9,7 @@ case `uname -r` in
 *)
        TSLIB_TSDEVICE=/dev/input/event1
        TSLIB_TSEVENTTYPE=INPUT
-       TSLIB_CONFFILE=/usr/share/tslib/ts.conf-corgi
+       TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf
        ;;
 esac
 

diff --git a/packages/tslib/tslib/borzoi/tslib.sh b/packages/tslib/tslib/borzoi/tslib.sh
index dc7484c..218da07 100644 (file)
--- a/packages/tslib/tslib/borzoi/tslib.sh
+++ b/packages/tslib/tslib/borzoi/tslib.sh
@@ -9,7 +9,7 @@ case `uname -r` in
 *)
        TSLIB_TSDEVICE=/dev/input/event1
        TSLIB_TSEVENTTYPE=INPUT
-       TSLIB_CONFFILE=/usr/share/tslib/ts.conf-corgi
+       TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf
        ;;
 esac
 

diff --git a/packages/tslib/tslib/c7x0/tslib.sh b/packages/tslib/tslib/c7x0/tslib.sh
index dc7484c..218da07 100644 (file)
--- a/packages/tslib/tslib/c7x0/tslib.sh
+++ b/packages/tslib/tslib/c7x0/tslib.sh
@@ -9,7 +9,7 @@ case `uname -r` in
 *)
        TSLIB_TSDEVICE=/dev/input/event1
        TSLIB_TSEVENTTYPE=INPUT
-       TSLIB_CONFFILE=/usr/share/tslib/ts.conf-corgi
+       TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf
        ;;
 esac
 

diff --git a/packages/tslib/tslib/collie/tslib.sh b/packages/tslib/tslib/collie/tslib.sh
index 187b7ce..d9cc02c 100644 (file)
--- a/packages/tslib/tslib/collie/tslib.sh
+++ b/packages/tslib/tslib/collie/tslib.sh
@@ -1,10 +1,16 @@
 #!/bin/sh
 
-if (uname -r|grep -q 'embedix'); then
+case `uname -r` in
+2.4*)
        TSLIB_TSDEVICE=/dev/ts
        TSLIB_TSEVENTTYPE=COLLIE
-else
-       TSLIB_TSDEVICE=/dev/input/event0
-fi
+       TSLIB_CONFFILE=/usr/share/tslib/ts.conf-collie-2.4
+       ;;
+*)
+       TSLIB_TSDEVICE=/dev/input/event1
+       TSLIB_TSEVENTTYPE=INPUT
+       TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf
+       ;;
+esac
 
-export TSLIB_TSDEVICE TSLIB_TSEVENTTYPE
+export TSLIB_TSDEVICE TSLIB_TSEVENTTYPE TSLIB_CONFFILE

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

diff --git a/packages/tslib/tslib/h2200/tslib.sh b/packages/tslib/tslib/h2200/tslib.sh
index be9448b..0de3534 100644 (file)
--- a/packages/tslib/tslib/h2200/tslib.sh
+++ b/packages/tslib/tslib/h2200/tslib.sh
@@ -11,7 +11,7 @@ case `uname -r` in
        ;;
 *)
        TSLIB_TSDEVICE=`detect-stylus --device`
-       TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h3600
+       TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf
        ;;
 esac
 

diff --git a/packages/tslib/tslib/h3600/tslib.sh b/packages/tslib/tslib/h3600/tslib.sh
index 5c446c2..3c27b07 100644 (file)
--- a/packages/tslib/tslib/h3600/tslib.sh
+++ b/packages/tslib/tslib/h3600/tslib.sh
@@ -7,7 +7,7 @@ case `uname -r` in
        ;;
 *)
        TSLIB_TSDEVICE=`detect-stylus --device`
-       TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h3600
+       TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf
        ;;
 esac
 

diff --git a/packages/tslib/tslib/h3900/tslib.sh b/packages/tslib/tslib/h3900/tslib.sh
index be9448b..0de3534 100644 (file)
--- a/packages/tslib/tslib/h3900/tslib.sh
+++ b/packages/tslib/tslib/h3900/tslib.sh
@@ -11,7 +11,7 @@ case `uname -r` in
        ;;
 *)
        TSLIB_TSDEVICE=`detect-stylus --device`
-       TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h3600
+       TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf
        ;;
 esac
 

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

diff --git a/packages/tslib/tslib/ipaq-pxa270/tslib.sh b/packages/tslib/tslib/ipaq-pxa270/tslib.sh
index 72ebcba..3adaba0 100644 (file)
--- a/packages/tslib/tslib/ipaq-pxa270/tslib.sh
+++ b/packages/tslib/tslib/ipaq-pxa270/tslib.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 TSLIB_TSDEVICE=`detect-stylus --device`
-TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h3600
+TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf
 
 export TSLIB_TSDEVICE TSLIB_CONFFILE

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

diff --git a/packages/tslib/tslib/poodle/tslib.sh b/packages/tslib/tslib/poodle/tslib.sh
index 187b7ce..d9cc02c 100644 (file)
--- a/packages/tslib/tslib/poodle/tslib.sh
+++ b/packages/tslib/tslib/poodle/tslib.sh
@@ -1,10 +1,16 @@
 #!/bin/sh
 
-if (uname -r|grep -q 'embedix'); then
+case `uname -r` in
+2.4*)
        TSLIB_TSDEVICE=/dev/ts
        TSLIB_TSEVENTTYPE=COLLIE
-else
-       TSLIB_TSDEVICE=/dev/input/event0
-fi
+       TSLIB_CONFFILE=/usr/share/tslib/ts.conf-collie-2.4
+       ;;
+*)
+       TSLIB_TSDEVICE=/dev/input/event1
+       TSLIB_TSEVENTTYPE=INPUT
+       TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf
+       ;;
+esac
 
-export TSLIB_TSDEVICE TSLIB_TSEVENTTYPE
+export TSLIB_TSDEVICE TSLIB_TSEVENTTYPE TSLIB_CONFFILE

diff --git a/packages/tslib/tslib/simpad/tslib.sh b/packages/tslib/tslib/simpad/tslib.sh
index 8bb94a0..5301239 100644 (file)
--- a/packages/tslib/tslib/simpad/tslib.sh
+++ b/packages/tslib/tslib/simpad/tslib.sh
@@ -7,7 +7,7 @@ case `uname -r` in
        ;;
 *)
        TSLIB_TSDEVICE=/dev/input/event0
-       TSLIB_CONFFILE=/usr/share/tslib/ts.conf-simpad
+       TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf
        ;;
 esac
 

diff --git a/packages/tslib/tslib/spitz/tslib.sh b/packages/tslib/tslib/spitz/tslib.sh
index dc7484c..218da07 100644 (file)
--- a/packages/tslib/tslib/spitz/tslib.sh
+++ b/packages/tslib/tslib/spitz/tslib.sh
@@ -9,7 +9,7 @@ case `uname -r` in
 *)
        TSLIB_TSDEVICE=/dev/input/event1
        TSLIB_TSEVENTTYPE=INPUT
-       TSLIB_CONFFILE=/usr/share/tslib/ts.conf-corgi
+       TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf
        ;;
 esac
 

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

diff --git a/packages/tslib/tslib/tosa/tslib.sh b/packages/tslib/tslib/tosa/tslib.sh
index dc7484c..218da07 100644 (file)
--- a/packages/tslib/tslib/tosa/tslib.sh
+++ b/packages/tslib/tslib/tosa/tslib.sh
@@ -9,7 +9,7 @@ case `uname -r` in
 *)
        TSLIB_TSDEVICE=/dev/input/event1
        TSLIB_TSEVENTTYPE=INPUT
-       TSLIB_CONFFILE=/usr/share/tslib/ts.conf-corgi
+       TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf
        ;;
 esac
 

diff --git a/packages/tslib/tslib/collie/ts.conf b/packages/tslib/tslib/ts.conf-collie-2.4
similarity index 100%
rename from packages/tslib/tslib/collie/ts.conf
rename to packages/tslib/tslib/ts.conf-collie-2.4

diff --git a/packages/tslib/tslib/ts.conf-corgi b/packages/tslib/tslib/ts.conf-corgi
deleted file mode 100644 (file)
index 0930971..0000000
--- a/packages/tslib/tslib/ts.conf-corgi
+++ /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/packages/tslib/tslib/ts.conf-h2200 b/packages/tslib/tslib/ts.conf-h2200
deleted file mode 100644 (file)
index 0930971..0000000
--- a/packages/tslib/tslib/ts.conf-h2200
+++ /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/packages/tslib/tslib/ts.conf-h3600 b/packages/tslib/tslib/ts.conf-h3600
deleted file mode 100644 (file)
index 0930971..0000000
--- a/packages/tslib/tslib/ts.conf-h3600
+++ /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/packages/tslib/tslib/ts.conf-h6300 b/packages/tslib/tslib/ts.conf-h6300
deleted file mode 100644 (file)
index 0930971..0000000
--- a/packages/tslib/tslib/ts.conf-h6300
+++ /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/packages/tslib/tslib/ts.conf-simpad b/packages/tslib/tslib/ts.conf-simpad
deleted file mode 100644 (file)
index 0930971..0000000
--- a/packages/tslib/tslib/ts.conf-simpad
+++ /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/packages/tslib/tslib_cvs.bb b/packages/tslib/tslib_cvs.bb
index 2513a43..02f0c55 100644 (file)
--- a/packages/tslib/tslib_cvs.bb
+++ b/packages/tslib/tslib_cvs.bb
@@ -1,17 +1,16 @@
 SECTION = "base"
 DESCRIPTION = "tslib is a touchscreen access library."
 PV = "0.0+cvs${SRCDATE}"
-PR = "r32"
+PR = "r33"
 
 SRC_URI_OVERRIDES_PACKAGE_ARCH = "0"
 PACKAGE_ARCH_tslib-conf = "${MACHINE_ARCH}"
 PACKAGE_ARCH_mnci = "${MACHINE_ARCH}"
 
 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://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_append_mnci += " file://devfs.patch;patch=1"
 SRC_URI_append_mnci += " file://event1.patch;patch=1"
@@ -40,21 +39,29 @@ do_install_append() {
        case ${MACHINE} in
        h3600 | h3900 | h1940 | h6300 | h2200 | ipaq-pxa270 | blueangel)
                install -d ${D}${datadir}/tslib
-               for f in ts.conf-h3600 ts.conf-h3600-2.4 ts.conf-h6300; do
+               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
                ;;
        c7x0 | spitz | akita | tosa | borzoi )
                install -d ${D}${datadir}/tslib
-               for f in ts.conf-corgi ts.conf-corgi-2.4; do
+               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
                ;;
+       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
+               ;;
+
        simpad )
                install -d ${D}${datadir}/tslib
-               for f in ts.conf-simpad ts.conf-simpad-2.4; do
+               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