hal/doc/spec hal-spec.html,1.41,1.42 hal-spec.xml.in,1.30,1.31

[David Zeuthen]

Update of /cvs/hal/hal/doc/spec
In directory gabe:/tmp/cvs-serv15452/doc/spec

Modified Files:
	hal-spec.html hal-spec.xml.in 
Log Message:
2005-02-02  David Zeuthen  <davidz at redhat.com>

	* hald/linux2/apm.[ch]: New files

	* hald/linux2/util.c (helper_invoke): Remember to initialize the
	error object to NULL

	* hald/linux2/osspec.c (osspec_probe): Only try APM if ACPI fails

	* hald/linux2/hotplug.c (hotplug_event_begin_apm): New function
	(hotplug_event_begin): Handle APM
	(hotplug_rescan_device): Handle APM
	(hotplug_reprobe_generate_remove_events): Handle APM
	(hotplug_reprobe_generate_add_events): Handle APM

	* hald/linux2/acpi.c (acpi_synthesize): Remember to set error to
	NULL and don't leak the error object
	(acpi_generate_remove_hotplug_event): Make this function return
	a boolean to say whether ACPI capabilities were detected

	* doc/spec/hal-spec.xml.in: Update the spec a bit more on battery.*



Index: hal-spec.html
===================================================================
RCS file: /cvs/hal/hal/doc/spec/hal-spec.html,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- hal-spec.html	1 Feb 2005 05:17:55 -0000	1.41
+++ hal-spec.html	3 Feb 2005 00:21:50 -0000	1.42
@@ -512,21 +512,21 @@
 ><DL
 ><DT
 ><A
-HREF="#AEN2513"
+HREF="#AEN2507"
 >Interface org.freedesktop.Hal.Manager</A
 ></DT
 ><DD
 ><DL
 ><DT
 ><A
-HREF="#AEN2524"
+HREF="#AEN2518"
 >Example</A
 ></DT
 ></DL
 ></DD
 ><DT
 ><A
-HREF="#AEN2532"
+HREF="#AEN2526"
 >Interface org.freedesktop.Hal.Device</A
 ></DT
 ></DL
@@ -6149,6 +6149,10 @@
 >, <TT
 CLASS="literal"
 >VA</TT
+>,
+		<TT
+CLASS="literal"
+>percent</TT
 ></TD
 ><TD
 >No</TD
@@ -6163,7 +6167,7 @@
 ><TD
 ><TT
 CLASS="literal"
->battery.charge_level.maximum_specified</TT
+>battery.charge_level.maximum</TT
 > (int)</TD
 ><TD
 >&nbsp;</TD
@@ -6175,31 +6179,7 @@
 CLASS="literal"
 >"battery.charge_level.unit"</TT
 >
-		units. It should  represent theoretical limit as specified
-		in the documentation.
-	      </TD
-></TR
-><TR
-><TD
-><TT
-CLASS="literal"
->battery.charge_level.maximum_real</TT
-> (int)</TD
-><TD
->&nbsp;</TD
-><TD
->No</TD
-><TD
->&#13;		The maximum level of charge which the device can hold, 
-	      	taking its age into account. Measured in 
-		<TT
-CLASS="literal"
->"battery.charge_level.unit"</TT
-> units. As the 
-		battery gets older, this value can degrade - it should 
-		represent the practical limit, not the theoretical one. 
-		The user-level apps  should use this value, if present, 
-		in all the percentage calculations.
+		units.
 	      </TD
 ></TR
 ><TR
@@ -6375,7 +6355,7 @@
 ><P
 ></P
 ><A
-NAME="AEN1988"
+NAME="AEN1982"
 ></A
 ><TABLE
 BORDER="1"
@@ -6489,7 +6469,7 @@
 ><P
 ></P
 ><A
-NAME="AEN2032"
+NAME="AEN2026"
 ></A
 ><TABLE
 BORDER="1"
@@ -6554,7 +6534,7 @@
 ><P
 ></P
 ><A
-NAME="AEN2052"
+NAME="AEN2046"
 ></A
 ><TABLE
 BORDER="1"
@@ -6648,7 +6628,7 @@
 ><P
 ></P
 ><A
-NAME="AEN2084"
+NAME="AEN2078"
 ></A
 ><TABLE
 BORDER="1"
@@ -6759,7 +6739,7 @@
 ><P
 ></P
 ><A
-NAME="AEN2126"
+NAME="AEN2120"
 ></A
 ><TABLE
 BORDER="1"
@@ -6911,7 +6891,7 @@
 ><P
 ></P
 ><A
-NAME="AEN2184"
+NAME="AEN2178"
 ></A
 ><TABLE
 BORDER="1"
@@ -7070,7 +7050,7 @@
 ><P
 ></P
 ><A
-NAME="AEN2236"
+NAME="AEN2230"
 ></A
 ><TABLE
 BORDER="1"
@@ -7199,7 +7179,7 @@
 ><P
 ></P
 ><A
-NAME="AEN2277"
+NAME="AEN2271"
 ></A
 ><TABLE
 BORDER="1"
@@ -8238,7 +8218,7 @@
 ><P
 ></P
 ><A
-NAME="AEN2471"
+NAME="AEN2465"
 ></A
 ><TABLE
 BORDER="1"
@@ -8398,7 +8378,7 @@
 ><HR><H2
 CLASS="sect1"
 ><A
-NAME="AEN2513"
+NAME="AEN2507"
 >Interface org.freedesktop.Hal.Manager</A
 ></H2
 ><P
@@ -8514,7 +8494,7 @@
 ><HR><H3
 CLASS="sect2"
 ><A
-NAME="AEN2524"
+NAME="AEN2518"
 >Example</A
 ></H3
 ><P
@@ -8632,7 +8612,7 @@
 ><HR><H2
 CLASS="sect1"
 ><A
-NAME="AEN2532"
+NAME="AEN2526"
 >Interface org.freedesktop.Hal.Device</A
 ></H2
 ><P

Index: hal-spec.xml.in
===================================================================
RCS file: /cvs/hal/hal/doc/spec/hal-spec.xml.in,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- hal-spec.xml.in	1 Feb 2005 05:17:55 -0000	1.30
+++ hal-spec.xml.in	3 Feb 2005 00:21:50 -0000	1.31
@@ -3042,7 +3042,8 @@
 	    </row>
             <row>
               <entry><literal>battery.charge_level.unit</literal> (string)</entry>
-              <entry>Examples: <literal>mWh</literal>, <literal>VA</literal></entry>
+              <entry>Examples: <literal>mWh</literal>, <literal>VA</literal>, 
+		<literal>percent</literal></entry>
               <entry>No</entry>
               <entry>
 		The physical unit used by the charge level properties
@@ -3052,28 +3053,13 @@
 	      </entry>
 	    </row>
             <row>
-              <entry><literal>battery.charge_level.maximum_specified</literal> (int)</entry>
+              <entry><literal>battery.charge_level.maximum</literal> (int)</entry>
               <entry></entry>
               <entry>Yes</entry>
               <entry>
 		The maximum level of charge which the device can hold. 
 	        Measured in <literal>"battery.charge_level.unit"</literal>
-		units. It should  represent theoretical limit as specified
-		in the documentation.
-	      </entry>
-	    </row>
-            <row>
-              <entry><literal>battery.charge_level.maximum_real</literal> (int)</entry>
-              <entry></entry>
-              <entry>No</entry>
-              <entry>
-		The maximum level of charge which the device can hold, 
-	      	taking its age into account. Measured in 
-		<literal>"battery.charge_level.unit"</literal> units. As the 
-		battery gets older, this value can degrade - it should 
-		represent the practical limit, not the theoretical one. 
-		The user-level apps  should use this value, if present, 
-		in all the percentage calculations.
+		units.
 	      </entry>
 	    </row>
             <row>