Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 133743 | Differences between
and this patch

Collapse All | Expand All

(-)hal-0.5.7/tools/hal-system-lcd-get-brightness (-9 / +9 lines)
Lines 8-20 Link Here
8
# (at your option) any later version.
8
# (at your option) any later version.
9
9
10
# Check for environment variables
10
# Check for environment variables
11
if [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" == "" ]; then
11
if [ -z "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" ]; then
12
	echo "Missing or empty environment variable(s)." >&2
12
	echo "Missing or empty environment variable(s)." >&2
13
	echo "This script should be started by hald." >&2
13
	echo "This script should be started by hald." >&2
14
	exit 1
14
	exit 1
15
fi
15
fi
16
16
17
if [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" == "pmu" ]; then
17
if [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" = "pmu" ]; then
18
	value="`hal-system-power-pmu getlcd`"
18
	value="`hal-system-power-pmu getlcd`"
19
	if [ $? -ne 0 ]; then
19
	if [ $? -ne 0 ]; then
20
		echo "org.freedesktop.Hal.Device.LaptopPanel.NotSupported" >&2
20
		echo "org.freedesktop.Hal.Device.LaptopPanel.NotSupported" >&2
Lines 24-60 Link Here
24
fi
24
fi
25
25
26
# Check for file existance and that it's readable
26
# Check for file existance and that it's readable
27
if [ ! -r $HAL_PROP_LINUX_ACPI_PATH ]; then
27
if [ ! -r "$HAL_PROP_LINUX_ACPI_PATH" ]; then
28
	echo "org.freedesktop.Hal.Device.LaptopPanel.NotSupported" >&2
28
	echo "org.freedesktop.Hal.Device.LaptopPanel.NotSupported" >&2
29
	echo "$1 not readable!" >&2
29
	echo "$1 not readable!" >&2
30
	exit 1
30
	exit 1
31
fi
31
fi
32
32
33
if [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" == "toshiba" ]; then
33
if [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" = "toshiba" ]; then
34
	# cat /proc/acpi/toshiba/lcd
34
	# cat /proc/acpi/toshiba/lcd
35
	#  brightness:              5
35
	#  brightness:              5
36
	#  brightness_levels:       8
36
	#  brightness_levels:       8
37
	value="`cat $HAL_PROP_LINUX_ACPI_PATH | grep brightness: | awk '{print $2;}'`"
37
	value="`cat $HAL_PROP_LINUX_ACPI_PATH | grep brightness: | awk '{print $2;}'`"
38
elif [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" == "asus" ]; then
38
elif [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" = "asus" ]; then
39
	# cat /proc/acpi/asus/brn
39
	# cat /proc/acpi/asus/brn
40
	#  5
40
	#  5
41
	value="`cat $HAL_PROP_LINUX_ACPI_PATH`"
41
	value="`cat $HAL_PROP_LINUX_ACPI_PATH`"
42
elif [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" == "panasonic" ]; then
42
elif [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" = "panasonic" ]; then
43
	# cat /proc/acpi/pcc/brightness
43
	# cat /proc/acpi/pcc/brightness
44
	#  5
44
	#  5
45
	value="`cat $HAL_PROP_LINUX_ACPI_PATH`"
45
	value="`cat $HAL_PROP_LINUX_ACPI_PATH`"
46
elif [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" == "ibm" ]; then
46
elif [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" = "ibm" ]; then
47
	# cat /proc/acpi/ibm/brightness
47
	# cat /proc/acpi/ibm/brightness
48
	#  level:          5
48
	#  level:          5
49
	#  commands:       up, down
49
	#  commands:       up, down
50
	#  commands:       level <level> (<level> is 0-7)
50
	#  commands:       level <level> (<level> is 0-7)
51
	value="`cat $HAL_PROP_LINUX_ACPI_PATH | grep level: | awk '{print $2;}'`"
51
	value="`cat $HAL_PROP_LINUX_ACPI_PATH | grep level: | awk '{print $2;}'`"
52
elif [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" == "sony" ]; then
52
elif [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" = "sony" ]; then
53
	# cat /proc/acpi/sony/brightness
53
	# cat /proc/acpi/sony/brightness
54
	#  5
54
	#  5
55
	value="`cat $HAL_PROP_LINUX_ACPI_PATH`"
55
	value="`cat $HAL_PROP_LINUX_ACPI_PATH`"
56
	let "value = ${value} - 1"
56
	let "value = ${value} - 1"
57
elif [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" == "omnibook" ]; then
57
elif [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" = "omnibook" ]; then
58
	# cat /proc/omnibook/lcd
58
	# cat /proc/omnibook/lcd
59
	#  LCD brightness:  7
59
	#  LCD brightness:  7
60
	value="`cat $HAL_PROP_LINUX_ACPI_PATH | awk '{print $3;}'`"
60
	value="`cat $HAL_PROP_LINUX_ACPI_PATH | awk '{print $3;}'`"
(-)hal-0.5.7/tools/hal-system-lcd-set-brightness (-16 / +17 lines)
Lines 8-15 Link Here
8
# (at your option) any later version.
8
# (at your option) any later version.
9
9
10
# Check for environment variables
10
# Check for environment variables
11
if [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" == "" ] || 
11
if [ -z "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" ] || 
12
   [ "$HAL_PROP_LAPTOP_PANEL_NUM_LEVELS" == "" ] ; then
12
   [ -z "$HAL_PROP_LAPTOP_PANEL_NUM_LEVELS" ] ; then
13
        echo "Missing or empty environment variable(s)." >&2
13
        echo "Missing or empty environment variable(s)." >&2
14
        echo "This script should be started by hald." >&2
14
        echo "This script should be started by hald." >&2
15
        exit 1
15
        exit 1
Lines 18-24 Link Here
18
# read value for set brightness
18
# read value for set brightness
19
read value
19
read value
20
20
21
if [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" == "pmu" ]; then
21
# Check for values outside range
22
if [ ${value} -lt 0 ] || [ ${value} -gt $HAL_PROP_LAPTOP_PANEL_NUM_LEVELS ]; then
23
	echo "org.freedesktop.Hal.Device.LaptopPanel.Invalid" >&2
24
	echo "Brightness has to be between 0 and $HAL_PROP_LAPTOP_PANEL_NUM_LEVELS!" >&2
25
	exit 1
26
fi
27
28
if [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" = "pmu" ]; then
22
	hal-system-power-pmu setlcd $value
29
	hal-system-power-pmu setlcd $value
23
	if [ $? -ne 0 ]; then
30
	if [ $? -ne 0 ]; then
24
		echo "org.freedesktop.Hal.Device.LaptopPanel.NotSupported" >&2
31
		echo "org.freedesktop.Hal.Device.LaptopPanel.NotSupported" >&2
Lines 28-66 Link Here
28
fi
35
fi
29
36
30
# Check for file existance and that it's writable
37
# Check for file existance and that it's writable
31
if [ ! -w $HAL_PROP_LINUX_ACPI_PATH ]; then
38
if [ ! -w "$HAL_PROP_LINUX_ACPI_PATH" ]; then
32
	echo "org.freedesktop.Hal.Device.LaptopPanel.NotSupported" >&2
39
	echo "org.freedesktop.Hal.Device.LaptopPanel.NotSupported" >&2
33
	echo "$1 not writable!" >&2
40
	echo "$1 not writable!" >&2
34
	exit 1
41
	exit 1
35
fi
42
fi
36
43
37
# Check for values outside range
38
if [ ${value} -lt 0 ] || [ ${value} -gt $HAL_PROP_LAPTOP_PANEL_NUM_LEVELS ]; then
39
	echo "org.freedesktop.Hal.Device.LaptopPanel.Invalid" >&2
40
	echo "Brightness has to be between 0 and $HAL_PROP_LAPTOP_PANEL_NUM_LEVELS!" >&2
41
	exit 1
42
fi
43
44
44
if [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" == "toshiba" ]; then
45
if [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" = "toshiba" ]; then
45
	# echo "brightness: {0..x}" >/proc/acpi/toshiba/lcd
46
	# echo "brightness: {0..x}" >/proc/acpi/toshiba/lcd
46
	echo "brightness: $value" > $HAL_PROP_LINUX_ACPI_PATH
47
	echo "brightness: $value" > $HAL_PROP_LINUX_ACPI_PATH
47
elif [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" == "asus" ]; then
48
elif [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" = "asus" ]; then
48
	# echo {0..15} > /proc/acpi/asus/brn
49
	# echo {0..15} > /proc/acpi/asus/brn
49
	# http://www.taupro.com/wiki/ChemBook/LCDdisplayPowerConfiguration
50
	# http://www.taupro.com/wiki/ChemBook/LCDdisplayPowerConfiguration
50
	echo "$value" > $HAL_PROP_LINUX_ACPI_PATH
51
	echo "$value" > $HAL_PROP_LINUX_ACPI_PATH
51
elif [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" == "panasonic" ]; then
52
elif [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" = "panasonic" ]; then
52
	# echo {0..15} > /proc/acpi/pcc/brightness
53
	# echo {0..15} > /proc/acpi/pcc/brightness
53
	# http://readlist.com/lists/vger.kernel.org/linux-kernel/7/36405.html
54
	# http://readlist.com/lists/vger.kernel.org/linux-kernel/7/36405.html
54
	echo "$value" > $HAL_PROP_LINUX_ACPI_PATH
55
	echo "$value" > $HAL_PROP_LINUX_ACPI_PATH
55
elif [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" == "ibm" ]; then
56
elif [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" = "ibm" ]; then
56
	# echo "level {0..7}" > /proc/acpi/ibm/brightness
57
	# echo "level {0..7}" > /proc/acpi/ibm/brightness
57
	# http://ibm-acpi.sourceforge.net/README
58
	# http://ibm-acpi.sourceforge.net/README
58
	echo "level $value" > $HAL_PROP_LINUX_ACPI_PATH
59
	echo "level $value" > $HAL_PROP_LINUX_ACPI_PATH
59
elif [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" == "sony" ]; then
60
elif [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" = "sony" ]; then
60
	# echo "{1..8}" > /proc/acpi/sony/brightness
61
	# echo "{1..8}" > /proc/acpi/sony/brightness
61
	# http://popies.net/sonypi/2.6-sony_acpi4.patch
62
	# http://popies.net/sonypi/2.6-sony_acpi4.patch
62
	echo "$value" > $HAL_PROP_LINUX_ACPI_PATH
63
	echo "$value" > $HAL_PROP_LINUX_ACPI_PATH
63
elif [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" == "omnibook" ]; then
64
elif [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" = "omnibook" ]; then
64
	# echo "{0..7}" > /proc/omnibook/lcd
65
	# echo "{0..7}" > /proc/omnibook/lcd
65
	# http://bugzilla.gnome.org/show_bug.cgi?id=331458
66
	# http://bugzilla.gnome.org/show_bug.cgi?id=331458
66
	echo "$value" > $HAL_PROP_LINUX_ACPI_PATH
67
	echo "$value" > $HAL_PROP_LINUX_ACPI_PATH
(-)hal-0.5.7/tools/hal-system-power-hibernate (-2 / +3 lines)
Lines 43-50 Link Here
43
		# Suspend2 tools installed
43
		# Suspend2 tools installed
44
		/usr/sbin/hibernate --force
44
		/usr/sbin/hibernate --force
45
		RET=$?
45
		RET=$?
46
	elif [ -w "/sys/power/state" ] ; then
46
	elif [ -w "/sys/power/state" ] &&
47
		# Use the raw kernel sysfs interface
47
       [  "$HAL_PROP_POWER_MANAGEMENT_TYPE" != pmu ] ; then
48
		# Use the raw kernel sysfs interface if possible (not on pmu yet)
48
		echo "disk" > /sys/power/state
49
		echo "disk" > /sys/power/state
49
		RET=$?
50
		RET=$?
50
	else
51
	else
(-)hal-0.5.7/tools/hal-system-power-suspend (-9 / +11 lines)
Lines 18-32 Link Here
18
18
19
read seconds_to_sleep
19
read seconds_to_sleep
20
20
21
#PMU systems cannot use /sys/power/state yet, so use a helper to issue an ioctl
22
if [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" == "pmu" ]; then
23
	hal-system-power-pmu sleep
24
	if [ $? -ne 0 ]; then
25
		echo "org.freedesktop.Hal.Device.SystemPowerManagement.NotSupported" >&2
26
		exit 1
27
	fi
28
	exit 0
29
fi
30
21
31
#SuSE and ALTLinux only support powersave
22
#SuSE and ALTLinux only support powersave
32
if [ -f "/etc/altlinux-release" ] || [ -f "/etc/SuSE-release" ] ; then
23
if [ -f "/etc/altlinux-release" ] || [ -f "/etc/SuSE-release" ] ; then
Lines 62-67 Link Here
62
	elif [ -x "/usr/sbin/pmi" ] ; then
53
	elif [ -x "/usr/sbin/pmi" ] ; then
63
	    /usr/sbin/pmi action suspend force
54
	    /usr/sbin/pmi action suspend force
64
	    RET=$?
55
	    RET=$?
56
	elif  [ "$HAL_PROP_POWER_MANAGEMENT_TYPE" = "pmu" ]; then
57
		#PMU systems cannot use /sys/power/state yet, so use a helper to issue an ioctl
58
		hal-system-power-pmu sleep
59
		RET=$?
60
	elif [ -x "/usr/sbin/hibernate-ram" ] ; then
61
	    /usr/sbin/hibernate-ram
62
	    RET=$?
65
	elif [ -w "/sys/power/state" ] ; then
63
	elif [ -w "/sys/power/state" ] ; then
66
	    # Use the raw kernel sysfs interface
64
	    # Use the raw kernel sysfs interface
67
	    echo "mem" > /sys/power/state
65
	    echo "mem" > /sys/power/state
Lines 72-75 Link Here
72
	    fi
70
	    fi
73
	fi
71
	fi
74
72
73
if [ $RET -ne 0 ]; then
74
	echo "org.freedesktop.Hal.Device.SystemPowerManagement.NotSupported" >&2
75
	exit 1
76
fi
75
exit $RET
77
exit $RET

Return to bug 133743