hal: Branch 'master' - 3 commits
David Zeuthen
david at kemper.freedesktop.org
Mon Jul 9 12:23:47 PDT 2007
configure.in | 40 ++++++-
fdi/information/10freedesktop/10-dell-rfkill-switch-bluetooth.fdi | 26 +++++
fdi/information/10freedesktop/10-dell-rfkill-switch-wlan.fdi | 26 +++++
fdi/information/10freedesktop/10-dell-rfkill-switch.fdi | 37 -------
fdi/information/10freedesktop/10-ipw-rfkill-switch.fdi | 52 ++++++++++
fdi/information/10freedesktop/Makefile.am | 21 +++-
6 files changed, 156 insertions(+), 46 deletions(-)
New commits:
diff-tree 6e4cd71722d7ca190157370646b4944cd6fc90fe (from f0f015d4552cbd2aa2c85a7bd7cb06b95c0eaf73)
Author: David Zeuthen <davidz at redhat.com>
Date: Mon Jul 9 15:23:44 2007 -0400
remove ipw check on sony for rfkill
We only support Bluetooth RF Kill switches anyway.
diff --git a/fdi/information/10freedesktop/10-ipw-rfkill-switch.fdi b/fdi/information/10freedesktop/10-ipw-rfkill-switch.fdi
index d7c26d2..af19ab5 100644
--- a/fdi/information/10freedesktop/10-ipw-rfkill-switch.fdi
+++ b/fdi/information/10freedesktop/10-ipw-rfkill-switch.fdi
@@ -6,12 +6,9 @@
<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">
- <!-- Don't use generic ipw rfkill on Sonys -->
- <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" contains_not="Sony">
- <match key="info.linux.driver" string="ipw3945">
- <spawn udi="/org/freedesktop/Hal/devices/ipw_wlan_switch"/>
- </match>
- </match>
+ <match key="info.linux.driver" string="ipw3945">
+ <spawn udi="/org/freedesktop/Hal/devices/ipw_wlan_switch"/>
+ </match>
</match>
</match>
</device>
@@ -21,12 +18,9 @@
<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">
- <!-- Don't use generic ipw rfkill on Sonys -->
- <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" contains_not="Sony">
- <match key="info.linux.driver" string="ipw2200">
- <spawn udi="/org/freedesktop/Hal/devices/ipw_wlan_switch"/>
- </match>
- </match>
+ <match key="info.linux.driver" string="ipw2200">
+ <spawn udi="/org/freedesktop/Hal/devices/ipw_wlan_switch"/>
+ </match>
</match>
</match>
</device>
@@ -36,15 +30,12 @@
<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">
- <!-- Don't use generic ipw rfkill on Sonys -->
- <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" contains_not="Sony">
- <match key="info.linux.driver" string="ipw2100">
- <spawn udi="/org/freedesktop/Hal/devices/ipw_wlan_switch"/>
- </match>
- </match>
+ <match key="info.linux.driver" string="ipw2100">
+ <spawn udi="/org/freedesktop/Hal/devices/ipw_wlan_switch"/>
+ </match>
</match>
</match>
- </device>
+ </device>
<device>
diff-tree f0f015d4552cbd2aa2c85a7bd7cb06b95c0eaf73 (from 5d4c34ec5a118be9f2235073b7cd48db722b85b9)
Author: David Zeuthen <davidz at redhat.com>
Date: Mon Jul 9 15:04:12 2007 -0400
make all killswitch support optional
This is needed for distros when native kernel killswitch support is landing.
diff --git a/configure.in b/configure.in
index 1c3fbc9..23383a1 100644
--- a/configure.in
+++ b/configure.in
@@ -25,6 +25,30 @@ dnl ------------------------------------
AC_ARG_ENABLE(keymaps, [ --enable-keymaps include key mapping data],enable_keymaps=$enableval,enable_keymaps=yes)
AM_CONDITIONAL(BUILD_KEYMAPS, test x$enable_keymaps == xyes)
+dnl ---------------------------------------------------------------------------
+dnl - Should we enable WLAN killswitch support for Dell laptops?
+dnl ---------------------------------------------------------------------------
+AC_ARG_ENABLE(killswitch_dell_wlan, [ --enable-killswitch-dell-wlan include support for WLAN killswitch],enable_killswitch_dell_wlan=$enableval,enable_killswitch_dell_wlan=yes)
+AM_CONDITIONAL(BUILD_KILLSWITCH_DELL_WLAN, test x$enable_killswitch_dell_wlan == xyes)
+
+dnl ---------------------------------------------------------------------------
+dnl - Should we enable Bluetooth killswitch support for Dell laptops?
+dnl ---------------------------------------------------------------------------
+AC_ARG_ENABLE(killswitch_dell_bluetooth, [ --enable-killswitch-dell-bluetooth include support for Bluetooth killswitch],enable_killswitch_dell_bluetooth=$enableval,enable_killswitch_dell_bluetooth=yes)
+AM_CONDITIONAL(BUILD_KILLSWITCH_DELL_BLUETOOTH, test x$enable_killswitch_dell_bluetooth == 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)
+AM_CONDITIONAL(BUILD_KILLSWITCH_SONY_BLUETOOTH, test x$enable_killswitch_sony_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],enable_killswitch_ipw_wlan=$enableval,enable_killswitch_ipw_wlan=yes)
+AM_CONDITIONAL(BUILD_KILLSWITCH_IPW_WLAN, test x$enable_killswitch_ipw_wlan == xyes)
+
AC_OUTPUT([
Makefile
fdi/Makefile
@@ -41,10 +65,14 @@ echo "
hal-info $VERSION
========================
- prefix: ${prefix}
- datarootdir: ${datarootdir:-unused}
- datadir: ${datadir}
- sysconfdir: ${sysconfdir}
- hardware recall data: ${enable_recall}
- video suspend data: ${enable_video}
+ 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 Sony Bluetooth: ${enable_killswitch_sony_bluetooth}
+ killswitch support for IPW wlan: ${enable_killswitch_ipw_wlan}
"
diff --git a/fdi/information/10freedesktop/10-dell-rfkill-switch-bluetooth.fdi b/fdi/information/10freedesktop/10-dell-rfkill-switch-bluetooth.fdi
new file mode 100644
index 0000000..231eb17
--- /dev/null
+++ b/fdi/information/10freedesktop/10-dell-rfkill-switch-bluetooth.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_bluetooth_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>
+
+</deviceinfo>
diff --git a/fdi/information/10freedesktop/10-dell-rfkill-switch-wlan.fdi b/fdi/information/10freedesktop/10-dell-rfkill-switch-wlan.fdi
new file mode 100644
index 0000000..446d6b2
--- /dev/null
+++ b/fdi/information/10freedesktop/10-dell-rfkill-switch-wlan.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_wlan_switch"/>
+ </match>
+ </match>
+ </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-dell-rfkill-switch.fdi b/fdi/information/10freedesktop/10-dell-rfkill-switch.fdi
deleted file mode 100644
index 71cdbde..0000000
--- a/fdi/information/10freedesktop/10-dell-rfkill-switch.fdi
+++ /dev/null
@@ -1,37 +0,0 @@
-<?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/Makefile.am b/fdi/information/10freedesktop/Makefile.am
index 00a00f4..40ef358 100644
--- a/fdi/information/10freedesktop/Makefile.am
+++ b/fdi/information/10freedesktop/Makefile.am
@@ -8,9 +8,24 @@ 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-sony-bluetooth-switch.fdi \
- 10-dell-rfkill-switch.fdi
+ 10-cd-dvd-burner.fdi
+
+if BUILD_KILLSWITCH_DELL_WLAN
+dist_fdi_DATA += 10-dell-rfkill-switch-wlan.fdi
+endif
+
+if BUILD_KILLSWITCH_DELL_BLUETOOTH
+dist_fdi_DATA += 10-dell-rfkill-switch-bluetooth.fdi
+endif
+
+if BUILD_KILLSWITCH_SONY_BLUETOOTH
+dist_fdi_DATA += 10-sony-bluetooth-switch.fdi
+endif
+
+if BUILD_KILLSWITCH_IPW_WLAN
+dist_fdi_DATA += 10-ipw-rfkill-switch.fdi
+endif
+
if BUILD_RECALL
dist_fdi_DATA += \
diff-tree 5d4c34ec5a118be9f2235073b7cd48db722b85b9 (from f9f3173ffdae7ada29ea27b8d450a4c7a659f70f)
Author: Adel Gadllah <adel.gadllah at gmail.com>
Date: Mon Jul 9 14:49:46 2007 -0400
ipw killswitch support
diff --git a/fdi/information/10freedesktop/10-ipw-rfkill-switch.fdi b/fdi/information/10freedesktop/10-ipw-rfkill-switch.fdi
new file mode 100644
index 0000000..d7c26d2
--- /dev/null
+++ b/fdi/information/10freedesktop/10-ipw-rfkill-switch.fdi
@@ -0,0 +1,61 @@
+<?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">
+ <!-- Don't use generic ipw rfkill on Sonys -->
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" contains_not="Sony">
+ <match key="info.linux.driver" string="ipw3945">
+ <spawn udi="/org/freedesktop/Hal/devices/ipw_wlan_switch"/>
+ </match>
+ </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">
+ <!-- Don't use generic ipw rfkill on Sonys -->
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" contains_not="Sony">
+ <match key="info.linux.driver" string="ipw2200">
+ <spawn udi="/org/freedesktop/Hal/devices/ipw_wlan_switch"/>
+ </match>
+ </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">
+ <!-- Don't use generic ipw rfkill on Sonys -->
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" contains_not="Sony">
+ <match key="info.linux.driver" string="ipw2100">
+ <spawn udi="/org/freedesktop/Hal/devices/ipw_wlan_switch"/>
+ </match>
+ </match>
+ </match>
+ </match>
+ </device>
+
+
+ <device>
+ <match key="info.udi" string="/org/freedesktop/Hal/devices/ipw_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>
+
More information about the hal-commit
mailing list