hal-info: Branch 'master'

[Danny Kukawka]

 configure.in                                           |    7 ++++
 fdi/information/10freedesktop/10-ipw-rfkill-switch.fdi |    2 -
 fdi/information/10freedesktop/10-iwl-rfkill-switch.fdi |   27 +++++++++++++++++
 fdi/information/10freedesktop/Makefile.am              |    4 ++
 4 files changed, 39 insertions(+), 1 deletion(-)

New commits:
commit dd15c4b999790ba7713567fc2e520b51110897ad
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Thu Nov 20 11:04:22 2008 +0100

    split up 10-ipw-rfkill-switch.fdi
    
    Split up 10-ipw-rfkill-switch.fdi. Move iwl* kernel driver handling
    into a new file (10-iwl-rfkill-switch.fdi) and added an new configure
    switch for the file.
    
    This is to prevent trouble with newer kernel versions where the iwl*
    drivers use already the rfkill subsystem which can't get handled by
    hald-addon-ipw-killswitch anymore since the path to the sysfs attribute
    changed.

diff --git a/configure.in b/configure.in
index 6f1ade4..0d74e76 100644
--- a/configure.in
+++ b/configure.in
@@ -70,6 +70,12 @@ dnl ---------------------------------------------------------------------------
 AC_ARG_ENABLE(killswitch_ipw_wlan, [  --enable-killswitch-ipw-wlan   Include support for IPW WLAN killswitch (requires hal >= 0.5.10)],enable_killswitch_ipw_wlan=$enableval,enable_killswitch_ipw_wlan=yes)
 AM_CONDITIONAL(BUILD_KILLSWITCH_IPW_WLAN, test x$enable_killswitch_ipw_wlan == xyes)
 
+dnl ---------------------------------------------------------------------------
+dnl - Should we enable WLAN killswitch support for iwl chipsets?
+dnl ---------------------------------------------------------------------------
+AC_ARG_ENABLE(killswitch_iwl_wlan, [  --enable-killswitch-iwl-wlan   Include support for IWL WLAN killswitch (requires hal >= 0.5.10)],enable_killswitch_iwl_wlan=$enableval,enable_killswitch_iwl_wlan=yes)
+AM_CONDITIONAL(BUILD_KILLSWITCH_IPW_WLAN, test x$enable_killswitch_iwl_wlan == xyes)
+
 AC_OUTPUT([
 Makefile
 fdi/Makefile
@@ -106,4 +112,5 @@ echo "
         killswitch support for Sony Bluetooth:      ${enable_killswitch_sony_bluetooth}
         killswitch support for ThinkPad Bluetooth:  ${enable_killswitch_thinkpad_bluetooth} (requires hal >= 0.5.11)
         killswitch support for IPW wlan:            ${enable_killswitch_ipw_wlan} (requires hal >= 0.5.10)
+        killswitch support for IWL wlan:            ${enable_killswitch_iwl_wlan} (requires hal >= 0.5.10)
 "
diff --git a/fdi/information/10freedesktop/10-ipw-rfkill-switch.fdi b/fdi/information/10freedesktop/10-ipw-rfkill-switch.fdi
index 847fd17..c7aa553 100644
--- a/fdi/information/10freedesktop/10-ipw-rfkill-switch.fdi
+++ b/fdi/information/10freedesktop/10-ipw-rfkill-switch.fdi
@@ -6,7 +6,7 @@
     <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_outof="iwl4965;iwl3945;ipw3945;ipw2200;ipw2100">
+        <match key="info.linux.driver" string_outof="ipw3945;ipw2200;ipw2100">
           <spawn udi="/org/freedesktop/Hal/devices/ipw_wlan_switch"/>
         </match>
       </match>
diff --git a/fdi/information/10freedesktop/10-iwl-rfkill-switch.fdi b/fdi/information/10freedesktop/10-iwl-rfkill-switch.fdi
new file mode 100644
index 0000000..5e2ab51
--- /dev/null
+++ b/fdi/information/10freedesktop/10-iwl-rfkill-switch.fdi
@@ -0,0 +1,27 @@
+<?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 iwl rfkill on Dells -->
+      <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" contains_not="Dell">
+        <match key="info.linux.driver" string_outof="iwl4965;iwl3945">
+          <spawn udi="/org/freedesktop/Hal/devices/iwl_wlan_switch"/>
+        </match>
+      </match>
+    </match>
+  </device>
+
+  <device>
+    <match key="info.udi" string="/org/freedesktop/Hal/devices/iwl_wlan_switch">
+      <append key="info.capabilities" type="strlist">killswitch</append>
+      <merge key="info.product" type="string">Intel PRO/Wireless WLAN Switch</merge>
+      <merge key="info.category" type="string">killswitch</merge>
+      <merge key="killswitch.type" type="string">wlan</merge>
+      <merge key="killswitch.access_method" type="string">ipw</merge>
+    </match>
+  </device>
+
+</deviceinfo>
+
diff --git a/fdi/information/10freedesktop/Makefile.am b/fdi/information/10freedesktop/Makefile.am
index 458be4b..d7e1c5d 100644
--- a/fdi/information/10freedesktop/Makefile.am
+++ b/fdi/information/10freedesktop/Makefile.am
@@ -37,6 +37,10 @@ if BUILD_KILLSWITCH_IPW_WLAN
 dist_fdi_DATA += 10-ipw-rfkill-switch.fdi
 endif
 
+if BUILD_KILLSWITCH_IPW_WLAN
+dist_fdi_DATA += 10-iwl-rfkill-switch.fdi
+endif
+
 
 if BUILD_RECALL
 dist_fdi_DATA +=				\