hal/doc/spec hal-spec.html,1.36,1.37
David Zeuthen
david at freedesktop.org
Mon Dec 13 18:57:50 PST 2004
- Previous message: hal ChangeLog,1.375,1.376 README,1.3,1.4 configure.in,1.57,1.58
- Next message: hal/fdi/20freedesktop Makefile.am, 1.5, 1.6 ide-drives.fdi, 1.1,
1.2 usb-zip-drives.fdi, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvs/hal/hal/doc/spec
In directory gabe:/tmp/cvs-serv31002/doc/spec
Modified Files:
hal-spec.html
Log Message:
2004-12-13 David Zeuthen <davidz at redhat.com>
Merged all changes from the stable branch so HEAD is on par.
Index: hal-spec.html
===================================================================
RCS file: /cvs/hal/hal/doc/spec/hal-spec.html,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- hal-spec.html 26 Oct 2004 17:35:21 -0000 1.36
+++ hal-spec.html 14 Dec 2004 02:57:48 -0000 1.37
@@ -2,7 +2,7 @@
<HTML
><HEAD
><TITLE
->HAL 0.4.0 Specification</TITLE
+>HAL 0.4.2 Specification</TITLE
><META
NAME="GENERATOR"
CONTENT="Modular DocBook HTML Stylesheet Version 1.7"></HEAD
@@ -24,7 +24,7 @@
CLASS="title"
><A
NAME="AEN2"
->HAL 0.4.0 Specification</A
+>HAL 0.4.2 Specification</A
></H1
><H3
CLASS="author"
@@ -51,7 +51,7 @@
></DIV
><SPAN
CLASS="releaseinfo"
->Version 0.4.0<BR></SPAN
+>Version 0.4.2<BR></SPAN
><HR></DIV
><DIV
CLASS="TOC"
@@ -358,6 +358,14 @@
>camera</TT
> namespace</A
></DT
+><DT
+><A
+HREF="#device-properties-battery"
+><TT
+CLASS="literal"
+>battery</TT
+> namespace</A
+></DT
></DL
></DD
><DT
@@ -456,21 +464,21 @@
><DL
><DT
><A
-HREF="#AEN2141"
+HREF="#AEN2281"
>Interface org.freedesktop.Hal.Manager</A
></DT
><DD
><DL
><DT
><A
-HREF="#AEN2152"
+HREF="#AEN2292"
>Example</A
></DT
></DL
></DD
><DT
><A
-HREF="#AEN2160"
+HREF="#AEN2300"
>Interface org.freedesktop.Hal.Device</A
></DT
></DL
@@ -634,7 +642,7 @@
></TR
><TR
><TD
->0.4.0</TD
+>0.4.2</TD
><TD
> </TD
><TD
@@ -5791,6 +5799,388 @@
></P
></DIV
></DIV
+><DIV
+CLASS="sect2"
+><HR><H3
+CLASS="sect2"
+><A
+NAME="device-properties-battery"
+><TT
+CLASS="literal"
+>battery</TT
+> namespace</A
+></H3
+><P
+>
+ Device objects with the capability <TT
+CLASS="literal"
+>battery</TT
+>
+ 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="AEN1810"
+></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"
+>battery.type</TT
+> (string)</TD
+><TD
+> </TD
+><TD
+>Yes</TD
+><TD
+> This property defines the type of the device holding the
+ battery. This property is defined for the development
+ simplicity - battery indicators can use it to find the
+ proper iconic representation.
+ </TD
+></TR
+><TR
+><TD
+> </TD
+><TD
+><TT
+CLASS="literal"
+>pda</TT
+></TD
+><TD
+> </TD
+><TD
+> The device containing the battery is a personal digital
+ assistant, e.g. a device that looks like a handheld computer
+ to do specific tasks such as keeping notes or containing
+ a personal database
+ </TD
+></TR
+><TR
+><TD
+> </TD
+><TD
+><TT
+CLASS="literal"
+>ups</TT
+></TD
+><TD
+> </TD
+><TD
+>
+ A battery powered power supply that is
+ guaranteed to provide power to a computer in the event of
+ interruptions in the incoming electrical power. Most of the
+ time this is an external device.
+ </TD
+></TR
+><TR
+><TD
+> </TD
+><TD
+><TT
+CLASS="literal"
+>primary</TT
+></TD
+><TD
+> </TD
+><TD
+> The battery is a primary power source for the system - an
+ example are laptop batteries.
+ </TD
+></TR
+><TR
+><TD
+> </TD
+><TD
+><TT
+CLASS="literal"
+>mouse</TT
+></TD
+><TD
+> </TD
+><TD
+> The device containing the battery is a mouse.
+ </TD
+></TR
+><TR
+><TD
+> </TD
+><TD
+><TT
+CLASS="literal"
+>keyboard</TT
+></TD
+><TD
+> </TD
+><TD
+> The device containing the battery is a keyboard.
+ </TD
+></TR
+><TR
+><TD
+> </TD
+><TD
+><TT
+CLASS="literal"
+>camera</TT
+></TD
+><TD
+> </TD
+><TD
+> The device containing the battery is a camera.
+ </TD
+></TR
+><TR
+><TD
+> </TD
+><TD
+><TT
+CLASS="literal"
+>unknown</TT
+></TD
+><TD
+> </TD
+><TD
+> The device containing the battery is not covered by other types.
+ </TD
+></TR
+><TR
+><TD
+><TT
+CLASS="literal"
+>battery.charge_level.unit</TT
+> (string)</TD
+><TD
+>Examples: <TT
+CLASS="literal"
+>mWatt</TT
+>, <TT
+CLASS="literal"
+>VA</TT
+></TD
+><TD
+>No</TD
+><TD
+> 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.
+ </TD
+></TR
+><TR
+><TD
+><TT
+CLASS="literal"
+>battery.charge_level.maximum.specified</TT
+> (int)</TD
+><TD
+> </TD
+><TD
+>Yes</TD
+><TD
+> The maximum level of charge which the device can hold.
+ Measured in <TT
+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
+> </TD
+><TD
+>No</TD
+><TD
+> 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.
+ </TD
+></TR
+><TR
+><TD
+><TT
+CLASS="literal"
+>battery.charge_level.current</TT
+> (int)</TD
+><TD
+> </TD
+><TD
+>Yes</TD
+><TD
+> The current level of charge which the device can hold.
+ Measured in <TT
+CLASS="literal"
+>"battery.charge_level.unit"</TT
+>
+ units.
+ </TD
+></TR
+><TR
+><TD
+><TT
+CLASS="literal"
+>battery.is_rechargeable</TT
+> (bool)</TD
+><TD
+> </TD
+><TD
+>No</TD
+><TD
+> True if the battery unit is rechargeable, false if its is
+ one-time (disposable after one usage).
+ </TD
+></TR
+><TR
+><TD
+><TT
+CLASS="literal"
+>battery.rechargeable.is_charging</TT
+> (bool)</TD
+><TD
+> </TD
+><TD
+>Only if <TT
+CLASS="literal"
+>battery.is_rechargeable</TT
+> is TRUE</TD
+><TD
+> True if the device is charging, false otherwise.</TD
+></TR
+><TR
+><TD
+><TT
+CLASS="literal"
+>battery.rechargeable.time_to_charge</TT
+> (int)</TD
+><TD
+> </TD
+><TD
+>No</TD
+><TD
+> The time (measured in seconds) necessary for the
+ rechargeable device to charge fully.
+ </TD
+></TR
+><TR
+><TD
+><TT
+CLASS="literal"
+>battery.time_to_discharge</TT
+> (int)</TD
+><TD
+> </TD
+><TD
+>No</TD
+><TD
+> The expected worktime of the device (measured in
+ seconds), without recharging, from the current moment.
+ </TD
+></TR
+><TR
+><TD
+><TT
+CLASS="literal"
+>battery.command_interface</TT
+> (string)</TD
+><TD
+> </TD
+><TD
+>No</TD
+><TD
+> The abstract name allowing daemons and/or user-level apps
+ to distinguish some groups of devices having similar
+ programming interface. Introduced mostly for the daemons'
+ coding simplicity.
+ </TD
+></TR
+><TR
+><TD
+><TT
+CLASS="literal"
+>battery.vendor</TT
+> (string)</TD
+><TD
+> </TD
+><TD
+>No</TD
+><TD
+> Vendor of the battery.
+ </TD
+></TR
+><TR
+><TD
+><TT
+CLASS="literal"
+>battery.model</TT
+> (string)</TD
+><TD
+> </TD
+><TD
+>No</TD
+><TD
+> Make of the battery.
+ </TD
+></TR
+><TR
+><TD
+><TT
+CLASS="literal"
+>battery.serial</TT
+> (string)</TD
+><TD
+> </TD
+><TD
+>No</TD
+><TD
+> A string uniquely identifying the instance of the battery;
+ it will be different for two (otherwise) identical batteries.
+ </TD
+></TR
+></TBODY
+></TABLE
+><P
+></P
+></DIV
+></DIV
></DIV
><DIV
CLASS="sect1"
@@ -5830,7 +6220,7 @@
><P
></P
><A
-NAME="AEN1812"
+NAME="AEN1952"
></A
><TABLE
BORDER="1"
@@ -5989,7 +6379,7 @@
><P
></P
><A
-NAME="AEN1864"
+NAME="AEN2004"
></A
><TABLE
BORDER="1"
@@ -6118,7 +6508,7 @@
><P
></P
><A
-NAME="AEN1905"
+NAME="AEN2045"
></A
><TABLE
BORDER="1"
@@ -6874,6 +7264,12 @@
<merge key="storage.policy.should_mount" type="bool">true</merge>
</match>
</match>
+ <!-- Also add SCSI optical drives -->
+ <match key="storage.bus" string="scsi">
+ <match key="storage.drive_type" string="cdrom">
+ <merge key="storage.policy.should_mount" type="bool">true</merge>
+ </match>
+ </match>
<!-- Handle drives with non-partitioned media -->
<match key="storage.no_partitions_hint" bool="true">
@@ -6881,7 +7277,6 @@
<match key="storage.drive_type" string="cdrom">
<merge key="storage.policy.mount_filesystem" type="string">auto</merge>
<merge key="storage.policy.desired_mount_point" type="string">cdrom</merge>
- <merge key="storage.policy.mount_option.ro" type="bool">true</merge>
<match key="storage.cdrom.cdr" bool="true">
<merge key="storage.policy.desired_mount_point" type="string">cdrecorder</merge>
</match>
@@ -6907,6 +7302,7 @@
<merge key="storage.policy.mount_option.fscontext=system_u:object_r:removable_t" type="bool">true</merge>
</match>
</match>
+
<!-- floppy drives -->
<match key="storage.drive_type" string="floppy">
<merge key="storage.policy.mount_filesystem" type="string">auto</merge>
@@ -6915,6 +7311,24 @@
<merge key="storage.policy.mount_option.fscontext=system_u:object_r:removable_t" type="bool">true</merge>
</match>
</match>
+
+ <!-- zip drives -->
+ <match key="storage.drive_type" string="zip">
+ <merge key="storage.policy.mount_filesystem" type="string">auto</merge>
+ <merge key="storage.policy.desired_mount_point" type="string">zip</merge>
+ <match key="/org/freedesktop/Hal/devices/computer:linux.is_selinux_enabled" bool="true">
+ <merge key="storage.policy.mount_option.fscontext=system_u:object_r:removable_t" type="bool">true</merge>
+ </match>
+ </match>
+
+ <!-- jaz drives -->
+ <match key="storage.drive_type" string="jaz">
+ <merge key="storage.policy.mount_filesystem" type="string">auto</merge>
+ <merge key="storage.policy.desired_mount_point" type="string">jaz</merge>
+ <match key="/org/freedesktop/Hal/devices/computer:linux.is_selinux_enabled" bool="true">
+ <merge key="storage.policy.mount_option.fscontext=system_u:object_r:removable_t" type="bool">true</merge>
+ </match>
+ </match>
</match>
<!-- Normal volumes; use volume label, uuid or drive_type -->
@@ -6930,6 +7344,11 @@
idedisk, scsidisk etc. -->
<merge key="volume.policy.desired_mount_point" type="copy_property">@block.storage_device:storage.bus</merge>
<append key="volume.policy.desired_mount_point" type="string">disk</append>
+
+ <!-- zip drives -->
+ <match key="storage.drive_type" string="zip">
+ <merge key="storage.policy.desired_mount_point" type="string">zip</merge>
+ </match>
<!-- Best: If available use filesystem label -->
<match key="volume.label" empty="false">
@@ -6966,11 +7385,11 @@
volumes smaller than 2GB -->
<match key="volume.size" compare_lt="2147483648">
<match key="@block.storage_device:storage.hotpluggable" bool="true">
- <merge key="volume.policy.mount_option.async" type="bool">true</merge>
+ <merge key="volume.policy.mount_option.sync" type="bool">true</merge>
<merge key="volume.policy.mount_option.noatime" type="bool">true</merge>
</match>
<match key="@block.storage_device:storage.removable" bool="true">
- <merge key="volume.policy.mount_option.async" type="bool">true</merge>
+ <merge key="volume.policy.mount_option.sync" type="bool">true</merge>
<merge key="volume.policy.mount_option.noatime" type="bool">true</merge>
</match>
</match>
@@ -7011,12 +7430,22 @@
<match key="volume.partition.msdos_part_table_type" int="0x0e">
<merge key="volume.policy.should_mount" type="bool">true</merge>
</match>
- </match>
-
-
+ </match>
</match>
</match>
</match>
+
+ </device>
+
+ <!-- Dont want to mount non-hotpluggable fixed disks since ideraid
+ detection isnt complete as hald wrongly detects e.g. partitions
+ from some IDE RAID controllers -->
+ <device>
+ <match key="storage.hotpluggable" bool="false">
+ <match key="storage.removable" bool="false">
+ <merge key="storage.policy.should_mount" type="bool">false</merge>
+ </match>
+ </match>
</device>
</deviceinfo>
@@ -7118,7 +7547,7 @@
><P
></P
><A
-NAME="AEN2099"
+NAME="AEN2239"
></A
><TABLE
BORDER="1"
@@ -7278,7 +7707,7 @@
><HR><H2
CLASS="sect1"
><A
-NAME="AEN2141"
+NAME="AEN2281"
>Interface org.freedesktop.Hal.Manager</A
></H2
><P
@@ -7394,7 +7823,7 @@
><HR><H3
CLASS="sect2"
><A
-NAME="AEN2152"
+NAME="AEN2292"
>Example</A
></H3
><P
@@ -7512,7 +7941,7 @@
><HR><H2
CLASS="sect1"
><A
-NAME="AEN2160"
+NAME="AEN2300"
>Interface org.freedesktop.Hal.Device</A
></H2
><P
- Previous message: hal ChangeLog,1.375,1.376 README,1.3,1.4 configure.in,1.57,1.58
- Next message: hal/fdi/20freedesktop Makefile.am, 1.5, 1.6 ide-drives.fdi, 1.1,
1.2 usb-zip-drives.fdi, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the hal-commit
mailing list