hal: Branch 'master'

[Danny Kukawka]

 configure.in                                                          |   29 ++++++----
 fdi/information/10freedesktop/10-thinkpad-rfkill-switch-bluetooth.fdi |   24 ++++++++
 fdi/information/10freedesktop/Makefile.am                             |    4 +
 3 files changed, 46 insertions(+), 11 deletions(-)

New commits:
commit 2312b14641537148e2a1216d2fc5085695e919de
Author: Ben Liblit <liblit at cs.wisc.edu>
Date:   Tue Mar 4 19:13:32 2008 +0100

    added support for software bluetooth killswitch for ThinkPads
    
    Added support for software bluetooth killswitch for ThinkPads to
    hal-info. Needs an actual hal (>= 0.5.11) package to work.

diff --git a/configure.in b/configure.in
index 0ab990b..b457da5 100644
--- a/configure.in
+++ b/configure.in
@@ -59,6 +59,12 @@ AC_ARG_ENABLE(killswitch_sony_bluetooth, [  --enable-killswitch-sony-bluetooth
 AM_CONDITIONAL(BUILD_KILLSWITCH_SONY_BLUETOOTH, test x$enable_killswitch_sony_bluetooth == xyes)
 
 dnl ---------------------------------------------------------------------------
+dnl - Should we enable Bluetooth killswitch support for ThinkPad laptops?
+dnl ---------------------------------------------------------------------------
+AC_ARG_ENABLE(killswitch_thinkpad_bluetooth, [  --enable-killswitch-thinkpad-bluetooth   Include support for Bluetooth killswitch],enable_killswitch_thinkpad_bluetooth=$enableval,enable_killswitch_thinkpad_bluetooth=yes)
+AM_CONDITIONAL(BUILD_KILLSWITCH_THINKPAD_BLUETOOTH, test x$enable_killswitch_thinkpad_bluetooth == xyes)
+
+dnl ---------------------------------------------------------------------------
 dnl - Should we enable WLAN killswitch support for ipw chipsets?
 dnl ---------------------------------------------------------------------------
 AC_ARG_ENABLE(killswitch_ipw_wlan, [  --enable-killswitch-ipw-wlan   Include support for WLAN killswitch (requires hal >= 0.5.10)],enable_killswitch_ipw_wlan=$enableval,enable_killswitch_ipw_wlan=yes)
@@ -88,15 +94,16 @@ echo "
         ========================================================="
 fi
 echo "
-        prefix:                                 ${prefix}
-        datarootdir:                            ${datarootdir:-unused}
-        datadir:                                ${datadir}
-        sysconfdir:                             ${sysconfdir}
-        hardware recall data:                   ${enable_recall}
-        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)
+        prefix:                                     ${prefix}
+        datarootdir:                                ${datarootdir:-unused}
+        datadir:                                    ${datadir}
+        sysconfdir:                                 ${sysconfdir}
+        hardware recall data:                       ${enable_recall}
+        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 ThinkPad Bluetooth:  ${enable_killswitch_thinkpad_bluetooth}
+        killswitch support for IPW wlan:            ${enable_killswitch_ipw_wlan} (requires hal >= 0.5.10)
 "
diff --git a/fdi/information/10freedesktop/10-thinkpad-rfkill-switch-bluetooth.fdi b/fdi/information/10freedesktop/10-thinkpad-rfkill-switch-bluetooth.fdi
new file mode 100644
index 0000000..979da51
--- /dev/null
+++ b/fdi/information/10freedesktop/10-thinkpad-rfkill-switch-bluetooth.fdi
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deviceinfo version="0.2">
+
+  <device>
+    <match key="platform.id" string="thinkpad_acpi">
+      <match key="/org/freedesktop/Hal/devices/platform_bluetooth:platform.id" string="bluetooth">
+        <spawn udi="/org/freedesktop/Hal/devices/thinkpad_bluetooth_switch"/>
+      </match>
+    </match>
+  </device>
+
+  <device>
+    <match key="info.udi" string="/org/freedesktop/Hal/devices/thinkpad_bluetooth_switch">
+      <append key="info.capabilities" type="strlist">killswitch</append>
+      <merge key="info.category" type="string">killswitch</merge>
+      <merge key="info.product" type="string">ThinkPad Bluetooth Switch</merge>
+      <merge key="killswitch.type" type="string">bluetooth</merge>
+      <merge key="killswitch.access_method" type="string">thinkpad</merge>
+      <merge key="linux.sysfs_path" type="string">/sys/devices/platform/thinkpad_acpi/bluetooth_enable</merge>
+    </match>
+  </device>
+
+</deviceinfo>
diff --git a/fdi/information/10freedesktop/Makefile.am b/fdi/information/10freedesktop/Makefile.am
index 1e1699a..48766ab 100644
--- a/fdi/information/10freedesktop/Makefile.am
+++ b/fdi/information/10freedesktop/Makefile.am
@@ -27,6 +27,10 @@ if BUILD_KILLSWITCH_SONY_BLUETOOTH
 dist_fdi_DATA += 10-sony-bluetooth-switch.fdi
 endif
 
+if BUILD_KILLSWITCH_THINKPAD_BLUETOOTH
+dist_fdi_DATA += 10-thinkpad-rfkill-switch-bluetooth.fdi
+endif
+
 if BUILD_KILLSWITCH_IPW_WLAN
 dist_fdi_DATA += 10-ipw-rfkill-switch.fdi
 endif