hal/doc/spec hal-spec.html,1.40,1.41 hal-spec.xml.in,1.29,1.30

David Zeuthen david at freedesktop.org
Mon Jan 31 21:17:57 PST 2005


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

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

	This is largely based on this patch

	 http://lists.freedesktop.org/archives/hal/2005-January/002002.html

	from Richard Hughes <ee21rh at surrey.ac.uk> but much mangled by
	myself

	* hald/linux2/util.c (hal_util_get_parent_path): Renamed from
	hal_util_get_parent_sysfs_path.
	(hal_util_grep_file): New function
	(hal_util_set_string_elem_from_file): New function
	(hal_util_set_int_elem_from_file): New function
	(hal_util_set_bool_elem_from_file): New function

	* hald/linux2/util.h: Add new prototypes

	* hald/linux2/osspec.c (osspec_probe): Call acpi_probe.

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

	* hald/linux2/Makefile.am (libhald_linux2_la_SOURCES): Add acpi.[ch]



Index: hal-spec.html
===================================================================
RCS file: /cvs/hal/hal/doc/spec/hal-spec.html,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- hal-spec.html	31 Jan 2005 20:06:38 -0000	1.40
+++ hal-spec.html	1 Feb 2005 05:17:55 -0000	1.41
@@ -360,26 +360,26 @@
 ></DT
 ><DT
 ><A
-HREF="#device-properties-battery"
+HREF="#device-properties-system"
 ><TT
 CLASS="literal"
->battery</TT
+>system</TT
 > namespace</A
 ></DT
 ><DT
 ><A
-HREF="#device-properties-system"
+HREF="#device-properties-system-ac_adaptor"
 ><TT
 CLASS="literal"
->system</TT
+>system.ac_adaptor</TT
 > namespace</A
 ></DT
 ><DT
 ><A
-HREF="#device-properties-system-ac_adaptor"
+HREF="#device-properties-battery"
 ><TT
 CLASS="literal"
->system.ac_adaptor</TT
+>battery</TT
 > namespace</A
 ></DT
 ><DT
@@ -512,21 +512,21 @@
 ><DL
 ><DT
 ><A
-HREF="#AEN2536"
+HREF="#AEN2513"
 >Interface org.freedesktop.Hal.Manager</A
 ></DT
 ><DD
 ><DL
 ><DT
 ><A
-HREF="#AEN2547"
+HREF="#AEN2524"
 >Example</A
 ></DT
 ></DL
 ></DD
 ><DT
 ><A
-HREF="#AEN2555"
+HREF="#AEN2532"
 >Interface org.freedesktop.Hal.Device</A
 ></DT
 ></DL
@@ -1775,88 +1775,21 @@
 ><TD
 ><TT
 CLASS="literal"
->linux.procfs_path</TT
+>linux.acpi_path</TT
 > (string)</TD
 ><TD
 >example: /proc/acpi/button/power/PWRF, /proc/pmu/battery_0</TD
 ><TD
 >No</TD
 ><TD
->&#13;                A fully-qualified path into the procfs filesystem for the 
-                physical device
-              </TD
-></TR
-><TR
-><TD
-><TT
-CLASS="literal"
->linux.procfs_path.keyname</TT
-> (string)</TD
-><TD
->example: "remaining capacity"</TD
-><TD
->Yes, if linux.procfs_path is set</TD
-><TD
->&#13;                The keyname that HAL can use to extract the data from the procfs file
-              </TD
-></TR
-><TR
-><TD
-><TT
-CLASS="literal"
->linux.acpi_version</TT
-> (string)</TD
-><TD
->example: 20041210</TD
-><TD
->No</TD
-><TD
->&#13;                The in-kernel driver version providing ACPI services
+>&#13;                A fully-qualified path into the procfs filesystem for a
+                device object representing an ACPI abstraction.
               </TD
 ></TR
 ><TR
 ><TD
 ><TT
 CLASS="literal"
->linux.pmu_device</TT
-> (string)</TD
-><TD
->example: /dev/pmu</TD
-><TD
->No</TD
-><TD
->The udev assigned device file for PMU.</TD
-></TR
-><TR
-><TD
-><TT
-CLASS="literal"
->linux.pmu_driver_version</TT
-> (string)</TD
-><TD
->example: 2</TD
-><TD
->No</TD
-><TD
->PMU driver version</TD
-></TR
-><TR
-><TD
-><TT
-CLASS="literal"
->linux.pmu_firmware_version</TT
-> (string)</TD
-><TD
->example: 0c</TD
-><TD
->No</TD
-><TD
->PMU firmware version</TD
-></TR
-><TR
-><TD
-><TT
-CLASS="literal"
 >linux.driver</TT
 > (string)</TD
 ><TD
@@ -1954,7 +1887,7 @@
 ><P
 ></P
 ><A
-NAME="AEN376"
+NAME="AEN346"
 ></A
 ><TABLE
 BORDER="1"
@@ -2177,7 +2110,7 @@
 ><P
 ></P
 ><A
-NAME="AEN465"
+NAME="AEN435"
 ></A
 ><TABLE
 BORDER="1"
@@ -2569,7 +2502,7 @@
 ><P
 ></P
 ><A
-NAME="AEN628"
+NAME="AEN598"
 ></A
 ><TABLE
 BORDER="1"
@@ -2698,7 +2631,7 @@
 ><P
 ></P
 ><A
-NAME="AEN675"
+NAME="AEN645"
 ></A
 ><TABLE
 BORDER="1"
@@ -2783,7 +2716,7 @@
 ><P
 ></P
 ><A
-NAME="AEN703"
+NAME="AEN673"
 ></A
 ><TABLE
 BORDER="1"
@@ -2879,7 +2812,7 @@
 ><P
 ></P
 ><A
-NAME="AEN733"
+NAME="AEN703"
 ></A
 ><TABLE
 BORDER="1"
@@ -2948,7 +2881,7 @@
 ><P
 ></P
 ><A
-NAME="AEN754"
+NAME="AEN724"
 ></A
 ><TABLE
 BORDER="1"
@@ -3065,7 +2998,7 @@
 ><P
 ></P
 ><A
-NAME="AEN795"
+NAME="AEN765"
 ></A
 ><TABLE
 BORDER="1"
@@ -3187,7 +3120,7 @@
 ><P
 ></P
 ><A
-NAME="AEN840"
+NAME="AEN810"
 ></A
 ><TABLE
 BORDER="1"
@@ -3308,7 +3241,7 @@
 ><P
 ></P
 ><A
-NAME="AEN885"
+NAME="AEN855"
 ></A
 ><TABLE
 BORDER="1"
@@ -3381,7 +3314,7 @@
 ><P
 ></P
 ><A
-NAME="AEN907"
+NAME="AEN877"
 ></A
 ><TABLE
 BORDER="1"
@@ -3578,7 +3511,7 @@
 ><P
 ></P
 ><A
-NAME="AEN967"
+NAME="AEN937"
 ></A
 ><TABLE
 BORDER="1"
@@ -3871,7 +3804,7 @@
 ><P
 ></P
 ><A
-NAME="AEN1090"
+NAME="AEN1060"
 ></A
 ><TABLE
 BORDER="1"
@@ -4009,7 +3942,7 @@
 ><P
 ></P
 ><A
-NAME="AEN1133"
+NAME="AEN1103"
 ></A
 ><TABLE
 BORDER="1"
@@ -4120,7 +4053,7 @@
 ><P
 ></P
 ><A
-NAME="AEN1169"
+NAME="AEN1139"
 ></A
 ><TABLE
 BORDER="1"
@@ -4382,7 +4315,7 @@
 ><P
 ></P
 ><A
-NAME="AEN1276"
+NAME="AEN1246"
 ></A
 ><TABLE
 BORDER="1"
@@ -4870,7 +4803,7 @@
 ><P
 ></P
 ><A
-NAME="AEN1470"
+NAME="AEN1440"
 ></A
 ><TABLE
 BORDER="1"
@@ -5069,7 +5002,7 @@
 ><P
 ></P
 ><A
-NAME="AEN1550"
+NAME="AEN1520"
 ></A
 ><TABLE
 BORDER="1"
@@ -5223,7 +5156,7 @@
 ><P
 ></P
 ><A
-NAME="AEN1608"
+NAME="AEN1578"
 ></A
 ><TABLE
 BORDER="1"
@@ -5354,7 +5287,7 @@
 ><P
 ></P
 ><A
-NAME="AEN1650"
+NAME="AEN1620"
 ></A
 ><TABLE
 BORDER="1"
@@ -5427,7 +5360,7 @@
 ><P
 ></P
 ><A
-NAME="AEN1672"
+NAME="AEN1642"
 ></A
 ><TABLE
 BORDER="1"
@@ -5494,7 +5427,7 @@
 ><P
 ></P
 ><A
-NAME="AEN1692"
+NAME="AEN1662"
 ></A
 ><TABLE
 BORDER="1"
@@ -5559,7 +5492,7 @@
 ><P
 ></P
 ><A
-NAME="AEN1712"
+NAME="AEN1682"
 ></A
 ><TABLE
 BORDER="1"
@@ -5686,7 +5619,7 @@
 ><P
 ></P
 ><A
-NAME="AEN1756"
+NAME="AEN1726"
 ></A
 ><TABLE
 BORDER="1"
@@ -5833,7 +5766,7 @@
 ><P
 ></P
 ><A
-NAME="AEN1804"
+NAME="AEN1774"
 ></A
 ><TABLE
 BORDER="1"
@@ -5934,6 +5867,95 @@
 ><HR><H3
 CLASS="sect2"
 ><A
+NAME="device-properties-system"
+><TT
+CLASS="literal"
+>system</TT
+> namespace</A
+></H3
+><P
+>&#13;
+        Device objects with the capability <TT
+CLASS="literal"
+>system</TT
+>
+        represent system devices currently accessed through
+        the ACPI and PMU bus.
+
+      </P
+></DIV
+><DIV
+CLASS="sect2"
+><HR><H3
+CLASS="sect2"
+><A
+NAME="device-properties-system-ac_adaptor"
+><TT
+CLASS="literal"
+>system.ac_adaptor</TT
+> namespace</A
+></H3
+><P
+>&#13;
+        Device objects with the capability <TT
+CLASS="literal"
+>system.ac_adaptor</TT
+>
+        represent all the devices capable of powering the system from AC power
+
+      </P
+><DIV
+CLASS="informaltable"
+><P
+></P
+><A
+NAME="AEN1821"
+></A
+><TABLE
+BORDER="1"
+BGCOLOR="#E0E0E0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><THEAD
+><TR
+><TH
+>Key (type)</TH
+><TH
+>Values</TH
+><TH
+>Mandatory</TH
+><TH
+>Description</TH
+></TR
+></THEAD
+><TBODY
+><TR
+><TD
+><TT
+CLASS="literal"
+>system.ac_adaptor.present</TT
+> (bool)</TD
+><TD
+>&nbsp;</TD
+><TD
+>Yes</TD
+><TD
+>&#13;                The state of the adaptor, i.e. whether it is providing power to
+                the unit from mains power.
+              </TD
+></TR
+></TBODY
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><DIV
+CLASS="sect2"
+><HR><H3
+CLASS="sect2"
+><A
 NAME="device-properties-battery"
 ><TT
 CLASS="literal"
@@ -5948,14 +5970,14 @@
 >
 	represent all the devices having some battery (in many cases - 
 	rechargeable) inside. 
-	The following properties are available:
+
       </P
 ><DIV
 CLASS="informaltable"
 ><P
 ></P
 ><A
-NAME="AEN1846"
+NAME="AEN1841"
 ></A
 ><TABLE
 BORDER="1"
@@ -5980,6 +6002,21 @@
 ><TD
 ><TT
 CLASS="literal"
+>battery.present</TT
+> (bool)</TD
+><TD
+>&nbsp;</TD
+><TD
+>Yes</TD
+><TD
+>&#13;		This is present as some smart batteries can have acpi/pmu 
+                entries, and be physically missing.
+	      </TD
+></TR
+><TR
+><TD
+><TT
+CLASS="literal"
 >battery.type</TT
 > (string)</TD
 ><TD
@@ -6108,7 +6145,7 @@
 ><TD
 >Examples: <TT
 CLASS="literal"
->mWatt</TT
+>mWh</TT
 >, <TT
 CLASS="literal"
 >VA</TT
@@ -6116,17 +6153,17 @@
 ><TD
 >No</TD
 ><TD
->&#13;		The physical unit used by the charge level properties 
-		(maximum and current). In many cases, this property is empty
-		- which indicates that the charge properties are measured in
-		some unknown units.
+>&#13;		The physical unit used by the charge level properties
+		(maximum and current). In many cases, this property is
+		omitted - which indicates that the charge properties
+		are measured in some unknown units.
 	      </TD
 ></TR
 ><TR
 ><TD
 ><TT
 CLASS="literal"
->battery.charge_level.maximum.specified</TT
+>battery.charge_level.maximum_specified</TT
 > (int)</TD
 ><TD
 >&nbsp;</TD
@@ -6146,7 +6183,7 @@
 ><TD
 ><TT
 CLASS="literal"
->battery.charge_level.maximum.real</TT
+>battery.charge_level.maximum_real</TT
 > (int)</TD
 ><TD
 >&nbsp;</TD
@@ -6213,37 +6250,25 @@
 >battery.is_rechargeable</TT
 > is TRUE</TD
 ><TD
->&#13;		True if the device is charging, false otherwise.</TD
+>&#13;		TRUE if, and only if, the battery is charging.
+              </TD
 ></TR
 ><TR
 ><TD
 ><TT
 CLASS="literal"
->battery.rechargeable.time_to_charge</TT
-> (int)</TD
+>battery.rechargeable.is_discharging</TT
+> (bool)</TD
 ><TD
 >&nbsp;</TD
 ><TD
->No</TD
-><TD
->&#13;		The time (measured in seconds) necessary for the 
-                rechargeable device to charge fully.
-	      </TD
-></TR
-><TR
-><TD
-><TT
+>Only if <TT
 CLASS="literal"
->battery.time_to_discharge</TT
-> (int)</TD
-><TD
->&nbsp;</TD
-><TD
->No</TD
+>battery.is_rechargeable</TT
+> is TRUE</TD
 ><TD
->&#13;		The expected worktime of the device (measured in 
-                seconds), without recharging, from the current moment.
-	      </TD
+>&#13;		TRUE if, and only if, the battery is discharging.
+              </TD
 ></TR
 ><TR
 ><TD
@@ -6294,105 +6319,30 @@
 ><TD
 ><TT
 CLASS="literal"
->battery.serial</TT
+>battery.technology</TT
 > (string)</TD
 ><TD
->&nbsp;</TD
+>example: LION</TD
 ><TD
 >No</TD
 ><TD
->&#13;		A string uniquely identifying the instance of the battery; 
-		it will be different for two (otherwise) identical batteries.
+>&#13;		The technology of the battery.
 	      </TD
 ></TR
-></TBODY
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="sect2"
-><HR><H3
-CLASS="sect2"
-><A
-NAME="device-properties-system"
-><TT
-CLASS="literal"
->system</TT
-> namespace</A
-></H3
-><P
->&#13;
-        Device objects with the capability <TT
-CLASS="literal"
->system</TT
->
-        represent system devices currently accessed through
-        the ACPI and PMU bus.
-
-      </P
-></DIV
-><DIV
-CLASS="sect2"
-><HR><H3
-CLASS="sect2"
-><A
-NAME="device-properties-system-ac_adaptor"
-><TT
-CLASS="literal"
->system.ac_adaptor</TT
-> namespace</A
-></H3
-><P
->&#13;
-        Device objects with the capability <TT
-CLASS="literal"
->system.ac_adaptor</TT
->
-        represent all the devices capable of powering the system from AC power
-
-      </P
-><DIV
-CLASS="informaltable"
-><P
-></P
-><A
-NAME="AEN1991"
-></A
-><TABLE
-BORDER="1"
-BGCOLOR="#E0E0E0"
-CELLSPACING="0"
-CELLPADDING="4"
-CLASS="CALSTABLE"
-><THEAD
-><TR
-><TH
->Key (type)</TH
-><TH
->Values</TH
-><TH
->Mandatory</TH
-><TH
->Description</TH
-></TR
-></THEAD
-><TBODY
 ><TR
 ><TD
 ><TT
 CLASS="literal"
->system.ac_adaptor.enabled</TT
-> (bool)</TD
+>battery.serial</TT
+> (string)</TD
 ><TD
 >&nbsp;</TD
 ><TD
->Yes</TD
+>No</TD
 ><TD
->&#13;                The state of the adaptor, i.e. whether it is providing power to
-                the unit
-              </TD
+>&#13;		A string uniquely identifying the instance of the battery; 
+		it will be different for two (otherwise) identical batteries.
+	      </TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6425,7 +6375,7 @@
 ><P
 ></P
 ><A
-NAME="AEN2011"
+NAME="AEN1988"
 ></A
 ><TABLE
 BORDER="1"
@@ -6463,7 +6413,7 @@
 ><TD
 >&nbsp;</TD
 ><TD
->lid_switch</TD
+>lid</TD
 ><TD
 >&nbsp;</TD
 ><TD
@@ -6539,7 +6489,7 @@
 ><P
 ></P
 ><A
-NAME="AEN2055"
+NAME="AEN2032"
 ></A
 ><TABLE
 BORDER="1"
@@ -6604,7 +6554,7 @@
 ><P
 ></P
 ><A
-NAME="AEN2075"
+NAME="AEN2052"
 ></A
 ><TABLE
 BORDER="1"
@@ -6698,7 +6648,7 @@
 ><P
 ></P
 ><A
-NAME="AEN2107"
+NAME="AEN2084"
 ></A
 ><TABLE
 BORDER="1"
@@ -6809,7 +6759,7 @@
 ><P
 ></P
 ><A
-NAME="AEN2149"
+NAME="AEN2126"
 ></A
 ><TABLE
 BORDER="1"
@@ -6961,7 +6911,7 @@
 ><P
 ></P
 ><A
-NAME="AEN2207"
+NAME="AEN2184"
 ></A
 ><TABLE
 BORDER="1"
@@ -7120,7 +7070,7 @@
 ><P
 ></P
 ><A
-NAME="AEN2259"
+NAME="AEN2236"
 ></A
 ><TABLE
 BORDER="1"
@@ -7249,7 +7199,7 @@
 ><P
 ></P
 ><A
-NAME="AEN2300"
+NAME="AEN2277"
 ></A
 ><TABLE
 BORDER="1"
@@ -8288,7 +8238,7 @@
 ><P
 ></P
 ><A
-NAME="AEN2494"
+NAME="AEN2471"
 ></A
 ><TABLE
 BORDER="1"
@@ -8448,7 +8398,7 @@
 ><HR><H2
 CLASS="sect1"
 ><A
-NAME="AEN2536"
+NAME="AEN2513"
 >Interface org.freedesktop.Hal.Manager</A
 ></H2
 ><P
@@ -8564,7 +8514,7 @@
 ><HR><H3
 CLASS="sect2"
 ><A
-NAME="AEN2547"
+NAME="AEN2524"
 >Example</A
 ></H3
 ><P
@@ -8682,7 +8632,7 @@
 ><HR><H2
 CLASS="sect1"
 ><A
-NAME="AEN2555"
+NAME="AEN2532"
 >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.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- hal-spec.xml.in	17 Jan 2005 18:33:29 -0000	1.29
+++ hal-spec.xml.in	1 Feb 2005 05:17:55 -0000	1.30
@@ -766,49 +766,15 @@
               internally in HAL</entry>
             </row>
             <row>
-              <entry><literal>linux.procfs_path</literal> (string)</entry>
+              <entry><literal>linux.acpi_path</literal> (string)</entry>
               <entry>example: /proc/acpi/button/power/PWRF, /proc/pmu/battery_0</entry>
               <entry>No</entry>
               <entry>
-                A fully-qualified path into the procfs filesystem for the 
-                physical device
-              </entry>
-            </row>
-            <row>
-              <entry><literal>linux.procfs_path.keyname</literal> (string)</entry>
-              <entry>example: "remaining capacity"</entry>
-              <entry>Yes, if linux.procfs_path is set</entry>
-              <entry>
-                The keyname that HAL can use to extract the data from the procfs file
-              </entry>
-            </row>
-            <row>
-              <entry><literal>linux.acpi_version</literal> (string)</entry>
-              <entry>example: 20041210</entry>
-              <entry>No</entry>
-              <entry>
-                The in-kernel driver version providing ACPI services
+                A fully-qualified path into the procfs filesystem for a
+                device object representing an ACPI abstraction.
               </entry>
             </row>
             <row>
-              <entry><literal>linux.pmu_device</literal> (string)</entry>
-              <entry>example: /dev/pmu</entry>
-              <entry>No</entry>
-              <entry>The udev assigned device file for PMU.</entry>
-            </row>
-            <row>
-              <entry><literal>linux.pmu_driver_version</literal> (string)</entry>
-              <entry>example: 2</entry>
-              <entry>No</entry>
-              <entry>PMU driver version</entry>
-            </row>
-            <row>
-              <entry><literal>linux.pmu_firmware_version</literal> (string)</entry>
-              <entry>example: 0c</entry>
-              <entry>No</entry>
-              <entry>PMU firmware version</entry>
-            </row>
-            <row>
               <entry><literal>linux.driver</literal> (string)</entry>
               <entry>examples: agpgart-intel, yenta_cardbus, usb, hub, usbhid</entry>
               <entry>No</entry>
@@ -2927,6 +2893,50 @@
       </informaltable>
     </sect2>
 
+    <sect2 id="device-properties-system">
+      <title><literal>system</literal> namespace</title>
+      <para>
+
+        Device objects with the capability <literal>system</literal>
+        represent system devices currently accessed through
+        the ACPI and PMU bus.
+
+      </para>
+    </sect2>
+
+    <sect2 id="device-properties-system-ac_adaptor">
+      <title><literal>system.ac_adaptor</literal> namespace</title>
+      <para>
+
+        Device objects with the capability <literal>system.ac_adaptor</literal>
+        represent all the devices capable of powering the system from AC power
+
+      </para>
+      <informaltable>
+        <tgroup cols="2">
+          <thead>
+            <row>
+              <entry>Key (type)</entry>
+              <entry>Values</entry>
+              <entry>Mandatory</entry>
+              <entry>Description</entry>
+            </row>
+          </thead>
+          <tbody>
+            <row>
+              <entry><literal>system.ac_adaptor.present</literal> (bool)</entry>
+              <entry></entry>
+              <entry>Yes</entry>
+              <entry>
+                The state of the adaptor, i.e. whether it is providing power to
+                the unit from mains power.
+              </entry>
+            </row>
+          </tbody>
+        </tgroup>
+      </informaltable>
+    </sect2>
+
     <sect2 id="device-properties-battery">
       <title><literal>battery</literal> namespace</title>
       <para>
@@ -2934,9 +2944,8 @@
 	Device objects with the capability <literal>battery</literal>
 	represent all the devices having some battery (in many cases - 
 	rechargeable) inside. 
-	The following properties are available:
-      </para>
 
+      </para>
       <informaltable>
         <tgroup cols="2">
           <thead>
@@ -2948,7 +2957,15 @@
             </row>
           </thead>
           <tbody>
-
+            <row>
+              <entry><literal>battery.present</literal> (bool)</entry>
+              <entry></entry>
+              <entry>Yes</entry>
+              <entry>
+		This is present as some smart batteries can have acpi/pmu 
+                entries, and be physically missing.
+	      </entry>
+            </row>
             <row>
               <entry><literal>battery.type</literal> (string)</entry>
               <entry></entry>
@@ -3025,17 +3042,17 @@
 	    </row>
             <row>
               <entry><literal>battery.charge_level.unit</literal> (string)</entry>
-              <entry>Examples: <literal>mWatt</literal>, <literal>VA</literal></entry>
+              <entry>Examples: <literal>mWh</literal>, <literal>VA</literal></entry>
               <entry>No</entry>
               <entry>
-		The physical unit used by the charge level properties 
-		(maximum and current). In many cases, this property is empty
-		- which indicates that the charge properties are measured in
-		some unknown units.
+		The physical unit used by the charge level properties
+		(maximum and current). In many cases, this property is
+		omitted - which indicates that the charge properties
+		are measured in some unknown units.
 	      </entry>
 	    </row>
             <row>
-              <entry><literal>battery.charge_level.maximum.specified</literal> (int)</entry>
+              <entry><literal>battery.charge_level.maximum_specified</literal> (int)</entry>
               <entry></entry>
               <entry>Yes</entry>
               <entry>
@@ -3046,7 +3063,7 @@
 	      </entry>
 	    </row>
             <row>
-              <entry><literal>battery.charge_level.maximum.real</literal> (int)</entry>
+              <entry><literal>battery.charge_level.maximum_real</literal> (int)</entry>
               <entry></entry>
               <entry>No</entry>
               <entry>
@@ -3078,31 +3095,24 @@
 	        one-time (disposable after one usage).
 	      </entry>
 	    </row>
+
             <row>
               <entry><literal>battery.rechargeable.is_charging</literal> (bool)</entry>
               <entry></entry>
               <entry>Only if <literal>battery.is_rechargeable</literal> is TRUE</entry>
               <entry>
-		True if the device is charging, false otherwise.</entry>
-	    </row>
-            <row>
-              <entry><literal>battery.rechargeable.time_to_charge</literal> (int)</entry>
-              <entry></entry>
-              <entry>No</entry>
-              <entry>
-		The time (measured in seconds) necessary for the 
-                rechargeable device to charge fully.
-	      </entry>
+		TRUE if, and only if, the battery is charging.
+              </entry>
 	    </row>
             <row>
-              <entry><literal>battery.time_to_discharge</literal> (int)</entry>
+              <entry><literal>battery.rechargeable.is_discharging</literal> (bool)</entry>
               <entry></entry>
-              <entry>No</entry>
+              <entry>Only if <literal>battery.is_rechargeable</literal> is TRUE</entry>
               <entry>
-		The expected worktime of the device (measured in 
-                seconds), without recharging, from the current moment.
-	      </entry>
+		TRUE if, and only if, the battery is discharging.
+              </entry>
 	    </row>
+
             <row>
               <entry><literal>battery.command_interface</literal> (string)</entry>
               <entry></entry>
@@ -3114,7 +3124,6 @@
 		coding simplicity.
 	      </entry>
 	    </row>
-
             <row>
               <entry><literal>battery.vendor</literal> (string)</entry>
               <entry></entry>
@@ -3132,6 +3141,14 @@
 	      </entry>
 	    </row>
             <row>
+              <entry><literal>battery.technology</literal> (string)</entry>
+              <entry>example: LION</entry>
+              <entry>No</entry>
+              <entry>
+		The technology of the battery.
+	      </entry>
+	    </row>
+            <row>
               <entry><literal>battery.serial</literal> (string)</entry>
               <entry></entry>
               <entry>No</entry>
@@ -3146,50 +3163,6 @@
       </informaltable>
     </sect2>
 
-    <sect2 id="device-properties-system">
-      <title><literal>system</literal> namespace</title>
-      <para>
-
-        Device objects with the capability <literal>system</literal>
-        represent system devices currently accessed through
-        the ACPI and PMU bus.
-
-      </para>
-    </sect2>
-
-    <sect2 id="device-properties-system-ac_adaptor">
-      <title><literal>system.ac_adaptor</literal> namespace</title>
-      <para>
-
-        Device objects with the capability <literal>system.ac_adaptor</literal>
-        represent all the devices capable of powering the system from AC power
-
-      </para>
-      <informaltable>
-        <tgroup cols="2">
-          <thead>
-            <row>
-              <entry>Key (type)</entry>
-              <entry>Values</entry>
-              <entry>Mandatory</entry>
-              <entry>Description</entry>
-            </row>
-          </thead>
-          <tbody>
-            <row>
-              <entry><literal>system.ac_adaptor.enabled</literal> (bool)</entry>
-              <entry></entry>
-              <entry>Yes</entry>
-              <entry>
-                The state of the adaptor, i.e. whether it is providing power to
-                the unit
-              </entry>
-            </row>
-          </tbody>
-        </tgroup>
-      </informaltable>
-    </sect2>
-
     <sect2 id="device-properties-system-button">
       <title><literal>system.button</literal> namespace</title>
       <para>
@@ -3217,7 +3190,7 @@
             </row>
             <row>
               <entry></entry>
-              <entry>lid_switch</entry>
+              <entry>lid</entry>
               <entry></entry>
               <entry>
                 The switch on a laptop that senses whether the lid is




More information about the hal-commit mailing list