summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Hentges <oe@hentges.net>2007-11-29 21:51:48 +0000
committerMatthias Hentges <oe@hentges.net>2007-11-29 21:51:48 +0000
commit281e31e88a5958f8d22ade40fd7f1713a470f7c3 (patch)
tree5cebf63b74705ba6cf4ce71074d26cb1cf1a16f7
parentd242abb918f10cbe2b51390c35fa311e9083f542 (diff)
parent507393ba034afcd7abca0a0be584b17a4f86daa5 (diff)
merge of '812ef7daa38cb7e71c9e1bb3ef0358566d20c3ee'
and 'a772b6bc0f51e8c371cc638bb29f215e00e02bc5'
-rw-r--r--packages/zaurusd/files/zaurus-hinge.bl-off12
-rw-r--r--packages/zaurusd/files/zaurus-hinge.bl-on28
-rw-r--r--packages/zaurusd/files/zaurus-hinge.matchbox-landscape6
-rw-r--r--packages/zaurusd/files/zaurus-hinge.matchbox-portrait5
-rw-r--r--packages/zaurusd/zaurusd_svn.bb2
5 files changed, 46 insertions, 7 deletions
diff --git a/packages/zaurusd/files/zaurus-hinge.bl-off b/packages/zaurusd/files/zaurus-hinge.bl-off
index 888f90bfc5..ec3cefb2ca 100644
--- a/packages/zaurusd/files/zaurus-hinge.bl-off
+++ b/packages/zaurusd/files/zaurus-hinge.bl-off
@@ -6,5 +6,13 @@
# Filename: zaurus-hinge.bl-off
# Date: 04-Jun-06
-test -z "${ZD_BINDIR}" && ZD_BINDIR="/usr/bin"
-${ZD_BINDIR}/bl off
+#test -z "${ZD_BINDIR}" && ZD_BINDIR="/usr/bin"
+#${ZD_BINDIR}/bl off
+
+
+STEP=5
+DRIVER="`ls /sys/class/backlight/|head -n 1`"
+BRIGHTNESS_FILE="/sys/class/backlight/$DRIVER/brightness"
+
+cat "$BRIGHTNESS_FILE" > /var/run/display_brightness.tmp
+echo 0 > "$BRIGHTNESS_FILE"
diff --git a/packages/zaurusd/files/zaurus-hinge.bl-on b/packages/zaurusd/files/zaurus-hinge.bl-on
index b9b0e68749..61598155f2 100644
--- a/packages/zaurusd/files/zaurus-hinge.bl-on
+++ b/packages/zaurusd/files/zaurus-hinge.bl-on
@@ -12,7 +12,7 @@ ${ZD_BINDIR}/bl on
# If the backlight does not come back on after a suspend, the driver is
# still "on" (hence "bl on" does nothing) with a brightness of "0"
-if test "`bl | awk '{print $2}'`" = "0"
+( if test "`bl | awk '{print $2}'`" = "0"
then
x=0
while test "$x" != 4
@@ -24,5 +24,29 @@ then
let x=$x+1
done
-fi
+
+ if mkdir /var/run/display_brightness.lock
+ then
+ if test -e /var/run/display_brightness.tmp
+ then
+ OLD_VALUE="`cat /var/run/display_brightness.tmp`"
+ echo "OLD BRIGHTNESS SETTING FOUND: $OLD_VALUE"
+
+ if test "$OLD_VALUE" -gt 1
+ then
+ STEP=5
+ DRIVER="`ls /sys/class/backlight/|head -n 1`"
+ BRIGHTNESS_FILE="/sys/class/backlight/$DRIVER/brightness"
+
+ echo "SETTING $OLD_VALUE!"
+ echo "$OLD_VALUE" > "$BRIGHTNESS_FILE"
+ rm /var/run/display_brightness.tmp
+ echo "FINISH!"
+ fi
+ fi
+ rm -rf /var/run/display_brightness.lock
+ else
+ echo "BRIGHTNESS IS LOCKED"
+ fi
+fi ) &
diff --git a/packages/zaurusd/files/zaurus-hinge.matchbox-landscape b/packages/zaurusd/files/zaurus-hinge.matchbox-landscape
index e7b92b5140..a048769f7d 100644
--- a/packages/zaurusd/files/zaurus-hinge.matchbox-landscape
+++ b/packages/zaurusd/files/zaurus-hinge.matchbox-landscape
@@ -16,6 +16,10 @@
# urg mbinputmgr should kill below
killproc ${ZD_BINDIR}/matchbox-keyboard
killproc ${ZD_BINDIR}/matchbox-stroke
+
if [ -x ${ZD_BINDIR}/xrandr ]; then
- xrandr -o normal
+ if ! ( xrandr | awk '{print $4}' | grep -q normal )
+ then
+ ${ZD_BINDIR}/xrandr -o normal
+ fi
fi
diff --git a/packages/zaurusd/files/zaurus-hinge.matchbox-portrait b/packages/zaurusd/files/zaurus-hinge.matchbox-portrait
index bd04d328cc..291617cd02 100644
--- a/packages/zaurusd/files/zaurus-hinge.matchbox-portrait
+++ b/packages/zaurusd/files/zaurus-hinge.matchbox-portrait
@@ -1,7 +1,10 @@
#!/bin/sh
if [ -x ${ZD_BINDIR}/xrandr ]; then
- ${ZD_BINDIR}/xrandr -o left
+ if ! ( xrandr | awk '{print $4}' | grep -q left )
+ then
+ ${ZD_BINDIR}/xrandr -o left
+ fi
fi
# just to be extra safe
sleep 1
diff --git a/packages/zaurusd/zaurusd_svn.bb b/packages/zaurusd/zaurusd_svn.bb
index 8f559fbca0..8bc0b2ba58 100644
--- a/packages/zaurusd/zaurusd_svn.bb
+++ b/packages/zaurusd/zaurusd_svn.bb
@@ -4,7 +4,7 @@ LICENSE = "GPL"
DEPENDS = "tslib"
RDEPENDS = "procps"
PV = "0.0+svn${SRCDATE}"
-PR = "r13"
+PR = "r14"
SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=zaurusd;proto=http \
file://zaurus-hinge.in \