Annotation of /trunk/hal/patches/hal-0.5.7.1-hald-scripts.patch
Parent Directory | Revision Log
Revision 82 -
(hide annotations)
(download)
Fri Oct 20 18:01:50 2006 UTC (17 years, 11 months ago) by niro
File size: 8636 byte(s)
Fri Oct 20 18:01:50 2006 UTC (17 years, 11 months ago) by niro
File size: 8636 byte(s)
patches and files for hal-0.5.7.1-r1
1 | niro | 82 | Index: tools/hal-system-lcd-get-brightness |
2 | =================================================================== | ||
3 | RCS file: /cvs/hal/hal/tools/hal-system-lcd-get-brightness,v | ||
4 | retrieving revision 1.7 | ||
5 | diff -u -r1.7 hal-system-lcd-get-brightness | ||
6 | --- hal-0.5.7/tools/hal-system-lcd-get-brightness 18 Feb 2006 23:11:23 -0000 1.7 | ||
7 | +++ hal-0.5.7/tools/hal-system-lcd-get-brightness 19 Feb 2006 22:44:22 -0000 | ||
8 | @@ -8,13 +8,13 @@ | ||
9 | # (at your option) any later version. | ||
10 | |||
11 | # Check for environment variables | ||
12 | -if [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" == "" ]; then | ||
13 | +if [ -z "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" ]; then | ||
14 | echo "Missing or empty environment variable(s)." >&2 | ||
15 | echo "This script should be started by hald." >&2 | ||
16 | exit 1 | ||
17 | fi | ||
18 | |||
19 | -if [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" == "pmu" ]; then | ||
20 | +if [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" = "pmu" ]; then | ||
21 | value="`hal-system-power-pmu getlcd`" | ||
22 | if [ $? -ne 0 ]; then | ||
23 | echo "org.freedesktop.Hal.Device.LaptopPanel.NotSupported" >&2 | ||
24 | @@ -24,37 +24,37 @@ | ||
25 | fi | ||
26 | |||
27 | # Check for file existance and that it's readable | ||
28 | -if [ ! -r $HAL_PROP_LINUX_ACPI_PATH ]; then | ||
29 | +if [ ! -r "$HAL_PROP_LINUX_ACPI_PATH" ]; then | ||
30 | echo "org.freedesktop.Hal.Device.LaptopPanel.NotSupported" >&2 | ||
31 | echo "$1 not readable!" >&2 | ||
32 | exit 1 | ||
33 | fi | ||
34 | |||
35 | -if [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" == "toshiba" ]; then | ||
36 | +if [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" = "toshiba" ]; then | ||
37 | # cat /proc/acpi/toshiba/lcd | ||
38 | # brightness: 5 | ||
39 | # brightness_levels: 8 | ||
40 | value="`cat $HAL_PROP_LINUX_ACPI_PATH | grep brightness: | awk '{print $2;}'`" | ||
41 | -elif [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" == "asus" ]; then | ||
42 | +elif [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" = "asus" ]; then | ||
43 | # cat /proc/acpi/asus/brn | ||
44 | # 5 | ||
45 | value="`cat $HAL_PROP_LINUX_ACPI_PATH`" | ||
46 | -elif [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" == "panasonic" ]; then | ||
47 | +elif [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" = "panasonic" ]; then | ||
48 | # cat /proc/acpi/pcc/brightness | ||
49 | # 5 | ||
50 | value="`cat $HAL_PROP_LINUX_ACPI_PATH`" | ||
51 | -elif [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" == "ibm" ]; then | ||
52 | +elif [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" = "ibm" ]; then | ||
53 | # cat /proc/acpi/ibm/brightness | ||
54 | # level: 5 | ||
55 | # commands: up, down | ||
56 | # commands: level <level> (<level> is 0-7) | ||
57 | value="`cat $HAL_PROP_LINUX_ACPI_PATH | grep level: | awk '{print $2;}'`" | ||
58 | -elif [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" == "sony" ]; then | ||
59 | +elif [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" = "sony" ]; then | ||
60 | # cat /proc/acpi/sony/brightness | ||
61 | # 5 | ||
62 | value="`cat $HAL_PROP_LINUX_ACPI_PATH`" | ||
63 | let "value = ${value} - 1" | ||
64 | -elif [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" == "omnibook" ]; then | ||
65 | +elif [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" = "omnibook" ]; then | ||
66 | # cat /proc/omnibook/lcd | ||
67 | # LCD brightness: 7 | ||
68 | value="`cat $HAL_PROP_LINUX_ACPI_PATH | awk '{print $3;}'`" | ||
69 | Index: tools/hal-system-lcd-set-brightness | ||
70 | =================================================================== | ||
71 | RCS file: /cvs/hal/hal/tools/hal-system-lcd-set-brightness,v | ||
72 | retrieving revision 1.7 | ||
73 | diff -u -r1.7 hal-system-lcd-set-brightness | ||
74 | --- hal-0.5.7/tools/hal-system-lcd-set-brightness 18 Feb 2006 23:11:23 -0000 1.7 | ||
75 | +++ hal-0.5.7/tools/hal-system-lcd-set-brightness 19 Feb 2006 22:44:23 -0000 | ||
76 | @@ -8,8 +8,8 @@ | ||
77 | # (at your option) any later version. | ||
78 | |||
79 | # Check for environment variables | ||
80 | -if [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" == "" ] || | ||
81 | - [ "$HAL_PROP_LAPTOP_PANEL_NUM_LEVELS" == "" ] ; then | ||
82 | +if [ -z "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" ] || | ||
83 | + [ -z "$HAL_PROP_LAPTOP_PANEL_NUM_LEVELS" ] ; then | ||
84 | echo "Missing or empty environment variable(s)." >&2 | ||
85 | echo "This script should be started by hald." >&2 | ||
86 | exit 1 | ||
87 | @@ -18,7 +18,14 @@ | ||
88 | # read value for set brightness | ||
89 | read value | ||
90 | |||
91 | -if [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" == "pmu" ]; then | ||
92 | +# Check for values outside range | ||
93 | +if [ ${value} -lt 0 ] || [ ${value} -gt $HAL_PROP_LAPTOP_PANEL_NUM_LEVELS ]; then | ||
94 | + echo "org.freedesktop.Hal.Device.LaptopPanel.Invalid" >&2 | ||
95 | + echo "Brightness has to be between 0 and $HAL_PROP_LAPTOP_PANEL_NUM_LEVELS!" >&2 | ||
96 | + exit 1 | ||
97 | +fi | ||
98 | + | ||
99 | +if [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" = "pmu" ]; then | ||
100 | hal-system-power-pmu setlcd $value | ||
101 | if [ $? -ne 0 ]; then | ||
102 | echo "org.freedesktop.Hal.Device.LaptopPanel.NotSupported" >&2 | ||
103 | @@ -28,39 +35,33 @@ | ||
104 | fi | ||
105 | |||
106 | # Check for file existance and that it's writable | ||
107 | -if [ ! -w $HAL_PROP_LINUX_ACPI_PATH ]; then | ||
108 | +if [ ! -w "$HAL_PROP_LINUX_ACPI_PATH" ]; then | ||
109 | echo "org.freedesktop.Hal.Device.LaptopPanel.NotSupported" >&2 | ||
110 | echo "$1 not writable!" >&2 | ||
111 | exit 1 | ||
112 | fi | ||
113 | |||
114 | -# Check for values outside range | ||
115 | -if [ ${value} -lt 0 ] || [ ${value} -gt $HAL_PROP_LAPTOP_PANEL_NUM_LEVELS ]; then | ||
116 | - echo "org.freedesktop.Hal.Device.LaptopPanel.Invalid" >&2 | ||
117 | - echo "Brightness has to be between 0 and $HAL_PROP_LAPTOP_PANEL_NUM_LEVELS!" >&2 | ||
118 | - exit 1 | ||
119 | -fi | ||
120 | |||
121 | -if [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" == "toshiba" ]; then | ||
122 | +if [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" = "toshiba" ]; then | ||
123 | # echo "brightness: {0..x}" >/proc/acpi/toshiba/lcd | ||
124 | echo "brightness: $value" > $HAL_PROP_LINUX_ACPI_PATH | ||
125 | -elif [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" == "asus" ]; then | ||
126 | +elif [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" = "asus" ]; then | ||
127 | # echo {0..15} > /proc/acpi/asus/brn | ||
128 | # http://www.taupro.com/wiki/ChemBook/LCDdisplayPowerConfiguration | ||
129 | echo "$value" > $HAL_PROP_LINUX_ACPI_PATH | ||
130 | -elif [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" == "panasonic" ]; then | ||
131 | +elif [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" = "panasonic" ]; then | ||
132 | # echo {0..15} > /proc/acpi/pcc/brightness | ||
133 | # http://readlist.com/lists/vger.kernel.org/linux-kernel/7/36405.html | ||
134 | echo "$value" > $HAL_PROP_LINUX_ACPI_PATH | ||
135 | -elif [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" == "ibm" ]; then | ||
136 | +elif [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" = "ibm" ]; then | ||
137 | # echo "level {0..7}" > /proc/acpi/ibm/brightness | ||
138 | # http://ibm-acpi.sourceforge.net/README | ||
139 | echo "level $value" > $HAL_PROP_LINUX_ACPI_PATH | ||
140 | -elif [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" == "sony" ]; then | ||
141 | +elif [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" = "sony" ]; then | ||
142 | # echo "{1..8}" > /proc/acpi/sony/brightness | ||
143 | # http://popies.net/sonypi/2.6-sony_acpi4.patch | ||
144 | echo "$value" > $HAL_PROP_LINUX_ACPI_PATH | ||
145 | -elif [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" == "omnibook" ]; then | ||
146 | +elif [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" = "omnibook" ]; then | ||
147 | # echo "{0..7}" > /proc/omnibook/lcd | ||
148 | # http://bugzilla.gnome.org/show_bug.cgi?id=331458 | ||
149 | echo "$value" > $HAL_PROP_LINUX_ACPI_PATH | ||
150 | Index: tools/hal-system-power-hibernate | ||
151 | =================================================================== | ||
152 | RCS file: /cvs/hal/hal/tools/hal-system-power-hibernate,v | ||
153 | retrieving revision 1.6 | ||
154 | diff -u -r1.6 hal-system-power-hibernate | ||
155 | --- hal-0.5.7/tools/hal-system-power-hibernate 16 Jan 2006 12:47:40 -0000 1.6 | ||
156 | +++ hal-0.5.7/tools/hal-system-power-hibernate 19 Feb 2006 22:44:23 -0000 | ||
157 | @@ -43,8 +43,9 @@ | ||
158 | # Suspend2 tools installed | ||
159 | /usr/sbin/hibernate --force | ||
160 | RET=$? | ||
161 | - elif [ -w "/sys/power/state" ] ; then | ||
162 | - # Use the raw kernel sysfs interface | ||
163 | + elif [ -w "/sys/power/state" ] && | ||
164 | + [ "$HAL_PROP_POWER_MANAGEMENT_TYPE" != pmu ] ; then | ||
165 | + # Use the raw kernel sysfs interface if possible (not on pmu yet) | ||
166 | echo "disk" > /sys/power/state | ||
167 | RET=$? | ||
168 | else | ||
169 | Index: tools/hal-system-power-suspend | ||
170 | =================================================================== | ||
171 | RCS file: /cvs/hal/hal/tools/hal-system-power-suspend,v | ||
172 | retrieving revision 1.6 | ||
173 | diff -u -r1.6 hal-system-power-suspend | ||
174 | --- hal-0.5.7/tools/hal-system-power-suspend 18 Feb 2006 23:00:55 -0000 1.6 | ||
175 | +++ hal-0.5.7/tools/hal-system-power-suspend 19 Feb 2006 22:44:23 -0000 | ||
176 | @@ -18,15 +18,6 @@ | ||
177 | |||
178 | read seconds_to_sleep | ||
179 | |||
180 | -#PMU systems cannot use /sys/power/state yet, so use a helper to issue an ioctl | ||
181 | -if [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" == "pmu" ]; then | ||
182 | - hal-system-power-pmu sleep | ||
183 | - if [ $? -ne 0 ]; then | ||
184 | - echo "org.freedesktop.Hal.Device.SystemPowerManagement.NotSupported" >&2 | ||
185 | - exit 1 | ||
186 | - fi | ||
187 | - exit 0 | ||
188 | -fi | ||
189 | |||
190 | #SuSE and ALTLinux only support powersave | ||
191 | if [ -f "/etc/altlinux-release" ] || [ -f "/etc/SuSE-release" ] ; then | ||
192 | @@ -62,6 +53,10 @@ | ||
193 | elif [ -x "/usr/sbin/pmi" ] ; then | ||
194 | /usr/sbin/pmi action suspend force | ||
195 | RET=$? | ||
196 | + elif [ "$HAL_PROP_POWER_MANAGEMENT_TYPE" = "pmu" ]; then | ||
197 | + #PMU systems cannot use /sys/power/state yet, so use a helper to issue an ioctl | ||
198 | + hal-system-power-pmu sleep | ||
199 | + RET=$? | ||
200 | elif [ -w "/sys/power/state" ] ; then | ||
201 | # Use the raw kernel sysfs interface | ||
202 | echo "mem" > /sys/power/state | ||
203 | @@ -72,4 +67,8 @@ | ||
204 | fi | ||
205 | fi | ||
206 | |||
207 | +if [ $RET -ne 0 ]; then | ||
208 | + echo "org.freedesktop.Hal.Device.SystemPowerManagement.NotSupported" >&2 | ||
209 | + exit 1 | ||
210 | +fi | ||
211 | exit $RET |