hal: Branch 'origin' - 3 commits

[Richard Hughes]

 fdi/information/10freedesktop/10-ipw-rfkill-switch.fdi           |   23 ++++++++++
 fdi/information/10freedesktop/30-keymap-module-thinkpad-acpi.fdi |    8 +--
 2 files changed, 27 insertions(+), 4 deletions(-)

New commits:
diff-tree 61c171876a537a4f315aa14dbfeb792d9bf4ee9f (from 2a1187d05288ffaceedaa07054e778efa8b7e4d1)
Author: Richard Hughes <richard at hughsie.com>
Date:   Tue Jul 17 17:46:13 2007 +0100

    use the new screenlock rather than the 'coffee' bodge

diff --git a/fdi/information/10freedesktop/30-keymap-module-thinkpad-acpi.fdi b/fdi/information/10freedesktop/30-keymap-module-thinkpad-acpi.fdi
index 44f22e0..2c9e8dd 100644
--- a/fdi/information/10freedesktop/30-keymap-module-thinkpad-acpi.fdi
+++ b/fdi/information/10freedesktop/30-keymap-module-thinkpad-acpi.fdi
@@ -146,7 +146,7 @@
 
       <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix="LENOVO">
         <match key="/org/freedesktop/Hal/devices/computer:system.hardware.version" contains="X6">
-          <append key="input.keymap.data" type="strlist">0x01:coffee</append> <!-- Fn+F2 lock -->
+          <append key="input.keymap.data" type="strlist">0x01:screenlock</append> <!-- Fn+F2 lock -->
           <append key="input.keymap.data" type="strlist">0x02:battery</append> <!-- Fn+F3 battery -->
           <append key="input.keymap.data" type="strlist">0x03:sleep</append> <!-- Fn+F4 suspend -->
           <append key="input.keymap.data" type="strlist">0x04:radio</append> <!-- Fn+F5 wifi -->
@@ -161,7 +161,7 @@
           <append key="info.capabilities" type="strlist">input.keymap</append>
         </match>
         <match key="/org/freedesktop/Hal/devices/computer:system.hardware.version" contains="R6">
-          <append key="input.keymap.data" type="strlist">0x01:coffee</append> <!-- Fn+F2 lock -->
+          <append key="input.keymap.data" type="strlist">0x01:screenlock</append> <!-- Fn+F2 lock -->
           <append key="input.keymap.data" type="strlist">0x02:battery</append> <!-- Fn+F3 battery -->
           <append key="input.keymap.data" type="strlist">0x03:sleep</append> <!-- Fn+F4 suspend -->
           <append key="input.keymap.data" type="strlist">0x04:radio</append> <!-- Fn+F5 wifi -->
@@ -176,7 +176,7 @@
           <append key="info.capabilities" type="strlist">input.keymap</append>
         </match>
         <match key="/org/freedesktop/Hal/devices/computer:system.hardware.version" contains="Z6">
-          <append key="input.keymap.data" type="strlist">0x01:coffee</append> <!-- Fn+F2 lock -->
+          <append key="input.keymap.data" type="strlist">0x01:screenlock</append> <!-- Fn+F2 lock -->
           <append key="input.keymap.data" type="strlist">0x02:battery</append> <!-- Fn+F3 battery -->
           <append key="input.keymap.data" type="strlist">0x03:sleep</append> <!-- Fn+F4 suspend -->
           <append key="input.keymap.data" type="strlist">0x04:radio</append> <!-- Fn+F5 wifi -->
diff-tree 2a1187d05288ffaceedaa07054e778efa8b7e4d1 (from 8f16ce896e8ccc3fef023aa6a9e22021f2b3eba6)
Author: Richard Hughes <richard at hughsie.com>
Date:   Tue Jul 17 17:43:14 2007 +0100

    use the proper name in the new X41 keymap

diff --git a/fdi/information/10freedesktop/30-keymap-module-thinkpad-acpi.fdi b/fdi/information/10freedesktop/30-keymap-module-thinkpad-acpi.fdi
index 947b315..44f22e0 100644
--- a/fdi/information/10freedesktop/30-keymap-module-thinkpad-acpi.fdi
+++ b/fdi/information/10freedesktop/30-keymap-module-thinkpad-acpi.fdi
@@ -130,7 +130,7 @@
           <append key="info.capabilities" type="strlist">input.keymap</append>
         </match>
         <match key="/org/freedesktop/Hal/devices/computer:system.hardware.version" contains="X4">
-          <append key="input.keymap.data" type="strlist">0x02:lock</append> <!-- Fn+F3 lock -->
+          <append key="input.keymap.data" type="strlist">0x02:screenlock</append> <!-- Fn+F3 lock -->
           <append key="input.keymap.data" type="strlist">0x03:sleep</append> <!-- Fn+F4 suspend -->
           <append key="input.keymap.data" type="strlist">0x04:radio</append> <!-- Fn+F5 switch radio -->
           <append key="input.keymap.data" type="strlist">0x06:switchvideomode</append> <!-- Fn+F7 switch video output device -->
diff-tree 8f16ce896e8ccc3fef023aa6a9e22021f2b3eba6 (from f1d80599c70258db2013b52e8fb1e785fb5f1a6a)
Author: Adel Gadllah <adel.gadllah at gmail.com>
Date:   Tue Jul 17 11:29:51 2007 -0400

    add rf kill support for iwl3945 and iwl4965
    
    The iwlwifi driver uses the same rf_kill interface as the
    ipw2100/2200/3945 driver. So all we need to support it is to add it to
    the .fdi file. The attached patch adds support for the iwl3945 and
    iwl4965 drivers

diff --git a/fdi/information/10freedesktop/10-ipw-rfkill-switch.fdi b/fdi/information/10freedesktop/10-ipw-rfkill-switch.fdi
index 983e940..114dc16 100644
--- a/fdi/information/10freedesktop/10-ipw-rfkill-switch.fdi
+++ b/fdi/information/10freedesktop/10-ipw-rfkill-switch.fdi
@@ -1,6 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <deviceinfo version="0.2">
+
+  <device>
+    <match key="/org/freedesktop/Hal/devices/computer:system.formfactor" string="laptop">
+      <!-- Don't use generic ipw rfkill on Dells -->
+      <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" contains_not="Dell">
+        <match key="info.linux.driver" string="iwl4965">
+          <spawn udi="/org/freedesktop/Hal/devices/ipw_wlan_switch"/>
+        </match>
+      </match>
+    </match>
+  </device>
+
+  <device>
+    <match key="/org/freedesktop/Hal/devices/computer:system.formfactor" string="laptop">
+      <!-- Don't use generic ipw rfkill on Dells -->
+      <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" contains_not="Dell">
+        <match key="info.linux.driver" string="iwl3945">
+          <spawn udi="/org/freedesktop/Hal/devices/ipw_wlan_switch"/>
+        </match>
+      </match>
+    </match>
+  </device>
+
   <device>
     <match key="/org/freedesktop/Hal/devices/computer:system.formfactor" string="laptop">
       <!-- Don't use generic ipw rfkill on Dells -->