hal: Branch 'master'

[Danny Kukawka]

 doc/spec/hal-spec-properties.xml |    8 ++++++++
 hald/linux/device.c              |    2 ++
 2 files changed, 10 insertions(+)

New commits:
commit 98c2686104fc1c96fc529ce3d41bdb6335da9e13
Author: Guillem Jover <guillem.jover at nokia.com>
Date:   Fri Oct 24 10:45:22 2008 +0200

    add mmc_host slot_name support
    
    Some OMAP boards support multiple MMC slots, and on current Linux a
    sysfs file might be exposed with this information.
    
    Add a new slot_name key to mmc_host to identify the slot position, the
    value can be something like 'external'/'internal', or any other unique
    identifier that distinguishes its location from the other possible
    mmc_host present in the Computer.

diff --git a/doc/spec/hal-spec-properties.xml b/doc/spec/hal-spec-properties.xml
index e5d6012..b05a420 100644
--- a/doc/spec/hal-spec-properties.xml
+++ b/doc/spec/hal-spec-properties.xml
@@ -2278,6 +2278,14 @@ org.freedesktop.Hal.Device.Volume.method_signatures = {'ssas', 'as', 'as'}
               <entry>Yes</entry>
               <entry>A unique number identifying the MMC/SD host adaptor</entry>
             </row>
+            <row>
+              <entry>
+                <literal>mmc_host.slot_name</literal> (string)
+              </entry>
+              <entry>example: internal, external</entry>
+              <entry>No</entry>
+              <entry>A unique string identifying the slot name</entry>
+            </row>
           </tbody>
         </tgroup>
       </informaltable>
diff --git a/hald/linux/device.c b/hald/linux/device.c
index 9f4ab3d..7f529f3 100644
--- a/hald/linux/device.c
+++ b/hald/linux/device.c
@@ -1414,6 +1414,8 @@ mmc_host_add (const gchar *sysfs_path, const gchar *device_file, HalDevice *pare
 	sscanf (last_elem, "mmc%d", &host_num);
 	hal_device_property_set_int (d, "mmc_host.host", host_num);
 
+	hal_util_set_string_from_file (d, "mmc_host.slot_name", sysfs_path, "slot_name");
+
 out:
 	return d;
 }