hal: Branch 'master'

[Danny Kukawka]

 configure.in                                                 |    7 ++
 fdi/information/10freedesktop/10-dell-rfkill-switch-wwan.fdi |   26 +++++++++++
 fdi/information/10freedesktop/Makefile.am                    |    4 +
 3 files changed, 37 insertions(+)

New commits:
commit f3b25228416d65345ae75e9f7a0b0f059da7939f
Author: Faidon Liambotis <paravoid at debian.org>
Date:   Fri Jan 25 17:23:10 2008 +0100

    add a WWAN (Wireless WAN/Cellular) killswitch for Dell laptops
    
    Add Dell's WWAN killswitch (HAL 0.5.11) to the FDI.

diff --git a/configure.in b/configure.in
index b0d2ed5..0ab990b 100644
--- a/configure.in
+++ b/configure.in
@@ -47,6 +47,12 @@ AC_ARG_ENABLE(killswitch_dell_bluetooth, [  --enable-killswitch-dell-bluetooth
 AM_CONDITIONAL(BUILD_KILLSWITCH_DELL_BLUETOOTH, test x$enable_killswitch_dell_bluetooth == xyes)
 
 dnl ---------------------------------------------------------------------------
+dnl - Should we enable WWAN killswitch support for Dell laptops?
+dnl ---------------------------------------------------------------------------
+AC_ARG_ENABLE(killswitch_dell_wwan, [  --enable-killswitch-dell-wwan   Include support for WWAN killswitch (requires hal >= 0.5.11)],enable_killswitch_dell_wwan=$enableval,enable_killswitch_dell_wwan=yes)
+AM_CONDITIONAL(BUILD_KILLSWITCH_DELL_WWAN, test x$enable_killswitch_dell_wwan == xyes)
+
+dnl ---------------------------------------------------------------------------
 dnl - Should we enable Bluetooth killswitch support for Sony laptops?
 dnl ---------------------------------------------------------------------------
 AC_ARG_ENABLE(killswitch_sony_bluetooth, [  --enable-killswitch-sony-bluetooth   Include support for Bluetooth killswitch],enable_killswitch_sony_bluetooth=$enableval,enable_killswitch_sony_bluetooth=yes)
@@ -90,6 +96,7 @@ echo "
         video suspend data:                     ${enable_video}
         killswitch support for Dell wlan:       ${enable_killswitch_dell_wlan}
         killswitch support for Dell Bluetooth:  ${enable_killswitch_dell_bluetooth}
+        killswitch support for Dell wwan:       ${enable_killswitch_dell_wwan} (requires hal >= 0.5.11)
         killswitch support for Sony Bluetooth:  ${enable_killswitch_sony_bluetooth}
         killswitch support for IPW wlan:        ${enable_killswitch_ipw_wlan} (requires hal >= 0.5.10)
 "
diff --git a/fdi/information/10freedesktop/10-dell-rfkill-switch-wwan.fdi b/fdi/information/10freedesktop/10-dell-rfkill-switch-wwan.fdi
new file mode 100644
index 0000000..b975a8a
--- /dev/null
+++ b/fdi/information/10freedesktop/10-dell-rfkill-switch-wwan.fdi
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deviceinfo version="0.2">
+
+  <device>
+    <match key="system.kernel.name" string="Linux"> 
+      <match key="system.hardware.vendor" string="Dell Inc.">
+        <match key="system.formfactor" string="laptop">
+	  <!-- TODO: check if laptop actually sports an SMI interface -->
+          <spawn udi="/org/freedesktop/Hal/devices/dell_wwan_switch"/>
+        </match>
+      </match>
+    </match>
+  </device>
+
+  <device>
+    <match key="info.udi" string="/org/freedesktop/Hal/devices/dell_wwan_switch">
+      <append key="info.capabilities" type="strlist">killswitch</append>
+      <merge key="info.product" type="string">Dell WWAN Switch</merge>
+      <merge key="info.category" type="string">killswitch</merge>
+      <merge key="killswitch.type" type="string">wwan</merge>
+      <merge key="killswitch.access_method" type="string">dell</merge>
+    </match>
+  </device>
+
+</deviceinfo>
diff --git a/fdi/information/10freedesktop/Makefile.am b/fdi/information/10freedesktop/Makefile.am
index 2483287..a7b03dd 100644
--- a/fdi/information/10freedesktop/Makefile.am
+++ b/fdi/information/10freedesktop/Makefile.am
@@ -18,6 +18,10 @@ if BUILD_KILLSWITCH_DELL_BLUETOOTH
 dist_fdi_DATA += 10-dell-rfkill-switch-bluetooth.fdi 
 endif
 
+if BUILD_KILLSWITCH_DELL_WWAN
+dist_fdi_DATA += 10-dell-rfkill-switch-wwan.fdi 
+endif
+
 if BUILD_KILLSWITCH_SONY_BLUETOOTH
 dist_fdi_DATA += 10-sony-bluetooth-switch.fdi
 endif