hal: Branch 'master'

[Jeff Mitchell]

 doc/spec/hal-spec-properties.xml |   36 ++++++------------------------------
 1 files changed, 6 insertions(+), 30 deletions(-)

New commits:
diff-tree c1a5e770569eaf2d038dd7e982037cc221446716 (from e7b7241a92149429a9e74a01f83c7fcce585f5ce)
Author: Jeff Mitchell <kde-dev at emailgoeshere.com>
Date:   Tue Jun 5 08:18:34 2007 -0400

    Deprecate portable_audio_player.access_method because recent spec changes have rendered it useless at best and misleading at worst.

diff --git a/doc/spec/hal-spec-properties.xml b/doc/spec/hal-spec-properties.xml
index 2e3fcef..2d9efec 100644
--- a/doc/spec/hal-spec-properties.xml
+++ b/doc/spec/hal-spec-properties.xml
@@ -4774,36 +4774,6 @@ org.freedesktop.Hal.Device.Volume.method
           <tbody>
             <row>
               <entry>
-                <literal>portable_audio_player.access_method</literal> (string)
-              </entry>
-              <entry></entry>
-              <entry>Yes</entry>
-              <entry>This property defines how the device is accessed </entry>
-            </row>
-            <row>
-              <entry></entry>
-              <entry>storage</entry>
-              <entry></entry>
-              <entry>
-                The device is accessed as a Mass Storage device
-                through a kernel driver.  Application Developers
-                should descent down the device object tree to find the
-                device object of capability
-                <literal>storage</literal> in order to access the
-                device.
-              </entry>
-            </row>
-            <row>
-              <entry></entry>
-              <entry>user</entry>
-              <entry></entry>
-              <entry>
-                The device is accessed from userspace through
-                a userspace driver.
-              </entry>
-            </row>
-            <row>
-              <entry>
                 <literal>portable_audio_player.access_method.protocols</literal> (strlist)
               </entry>
               <entry>example: storage ipod mtp pde iriver karma</entry>
@@ -6749,6 +6719,12 @@ org.freedesktop.Hal.Device.Volume.method
               <entry>Renamed to something more abstract, available until removed.</entry>
             </row>
             <row>
+                <entry><literal>portable_audio_player.access_method</literal> (string)</entry>
+                <entry><literal>portable_audio_player.access_method.[drivers, protocols]</literal> (strlist)</entry>
+                <entry>2008-05-03</entry>
+                <entry>Original entry can only indicate UMS or userspace driver devices, while some devices can be both.  New structure doesn't have this limitation.</entry>
+            </row>
+            <row>
                 <entry><literal>portable_audio_player.type</literal> (string)</entry>
                 <entry><literal>portable_audio_player.access_method.[drivers, protocols]</literal> (strlist)</entry>
                 <entry>2008-05-03</entry>