hal: Branch 'master'

[Holger Macht]

 doc/spec/hal-spec-interfaces.xml  |   10 +++++-----
 hald/linux/addons/addon-cpufreq.c |    3 ---
 2 files changed, 5 insertions(+), 8 deletions(-)

New commits:
diff-tree e638b2d4ac8f77a4a2048fe4cffa4585c8df6928 (from 2db79ac593441c1ab1f2e4f147ea5facf04050a3)
Author: Holger Macht <holger at homac.de>
Date:   Wed May 30 10:16:03 2007 +0200

    fixup return value documentation of CPUFreq interface
    
    The SetCPUFreq* methods wrongly stated in the spec that they would return
    an integer value. In reality, they return void and only throw an exception
    on error.

diff --git a/doc/spec/hal-spec-interfaces.xml b/doc/spec/hal-spec-interfaces.xml
index 5cb80e0..b537c5b 100644
--- a/doc/spec/hal-spec-interfaces.xml
+++ b/doc/spec/hal-spec-interfaces.xml
@@ -799,7 +799,7 @@ $ dbus-send --system --print-reply --des
           </row>
           <row>
             <entry>SetCPUFreqGovernor</entry>
-            <entry>Int</entry>
+            <entry>Void</entry>
             <entry>String governor</entry>
             <entry>CPUFreq.UnknownGovernor</entry>
             <entry>
@@ -808,8 +808,8 @@ $ dbus-send --system --print-reply --des
           </row>
           <row>
             <entry>SetCPUFreqPerformance</entry>
-            <entry>Int</entry>
-            <entry>Int percent</entry>
+            <entry>Void</entry>
+            <entry>Int (1 to 100)</entry>
             <entry>CPUFreq.NoSuitableGovernor</entry>
             <entry>
               Sets the performance of the dynamic scaling
@@ -834,7 +834,7 @@ $ dbus-send --system --print-reply --des
           </row>
           <row>
             <entry>SetCPUFreqConsiderNice</entry>
-            <entry>Int</entry>
+            <entry>Void</entry>
             <entry>Bool consider_niced_processes</entry>
             <entry>CPUFreq.NoSuitableGovernor</entry>
             <entry>
@@ -847,7 +847,7 @@ $ dbus-send --system --print-reply --des
             </entry>
           </row>
           <row>
-            <entry>SetCPUFreqConsiderNice</entry>
+            <entry>GetCPUFreqConsiderNice</entry>
             <entry>Bool</entry>
             <entry></entry>
             <entry>CPUFreq.NoSuitableGovernor</entry>
diff --git a/hald/linux/addons/addon-cpufreq.c b/hald/linux/addons/addon-cpufreq.c
index 57eef87..b10edf9 100644
--- a/hald/linux/addons/addon-cpufreq.c
+++ b/hald/linux/addons/addon-cpufreq.c
@@ -1243,15 +1243,12 @@ gboolean dbus_init(void)
 		"org.freedesktop.Hal.Device.CPUFreq", 
 		"    <method name=\"SetCPUFreqGovernor\">\n"
 		"      <arg name=\"governor_string\" direction=\"in\" type=\"s\"/>\n"
-		"      <arg name=\"return_code\" direction=\"out\" type=\"i\"/>\n"
 		"    </method>\n"
 		"    <method name=\"SetCPUFreqPerformance\">\n"
 		"      <arg name=\"value\" direction=\"in\" type=\"i\"/>\n"
-		"      <arg name=\"return_code\" direction=\"out\" type=\"i\"/>\n"
 		"    </method>\n"
 		"    <method name=\"SetCPUFreqConsiderNice\">\n"
 		"      <arg name=\"value\" direction=\"in\" type=\"b\"/>\n"
-		"      <arg name=\"return_code\" direction=\"out\" type=\"i\"/>\n"
 		"    </method>\n"
 		"    <method name=\"GetCPUFreqGovernor\">\n"
 		"      <arg name=\"return_code\" direction=\"out\" type=\"s\"/>\n"