summaryrefslogtreecommitdiff
path: root/openembedded/packages/tslib
diff options
context:
space:
mode:
Diffstat (limited to 'openembedded/packages/tslib')
-rw-r--r--openembedded/packages/tslib/tslib/akita/tslib.sh2
-rw-r--r--openembedded/packages/tslib/tslib/c7x0/tslib.sh2
-rw-r--r--openembedded/packages/tslib/tslib/collie/tslib.sh16
-rw-r--r--openembedded/packages/tslib/tslib/h1940/tslib.sh2
-rw-r--r--openembedded/packages/tslib/tslib/h3600/tslib.sh2
-rw-r--r--openembedded/packages/tslib/tslib/h6300/tslib.sh2
-rw-r--r--openembedded/packages/tslib/tslib/ipaq-pxa270/tslib.sh2
-rw-r--r--openembedded/packages/tslib/tslib/poodle/tslib.sh16
-rw-r--r--openembedded/packages/tslib/tslib/spitz/tslib.sh2
-rw-r--r--openembedded/packages/tslib/tslib/tosa/ts.conf5
-rw-r--r--openembedded/packages/tslib/tslib/tosa/tslib.sh2
-rw-r--r--openembedded/packages/tslib/tslib/ts-2.6.conf (renamed from openembedded/packages/tslib/tslib/ts.conf-corgi)0
-rw-r--r--openembedded/packages/tslib/tslib/ts.conf-collie-2.4 (renamed from openembedded/packages/tslib/tslib/poodle/ts.conf)0
-rw-r--r--openembedded/packages/tslib/tslib/ts.conf-h22005
-rw-r--r--openembedded/packages/tslib/tslib/ts.conf-h36005
-rw-r--r--openembedded/packages/tslib/tslib/ts.conf-h63005
-rw-r--r--openembedded/packages/tslib/tslib/ts.conf-simpad5
-rw-r--r--openembedded/packages/tslib/tslib/usec_fix.patch26
-rw-r--r--openembedded/packages/tslib/tslib_cvs.bb24
19 files changed, 72 insertions, 51 deletions
diff --git a/openembedded/packages/tslib/tslib/akita/tslib.sh b/openembedded/packages/tslib/tslib/akita/tslib.sh
index dc7484cad..218da0751 100644
--- a/openembedded/packages/tslib/tslib/akita/tslib.sh
+++ b/openembedded/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/openembedded/packages/tslib/tslib/c7x0/tslib.sh b/openembedded/packages/tslib/tslib/c7x0/tslib.sh
index dc7484cad..218da0751 100644
--- a/openembedded/packages/tslib/tslib/c7x0/tslib.sh
+++ b/openembedded/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/openembedded/packages/tslib/tslib/collie/tslib.sh b/openembedded/packages/tslib/tslib/collie/tslib.sh
index 187b7ce6d..d9cc02cb1 100644
--- a/openembedded/packages/tslib/tslib/collie/tslib.sh
+++ b/openembedded/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/openembedded/packages/tslib/tslib/h1940/tslib.sh b/openembedded/packages/tslib/tslib/h1940/tslib.sh
index 5e5e28396..d83673e25 100644
--- a/openembedded/packages/tslib/tslib/h1940/tslib.sh
+++ b/openembedded/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/openembedded/packages/tslib/tslib/h3600/tslib.sh b/openembedded/packages/tslib/tslib/h3600/tslib.sh
index 5c446c261..3c27b075f 100644
--- a/openembedded/packages/tslib/tslib/h3600/tslib.sh
+++ b/openembedded/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/openembedded/packages/tslib/tslib/h6300/tslib.sh b/openembedded/packages/tslib/tslib/h6300/tslib.sh
index 21aaad9ca..548bc918f 100644
--- a/openembedded/packages/tslib/tslib/h6300/tslib.sh
+++ b/openembedded/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/openembedded/packages/tslib/tslib/ipaq-pxa270/tslib.sh b/openembedded/packages/tslib/tslib/ipaq-pxa270/tslib.sh
index 72ebcba7c..3adaba0de 100644
--- a/openembedded/packages/tslib/tslib/ipaq-pxa270/tslib.sh
+++ b/openembedded/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/openembedded/packages/tslib/tslib/poodle/tslib.sh b/openembedded/packages/tslib/tslib/poodle/tslib.sh
index 187b7ce6d..d9cc02cb1 100644
--- a/openembedded/packages/tslib/tslib/poodle/tslib.sh
+++ b/openembedded/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/openembedded/packages/tslib/tslib/spitz/tslib.sh b/openembedded/packages/tslib/tslib/spitz/tslib.sh
index dc7484cad..218da0751 100644
--- a/openembedded/packages/tslib/tslib/spitz/tslib.sh
+++ b/openembedded/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/openembedded/packages/tslib/tslib/tosa/ts.conf b/openembedded/packages/tslib/tslib/tosa/ts.conf
deleted file mode 100644
index 07fbbea2a..000000000
--- a/openembedded/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/openembedded/packages/tslib/tslib/tosa/tslib.sh b/openembedded/packages/tslib/tslib/tosa/tslib.sh
index dc7484cad..218da0751 100644
--- a/openembedded/packages/tslib/tslib/tosa/tslib.sh
+++ b/openembedded/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/openembedded/packages/tslib/tslib/ts.conf-corgi b/openembedded/packages/tslib/tslib/ts-2.6.conf
index 09309719f..09309719f 100644
--- a/openembedded/packages/tslib/tslib/ts.conf-corgi
+++ b/openembedded/packages/tslib/tslib/ts-2.6.conf
diff --git a/openembedded/packages/tslib/tslib/poodle/ts.conf b/openembedded/packages/tslib/tslib/ts.conf-collie-2.4
index 2099b9b41..2099b9b41 100644
--- a/openembedded/packages/tslib/tslib/poodle/ts.conf
+++ b/openembedded/packages/tslib/tslib/ts.conf-collie-2.4
diff --git a/openembedded/packages/tslib/tslib/ts.conf-h2200 b/openembedded/packages/tslib/tslib/ts.conf-h2200
deleted file mode 100644
index 09309719f..000000000
--- a/openembedded/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/openembedded/packages/tslib/tslib/ts.conf-h3600 b/openembedded/packages/tslib/tslib/ts.conf-h3600
deleted file mode 100644
index 09309719f..000000000
--- a/openembedded/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/openembedded/packages/tslib/tslib/ts.conf-h6300 b/openembedded/packages/tslib/tslib/ts.conf-h6300
deleted file mode 100644
index 09309719f..000000000
--- a/openembedded/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/openembedded/packages/tslib/tslib/ts.conf-simpad b/openembedded/packages/tslib/tslib/ts.conf-simpad
deleted file mode 100644
index 09309719f..000000000
--- a/openembedded/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/openembedded/packages/tslib/tslib/usec_fix.patch b/openembedded/packages/tslib/tslib/usec_fix.patch
new file mode 100644
index 000000000..a791b39a3
--- /dev/null
+++ b/openembedded/packages/tslib/tslib/usec_fix.patch
@@ -0,0 +1,26 @@
+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/openembedded/packages/tslib/tslib_cvs.bb b/openembedded/packages/tslib/tslib_cvs.bb
index cf79999b2..bac18153f 100644
--- a/openembedded/packages/tslib/tslib_cvs.bb
+++ b/openembedded/packages/tslib/tslib_cvs.bb
@@ -1,17 +1,17 @@
SECTION = "base"
DESCRIPTION = "tslib is a touchscreen access library."
PV = "0.0+cvs${SRCDATE}"
-PR = "r33"
+PR = "r34"
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://usec_fix.patch;patch=1 \
+ 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 +40,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 )
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
generated by cgit v1.2.3 (git 2.46.0) at 2024-11-02 03:42:00 +0000