aboutsummaryrefslogtreecommitdiffstats
path: root/recipes/xserver-kdrive-common
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2010-01-31 10:31:37 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2010-01-31 10:36:13 +0100
commitf61ab420ded1697f14c6f1a0a1566d4d72d6d466 (patch)
tree4c26bc6057a28e0bbd9cca4bc7e1f2330cdde605 /recipes/xserver-kdrive-common
parentf1c9882e1aa669c8a3a1dfbe98abc8f53fef92e1 (diff)
downloadopenembedded-f61ab420ded1697f14c6f1a0a1566d4d72d6d466.tar.gz
xserver-kdrive-common: move xinput-calibrator-once section AFTER kernel evdev setting for SHR
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes/xserver-kdrive-common')
-rw-r--r--recipes/xserver-kdrive-common/xserver-kdrive-common/shr/89xTs_Calibrate21
1 files changed, 10 insertions, 11 deletions
diff --git a/recipes/xserver-kdrive-common/xserver-kdrive-common/shr/89xTs_Calibrate b/recipes/xserver-kdrive-common/xserver-kdrive-common/shr/89xTs_Calibrate
index 07d2d08c1c..0abe3b427d 100644
--- a/recipes/xserver-kdrive-common/xserver-kdrive-common/shr/89xTs_Calibrate
+++ b/recipes/xserver-kdrive-common/xserver-kdrive-common/shr/89xTs_Calibrate
@@ -3,19 +3,8 @@
while [ ! -z $TSLIB_TSDEVICE ] && [ ! -f /etc/pointercal ]
do
/usr/bin/xtscal
- exit
done
-if [ -e /usr/bin/xinput_calibrator_once.sh ] ; then
- if [ -e /usr/bin/fsoraw ] ; then
- # because ts tap to unblank will be used as first calibration click and then store invalid calibration
- fsoraw -fr CPU,Display -- /usr/bin/xinput_calibrator_once.sh
- else
- /usr/bin/xinput_calibrator_once.sh
- fi
- exit
-fi
-
SYSFS_CALIBRATION_DIR=/sys/bus/i2c/devices/0-0073/s3c2440-ts/calibration
if [ ! -d $SYSFS_CALIBRATION_DIR ]; then
@@ -37,3 +26,13 @@ if [ -d $SYSFS_CALIBRATION_DIR ]; then
echo 75000000 > $SYSFS_CALIBRATION_DIR/5
echo 65536 > $SYSFS_CALIBRATION_DIR/6
fi
+
+if [ -e /usr/bin/xinput_calibrator_once.sh ] ; then
+ if [ -e /usr/bin/fsoraw ] ; then
+ # because ts tap to unblank will be used as first calibration click and then store invalid calibration
+ fsoraw -fr CPU,Display -- /usr/bin/xinput_calibrator_once.sh
+ else
+ /usr/bin/xinput_calibrator_once.sh
+ fi
+ exit
+fi