From f61ab420ded1697f14c6f1a0a1566d4d72d6d466 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 31 Jan 2010 10:31:37 +0100 Subject: xserver-kdrive-common: move xinput-calibrator-once section AFTER kernel evdev setting for SHR Signed-off-by: Martin Jansa --- .../xserver-kdrive-common/shr/89xTs_Calibrate | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to 'recipes/xserver-kdrive-common') 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 -- cgit 1.2.3-korg