diff options
author | Richard Purdie <rpurdie@rpsys.net> | 2006-11-05 21:05:06 +0000 |
---|---|---|
committer | Richard Purdie <rpurdie@rpsys.net> | 2006-11-05 21:05:06 +0000 |
commit | cb60a1e83ae539a0393efce7dbbbfac44b5cc03e (patch) | |
tree | 139c9c9dc4ee67aca031ec7bac9a6dbb6499a040 /packages/tslib/tslib | |
parent | b2d969c3b332e2b1cc0168cb525fa96f3a82c33d (diff) | |
download | openembedded-cb60a1e83ae539a0393efce7dbbbfac44b5cc03e.tar.gz |
tslib: General cleanup - Turn ts-2.6.conf into the standard ts.conf, remove TSLIB_TSEVENTTYPE as it doesn't do anything, remove old module_id() macros, fix h2200 and h5xxx so they don't need detect-stylus, remove duplicate ts.conf files, remove old fixed date tslib version
Diffstat (limited to 'packages/tslib/tslib')
30 files changed, 50 insertions, 140 deletions
diff --git a/packages/tslib/tslib/a780/tslib.sh b/packages/tslib/tslib/a780/tslib.sh index 2244648861..51cd0f1f36 100644 --- a/packages/tslib/tslib/a780/tslib.sh +++ b/packages/tslib/tslib/a780/tslib.sh @@ -1,6 +1,6 @@ #!/bin/sh TSLIB_TSDEVICE=/dev/input/event1 -TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf +TSLIB_CONFFILE=/etc/ts.conf export TSLIB_TSDEVICE TSLIB_CONFFILE diff --git a/packages/tslib/tslib/akita/tslib.sh b/packages/tslib/tslib/akita/tslib.sh index 0c8b1a12b9..0ff219b31f 100644 --- a/packages/tslib/tslib/akita/tslib.sh +++ b/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/packages/tslib/tslib/c7x0/tslib.sh b/packages/tslib/tslib/c7x0/tslib.sh index 0c8b1a12b9..0ff219b31f 100644 --- a/packages/tslib/tslib/c7x0/tslib.sh +++ b/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/packages/tslib/tslib/collie/tslib.sh b/packages/tslib/tslib/collie/tslib.sh index 759d5cf091..664bda426a 100644 --- a/packages/tslib/tslib/collie/tslib.sh +++ b/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/packages/tslib/tslib/e680/tslib.sh b/packages/tslib/tslib/e680/tslib.sh index 2244648861..51cd0f1f36 100644 --- a/packages/tslib/tslib/e680/tslib.sh +++ b/packages/tslib/tslib/e680/tslib.sh @@ -1,6 +1,6 @@ #!/bin/sh TSLIB_TSDEVICE=/dev/input/event1 -TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf +TSLIB_CONFFILE=/etc/ts.conf export TSLIB_TSDEVICE TSLIB_CONFFILE diff --git a/packages/tslib/tslib/h1940/tslib.sh b/packages/tslib/tslib/h1940/tslib.sh index d83673e259..7dbf4ae9f1 100644 --- 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-2.6.conf +TSLIB_CONFFILE=/etc/ts.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 0de3534a51..c78f2169c7 100644 --- a/packages/tslib/tslib/h2200/tslib.sh +++ b/packages/tslib/tslib/h2200/tslib.sh @@ -1,18 +1,13 @@ #!/bin/sh -module_id() { - awk 'BEGIN { FS=": " } /Hardware/ { print $2 } ' </proc/cpuinfo -} +TSLIB_TSDEVICE=/dev/input/touchsreen0 +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/packages/tslib/tslib/h3600/tslib.sh b/packages/tslib/tslib/h3600/tslib.sh index 3c27b075f7..6c480f46af 100644 --- a/packages/tslib/tslib/h3600/tslib.sh +++ b/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/packages/tslib/tslib/h3900/tslib.sh b/packages/tslib/tslib/h3900/tslib.sh index 0de3534a51..6c480f46af 100644 --- a/packages/tslib/tslib/h3900/tslib.sh +++ b/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/packages/tslib/tslib/h4000/tslib.sh b/packages/tslib/tslib/h4000/tslib.sh index 0de3534a51..6c480f46af 100644 --- a/packages/tslib/tslib/h4000/tslib.sh +++ b/packages/tslib/tslib/h4000/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/packages/tslib/tslib/h5xxx/tslib.sh b/packages/tslib/tslib/h5xxx/tslib.sh index 0de3534a51..b096bfb96e 100644 --- a/packages/tslib/tslib/h5xxx/tslib.sh +++ b/packages/tslib/tslib/h5xxx/tslib.sh @@ -1,18 +1,13 @@ #!/bin/sh -module_id() { - awk 'BEGIN { FS=": " } /Hardware/ { print $2 } ' </proc/cpuinfo -} +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 ;; -*) - TSLIB_TSDEVICE=`detect-stylus --device` - TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf - ;; esac export TSLIB_TSDEVICE TSLIB_CONFFILE diff --git a/packages/tslib/tslib/h6300/tslib.sh b/packages/tslib/tslib/h6300/tslib.sh index 548bc918ff..b3318fd820 100644 --- 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-2.6.conf +TSLIB_CONFFILE=/etc/ts.conf export TSLIB_TSDEVICE TSLIB_CONFFILE diff --git a/packages/tslib/tslib/hx2000/tslib.sh b/packages/tslib/tslib/hx2000/tslib.sh index 3a6ba78c50..586d5c7deb 100644 --- a/packages/tslib/tslib/hx2000/tslib.sh +++ b/packages/tslib/tslib/hx2000/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/packages/tslib/tslib/hx4700/tslib.sh b/packages/tslib/tslib/hx4700/tslib.sh index 3a6ba78c50..586d5c7deb 100644 --- a/packages/tslib/tslib/hx4700/tslib.sh +++ b/packages/tslib/tslib/hx4700/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/packages/tslib/tslib/ipaq-pxa270/tslib.sh b/packages/tslib/tslib/ipaq-pxa270/tslib.sh index 3a6ba78c50..586d5c7deb 100644 --- a/packages/tslib/tslib/ipaq-pxa270/tslib.sh +++ b/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/packages/tslib/tslib/jornada56x/tslib.sh b/packages/tslib/tslib/jornada56x/tslib.sh index a93d2d3ef0..8f907b0755 100644 --- a/packages/tslib/tslib/jornada56x/tslib.sh +++ b/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/packages/tslib/tslib/jornada6xx/tslib.sh b/packages/tslib/tslib/jornada6xx/tslib.sh index e64f644b74..1b5db781c1 100644 --- a/packages/tslib/tslib/jornada6xx/tslib.sh +++ b/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/packages/tslib/tslib/jornada7xx/tslib.sh b/packages/tslib/tslib/jornada7xx/tslib.sh index e64f644b74..1b5db781c1 100644 --- a/packages/tslib/tslib/jornada7xx/tslib.sh +++ b/packages/tslib/tslib/jornada7xx/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/packages/tslib/tslib/nokia770/.mtn2git_empty b/packages/tslib/tslib/nokia770/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/tslib/tslib/nokia770/.mtn2git_empty +++ /dev/null diff --git a/packages/tslib/tslib/nokia770/ts.conf b/packages/tslib/tslib/nokia770/ts.conf deleted file mode 100644 index 1b0da937e8..0000000000 --- a/packages/tslib/tslib/nokia770/ts.conf +++ /dev/null @@ -1,25 +0,0 @@ -# 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 -module linear diff --git a/packages/tslib/tslib/omap1610h2/ts.conf b/packages/tslib/tslib/omap1610h2/ts.conf deleted file mode 100644 index 09309719f2..0000000000 --- a/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/packages/tslib/tslib/omap5912osk/ts.conf b/packages/tslib/tslib/omap5912osk/ts.conf deleted file mode 100644 index dc377cf86e..0000000000 --- a/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/packages/tslib/tslib/poodle/tslib.sh b/packages/tslib/tslib/poodle/tslib.sh index 759d5cf091..664bda426a 100644 --- a/packages/tslib/tslib/poodle/tslib.sh +++ b/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/packages/tslib/tslib/qemuarm/ts.conf b/packages/tslib/tslib/qemuarm/ts.conf deleted file mode 100644 index 09309719f2..0000000000 --- a/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/packages/tslib/tslib/qemuarm/tslib.sh b/packages/tslib/tslib/qemuarm/tslib.sh index 0bc0d454e7..b7acc274c0 100644 --- a/packages/tslib/tslib/qemuarm/tslib.sh +++ b/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/packages/tslib/tslib/simpad/tslib.sh b/packages/tslib/tslib/simpad/tslib.sh index 39b1c4ba58..9c4eb1e0f9 100644 --- a/packages/tslib/tslib/simpad/tslib.sh +++ b/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/packages/tslib/tslib/spitz/tslib.sh b/packages/tslib/tslib/spitz/tslib.sh index 0c8b1a12b9..0ff219b31f 100644 --- a/packages/tslib/tslib/spitz/tslib.sh +++ b/packages/tslib/tslib/spitz/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/packages/tslib/tslib/tosa/tslib.sh b/packages/tslib/tslib/tosa/tslib.sh index 0c8b1a12b9..0ff219b31f 100644 --- a/packages/tslib/tslib/tosa/tslib.sh +++ b/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/packages/tslib/tslib/ts-2.6.conf b/packages/tslib/tslib/ts-2.6.conf deleted file mode 100644 index 09309719f2..0000000000 --- a/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/packages/tslib/tslib/ts.conf b/packages/tslib/tslib/ts.conf index dc5c4ded09..1b0da937e8 100644 --- a/packages/tslib/tslib/ts.conf +++ b/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 |