hal/doc/spec hal-spec.html,1.51,1.52 hal-spec.xml.in,1.35,1.36

[David Zeuthen]

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

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

	* doc/spec/hal-spec.xml.in: Change this to remove the property
	battery.charge_level.maximum and introduce battery.charge_level.design
	and battery.charge_level.last_full instead

	* hald/linux2/addons/addon-hid-ups.c (ups_get_static): Update code
	to use new the new properties

	* hald/linux2/pmu.c (battery_refresh): Update code to use new the
	new properties

	* hald/linux2/apm.c (battery_refresh): Update code to use new the
	new properties

	* hald/linux2/acpi.c (battery_refresh): Update code to use new the
	new properties



Index: hal-spec.html
===================================================================
RCS file: /cvs/hal/hal/doc/spec/hal-spec.html,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- hal-spec.html	2 Mar 2005 20:12:00 -0000	1.51
+++ hal-spec.html	2 Mar 2005 21:51:55 -0000	1.52
@@ -512,21 +512,21 @@
 ><DL
 ><DT
 ><A
-HREF="#AEN2586"
+HREF="#AEN2593"
 >Interface org.freedesktop.Hal.Manager</A
 ></DT
 ><DD
 ><DL
 ><DT
 ><A
-HREF="#AEN2597"
+HREF="#AEN2604"
 >Example</A
 ></DT
 ></DL
 ></DD
 ><DT
 ><A
-HREF="#AEN2605"
+HREF="#AEN2612"
 >Interface org.freedesktop.Hal.Device</A
 ></DT
 ></DL
@@ -6348,14 +6348,34 @@
 ><TD
 ><TT
 CLASS="literal"
->battery.charge_level.maximum</TT
+>battery.charge_level.design</TT
 > (int)</TD
 ><TD
 >&nbsp;</TD
 ><TD
 >Yes</TD
 ><TD
->&#13;		The maximum level of charge which the device can hold. 
+>&#13;		The maximum level of charge the device was designed for.
+	        Measured in <TT
+CLASS="literal"
+>"battery.charge_level.unit"</TT
+>
+		units.
+	      </TD
+></TR
+><TR
+><TD
+><TT
+CLASS="literal"
+>battery.charge_level.last_full</TT
+> (int)</TD
+><TD
+>&nbsp;</TD
+><TD
+>Yes</TD
+><TD
+>&#13;		The maximum level of charge the device could hold the last
+		time it was full.
 	        Measured in <TT
 CLASS="literal"
 >"battery.charge_level.unit"</TT
@@ -6552,7 +6572,7 @@
 ><P
 ></P
 ><A
-NAME="AEN2060"
+NAME="AEN2067"
 ></A
 ><TABLE
 BORDER="1"
@@ -6666,7 +6686,7 @@
 ><P
 ></P
 ><A
-NAME="AEN2104"
+NAME="AEN2111"
 ></A
 ><TABLE
 BORDER="1"
@@ -6734,7 +6754,7 @@
 ><P
 ></P
 ><A
-NAME="AEN2125"
+NAME="AEN2132"
 ></A
 ><TABLE
 BORDER="1"
@@ -6828,7 +6848,7 @@
 ><P
 ></P
 ><A
-NAME="AEN2157"
+NAME="AEN2164"
 ></A
 ><TABLE
 BORDER="1"
@@ -6939,7 +6959,7 @@
 ><P
 ></P
 ><A
-NAME="AEN2199"
+NAME="AEN2206"
 ></A
 ><TABLE
 BORDER="1"
@@ -7091,7 +7111,7 @@
 ><P
 ></P
 ><A
-NAME="AEN2257"
+NAME="AEN2264"
 ></A
 ><TABLE
 BORDER="1"
@@ -7250,7 +7270,7 @@
 ><P
 ></P
 ><A
-NAME="AEN2309"
+NAME="AEN2316"
 ></A
 ><TABLE
 BORDER="1"
@@ -7379,7 +7399,7 @@
 ><P
 ></P
 ><A
-NAME="AEN2350"
+NAME="AEN2357"
 ></A
 ><TABLE
 BORDER="1"
@@ -8447,7 +8467,7 @@
 ><P
 ></P
 ><A
-NAME="AEN2544"
+NAME="AEN2551"
 ></A
 ><TABLE
 BORDER="1"
@@ -8607,7 +8627,7 @@
 ><HR><H2
 CLASS="sect1"
 ><A
-NAME="AEN2586"
+NAME="AEN2593"
 >Interface org.freedesktop.Hal.Manager</A
 ></H2
 ><P
@@ -8723,7 +8743,7 @@
 ><HR><H3
 CLASS="sect2"
 ><A
-NAME="AEN2597"
+NAME="AEN2604"
 >Example</A
 ></H3
 ><P
@@ -8841,7 +8861,7 @@
 ><HR><H2
 CLASS="sect1"
 ><A
-NAME="AEN2605"
+NAME="AEN2612"
 >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.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- hal-spec.xml.in	2 Mar 2005 20:12:00 -0000	1.35
+++ hal-spec.xml.in	2 Mar 2005 21:51:55 -0000	1.36
@@ -3149,11 +3149,22 @@
 	      </entry>
 	    </row>
             <row>
-              <entry><literal>battery.charge_level.maximum</literal> (int)</entry>
+              <entry><literal>battery.charge_level.design</literal> (int)</entry>
               <entry></entry>
               <entry>Yes</entry>
               <entry>
-		The maximum level of charge which the device can hold. 
+		The maximum level of charge the device was designed for.
+	        Measured in <literal>"battery.charge_level.unit"</literal>
+		units.
+	      </entry>
+	    </row>
+            <row>
+              <entry><literal>battery.charge_level.last_full</literal> (int)</entry>
+              <entry></entry>
+              <entry>Yes</entry>
+              <entry>
+		The maximum level of charge the device could hold the last
+		time it was full.
 	        Measured in <literal>"battery.charge_level.unit"</literal>
 		units.
 	      </entry>