hal: Branch 'master'

[David Zeuthen]

 fdi/information/10freedesktop/10-dell-rfkill-switch.fdi    |   37 +++++++++++++
 fdi/information/10freedesktop/10-sony-bluetooth-switch.fdi |    4 -
 fdi/information/10freedesktop/Makefile.am                  |    4 +
 3 files changed, 42 insertions(+), 3 deletions(-)

New commits:
diff-tree a6a5f1bee756bd686418778ba06f987e2d918370 (from 58917de0ae967c0fb7c52513521090de18599c24)
Author: David Zeuthen <davidz at redhat.com>
Date:   Fri Mar 23 20:00:33 2007 -0400

    add support for Dell RF kill switches

diff --git a/fdi/information/10freedesktop/10-dell-rfkill-switch.fdi b/fdi/information/10freedesktop/10-dell-rfkill-switch.fdi
new file mode 100644
index 0000000..71cdbde
--- /dev/null
+++ b/fdi/information/10freedesktop/10-dell-rfkill-switch.fdi
@@ -0,0 +1,37 @@
+<?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_bluetooth_switch"/>
+          <spawn udi="/org/freedesktop/Hal/devices/dell_wlan_switch"/>
+        </match>
+      </match>
+    </match>
+  </device>
+
+  <device>
+    <match key="info.udi" string="/org/freedesktop/Hal/devices/dell_bluetooth_switch">
+      <append key="info.capabilities" type="strlist">killswitch</append>
+      <merge key="info.category" type="string">killswitch</merge>
+      <merge key="info.product" type="string">Dell Bluetooth Switch</merge>
+      <merge key="killswitch.type" type="string">bluetooth</merge>
+      <merge key="killswitch.access_method" type="string">dell</merge>
+    </match>
+  </device>
+
+  <device>
+    <match key="info.udi" string="/org/freedesktop/Hal/devices/dell_wlan_switch">
+      <append key="info.capabilities" type="strlist">killswitch</append>
+      <merge key="info.product" type="string">Dell 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">dell</merge>
+    </match>
+  </device>
+
+</deviceinfo>
diff --git a/fdi/information/10freedesktop/10-sony-bluetooth-switch.fdi b/fdi/information/10freedesktop/10-sony-bluetooth-switch.fdi
index e68eb6b..6f489f5 100644
--- a/fdi/information/10freedesktop/10-sony-bluetooth-switch.fdi
+++ b/fdi/information/10freedesktop/10-sony-bluetooth-switch.fdi
@@ -17,8 +17,8 @@
 
   <device>
     <match key="info.udi" string="/org/freedesktop/Hal/devices/sonypic_bluetooth_switch">
-      <append key="info.capabilities" type="strlist">bluetooth_switch</append>
-      <merge key="info.category" type="string">bluetooth_switch</merge>
+      <append key="info.capabilities" type="strlist">killswitch</append>
+      <merge key="info.category" type="string">killswitch</merge>
       <merge key="info.product" type="string">Sony Bluetooth Switch</merge>
       <merge key="killswitch.type" type="string">bluetooth</merge>
       <merge key="killswitch.access_method" type="string">sonypic</merge>
diff --git a/fdi/information/10freedesktop/Makefile.am b/fdi/information/10freedesktop/Makefile.am
index 833f768..594606c 100644
--- a/fdi/information/10freedesktop/Makefile.am
+++ b/fdi/information/10freedesktop/Makefile.am
@@ -8,7 +8,9 @@ dist_fdi_DATA = 10-usb-card-readers.fdi	
 		10-usb-pda.fdi			\
 		10-usbcsr-mice.fdi		\
 		10-laptop-panel-hardware.fdi	\
-		10-cd-dvd-burner.fdi
+		10-cd-dvd-burner.fdi		\
+		10-sony-bluetooth-switch.fdi	\
+		10-dell-rfkill-switch.fdi
 
 if BUILD_RECALL
 dist_fdi_DATA +=				\