hal: Branch 'origin' - 14 commits
David Zeuthen
david at kemper.freedesktop.org
Tue Jul 10 11:34:40 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 | 49 +++
fdi/information/10freedesktop/30-keymap-dell.fdi | 98 ++++--
fdi/information/10freedesktop/30-keymap-hp.fdi | 14
fdi/information/10freedesktop/30-keymap-module-thinkpad-acpi.fdi | 148 +++++++++-
fdi/information/10freedesktop/Makefile.am | 21 +
9 files changed, 379 insertions(+), 80 deletions(-)
New commits:
diff-tree f6a3238fa22256e17864c27e37167830aa8fc4d4 (from 1400fe3e994f8984a3f5e83e77cf8124d5fd655a)
Author: Thorsten Leemhuis <fedora at leemhuis.info>
Date: Tue Jul 10 17:43:50 2007 +0100
add keymap for dell D630
I created a keymap file for my Dell D630. Find it attached as
hal-info-keymap-dell-d630.patch.
I've (Richard Hughes) also rearranged the Dell file to be spaces only,
and to have the entries in correct match order. Sanity is restored
diff --git a/fdi/information/10freedesktop/30-keymap-dell.fdi b/fdi/information/10freedesktop/30-keymap-dell.fdi
index 792146b..81164f8 100644
--- a/fdi/information/10freedesktop/30-keymap-dell.fdi
+++ b/fdi/information/10freedesktop/30-keymap-dell.fdi
@@ -8,28 +8,16 @@
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix="Dell">
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" prefix="Latitude">
- <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="D420">
- <append key="input.keymap.data" type="strlist">e007:battery</append> <!-- Fn+F3 battery icon -->
- <append key="input.keymap.data" type="strlist">e00f:switchvideomode</append> <!-- Fn+F7 aspect ratio -->
- <append key="input.keymap.data" type="strlist">e00b:displaytoggle</append> <!-- Fn+F8 CRT/LCD -->
- <append key="input.keymap.data" type="strlist">e006:brightnessup</append> <!-- Fn+Up arrow Brightness Up -->
- <append key="input.keymap.data" type="strlist">e005:brightnessdown</append> <!-- Fn+Down arrow Brightness Down -->
- <append key="input.keymap.data" type="strlist">e005:f13</append> <!-- FIXME Fn+Left arrow Auto Brightness -->
- <append key="input.keymap.data" type="strlist">e00a:suspend</append> <!-- Fn+F1 hibernate -->
- <append key="info.capabilities" type="strlist">input.keymap</append>
- </match>
- <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="D820">
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="D420">
<append key="input.keymap.data" type="strlist">e007:battery</append> <!-- Fn+F3 battery icon -->
<append key="input.keymap.data" type="strlist">e00f:switchvideomode</append> <!-- Fn+F7 aspect ratio -->
<append key="input.keymap.data" type="strlist">e00b:displaytoggle</append> <!-- Fn+F8 CRT/LCD -->
<append key="input.keymap.data" type="strlist">e006:brightnessup</append> <!-- Fn+Up arrow Brightness Up -->
<append key="input.keymap.data" type="strlist">e005:brightnessdown</append> <!-- Fn+Down arrow Brightness Down -->
- <append key="input.keymap.data" type="strlist">e013:f13</append> <!-- FIXME Fn+Left arrow Auto Brightness -->
+ <append key="input.keymap.data" type="strlist">e005:f13</append> <!-- FIXME Fn+Left arrow Auto Brightness -->
<append key="input.keymap.data" type="strlist">e00a:suspend</append> <!-- Fn+F1 hibernate -->
<append key="info.capabilities" type="strlist">input.keymap</append>
</match>
- </match>
- <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" prefix="Latitude">
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="D620">
<append key="input.keymap.data" type="strlist">e007:battery</append> <!-- Fn+F3 battery icon -->
<append key="input.keymap.data" type="strlist">e00f:switchvideomode</append> <!-- Fn+F7 aspect ratio -->
@@ -41,30 +29,53 @@
<append key="input.keymap.data" type="strlist">e008:radio</append> <!-- Turn On/Off Wireless -->
<append key="info.capabilities" type="strlist">input.keymap</append>
</match>
- </match>
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="D630">
+ <append key="input.keymap.data" type="strlist">e007:battery</append> <!-- Fn+F3 battery icon -->
+ <append key="input.keymap.data" type="strlist">e00f:switchvideomode</append> <!-- Fn+F7 aspect ratio -->
+ <append key="input.keymap.data" type="strlist">e00b:displaytoggle</append> <!-- Fn+F8 CRT/LCD -->
+ <append key="input.keymap.data" type="strlist">e006:brightnessup</append> <!-- Fn+Up arrow Brightness Up -->
+ <append key="input.keymap.data" type="strlist">e005:brightnessdown</append> <!-- Fn+Down arrow Brightness Down -->
+ <append key="input.keymap.data" type="strlist">e013:autobrightness</append> <!-- Fn+Left arrow Auto Brightness -->
+ <append key="input.keymap.data" type="strlist">e00a:suspend</append> <!-- Fn+F1 hibernate -->
+ <append key="input.keymap.data" type="strlist">e008:radio</append> <!-- Turn On/Off Wireless -->
+ <append key="input.keymap.data" type="strlist">e011:prog1</append> <!-- Wifi Catcher (DELL Specific) -->
+ <append key="info.capabilities" type="strlist">input.keymap</append>
+ </match>
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="D820">
+ <append key="input.keymap.data" type="strlist">e007:battery</append> <!-- Fn+F3 battery icon -->
+ <append key="input.keymap.data" type="strlist">e00f:switchvideomode</append> <!-- Fn+F7 aspect ratio -->
+ <append key="input.keymap.data" type="strlist">e00b:displaytoggle</append> <!-- Fn+F8 CRT/LCD -->
+ <append key="input.keymap.data" type="strlist">e006:brightnessup</append> <!-- Fn+Up arrow Brightness Up -->
+ <append key="input.keymap.data" type="strlist">e005:brightnessdown</append> <!-- Fn+Down arrow Brightness Down -->
+ <append key="input.keymap.data" type="strlist">e013:f13</append> <!-- FIXME Fn+Left arrow Auto Brightness -->
+ <append key="input.keymap.data" type="strlist">e00a:suspend</append> <!-- Fn+F1 hibernate -->
+ <append key="info.capabilities" type="strlist">input.keymap</append>
+ </match>
+ </match> <!-- prefix="Latitude" -->
+
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" prefix="MXC062"> <!-- Dell XPS M1210 -->
- <append key="input.keymap.data" type="strlist">e007:battery</append> <!-- Fn+F3 Battery icon -->
- <append key="input.keymap.data" type="strlist">e00b:switchvideomode</append> <!-- Fn+F8 CRT/LCD -->
- <append key="input.keymap.data" type="strlist">e006:brightnessup</append> <!-- Fn+Up arrow Brightness Up -->
- <append key="input.keymap.data" type="strlist">e005:brightnessdown</append> <!-- Fn+Down arrow Brightness Down -->
- <append key="input.keymap.data" type="strlist">e00a:suspend</append> <!-- Fn+F1 Hibernate -->
- <append key="input.keymap.data" type="strlist">e008:wlan</append> <!-- Wirelesss switch -->
- <append key="input.keymap.data" type="strlist">e008:bluetooth</append> <!-- FIXME Bluetooth switch (same as wireless) -->
- <append key="input.keymap.data" type="strlist">e012:media</append> <!-- Dell MediaDirect button Opens Dell Media Experience (a sort of media player) -->
- <append key="input.keymap.data" type="strlist">e015:prog1</append> <!-- Shutter button Takes a picture if optional camera available -->
- <append key="info.capabilities" type="strlist">input.keymap</append>
- </match>
+ <append key="input.keymap.data" type="strlist">e007:battery</append> <!-- Fn+F3 Battery icon -->
+ <append key="input.keymap.data" type="strlist">e00b:switchvideomode</append> <!-- Fn+F8 CRT/LCD -->
+ <append key="input.keymap.data" type="strlist">e006:brightnessup</append> <!-- Fn+Up arrow Brightness Up -->
+ <append key="input.keymap.data" type="strlist">e005:brightnessdown</append> <!-- Fn+Down arrow Brightness Down -->
+ <append key="input.keymap.data" type="strlist">e00a:suspend</append> <!-- Fn+F1 Hibernate -->
+ <append key="input.keymap.data" type="strlist">e008:wlan</append> <!-- Wirelesss switch -->
+ <append key="input.keymap.data" type="strlist">e008:bluetooth</append> <!-- FIXME Bluetooth switch (same as wireless) -->
+ <append key="input.keymap.data" type="strlist">e012:media</append> <!-- Dell MediaDirect button Opens Dell Media Experience (a sort of media player) -->
+ <append key="input.keymap.data" type="strlist">e015:prog1</append> <!-- Shutter button Takes a picture if optional camera available -->
+ <append key="info.capabilities" type="strlist">input.keymap</append>
+ </match>
- <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" prefix="Inspiron">
- <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="8500">
- <append key="input.keymap.data" type="strlist">e007:battery</append> <!-- Fn+F3 battery icon -->
- <append key="input.keymap.data" type="strlist">e006:brightnessup</append> <!-- Fn+Up arrow Brightness Up -->
- <append key="input.keymap.data" type="strlist">e005:brightnessdown</append> <!-- Fn+Down arrow Brightness Down -->
- <append key="input.keymap.data" type="strlist">e008:wlan</append> <!-- Fn+F2 Toggle WiFi -->
- <append key="input.keymap.data" type="strlist">e009:ejectclosedcd</append> <!-- Fn+F10 Eject CD -->
- <append key="info.capabilities" type="strlist">input.keymap</append>
- </match>
- </match>
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" prefix="Inspiron">
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="8500">
+ <append key="input.keymap.data" type="strlist">e007:battery</append> <!-- Fn+F3 battery icon -->
+ <append key="input.keymap.data" type="strlist">e006:brightnessup</append> <!-- Fn+Up arrow Brightness Up -->
+ <append key="input.keymap.data" type="strlist">e005:brightnessdown</append> <!-- Fn+Down arrow Brightness Down -->
+ <append key="input.keymap.data" type="strlist">e008:wlan</append> <!-- Fn+F2 Toggle WiFi -->
+ <append key="input.keymap.data" type="strlist">e009:ejectclosedcd</append> <!-- Fn+F10 Eject CD -->
+ <append key="info.capabilities" type="strlist">input.keymap</append>
+ </match>
+ </match>
</match>
</match>
</device>
diff-tree 1400fe3e994f8984a3f5e83e77cf8124d5fd655a (from 447851d8b7064eeaa3a70c3cf16cc629e558cd52)
Author: Richard Hughes <richard at hughsie.com>
Date: Tue Jul 10 16:08:56 2007 +0100
fix two incorrect keys in the recent dell keymap
diff --git a/fdi/information/10freedesktop/30-keymap-dell.fdi b/fdi/information/10freedesktop/30-keymap-dell.fdi
index e88f14b..792146b 100644
--- a/fdi/information/10freedesktop/30-keymap-dell.fdi
+++ b/fdi/information/10freedesktop/30-keymap-dell.fdi
@@ -36,9 +36,9 @@
<append key="input.keymap.data" type="strlist">e00b:displaytoggle</append> <!-- Fn+F8 CRT/LCD -->
<append key="input.keymap.data" type="strlist">e006:brightnessup</append> <!-- Fn+Up arrow Brightness Up -->
<append key="input.keymap.data" type="strlist">e005:brightnessdown</append> <!-- Fn+Down arrow Brightness Down -->
- <append key="input.keymap.data" type="strlist">e013:autobrightness</append> <!-- Fn+Left arrow Auto Brightness -->
+ <append key="input.keymap.data" type="strlist">e013:f13</append> <!-- Fn+Left arrow Auto Brightness -->
<append key="input.keymap.data" type="strlist">e00a:suspend</append> <!-- Fn+F1 hibernate -->
- <append key="input.keymap.data" type="strlist">e008:WirelessOnOff</append> <!-- Turn On/Off Wireless -->
+ <append key="input.keymap.data" type="strlist">e008:radio</append> <!-- Turn On/Off Wireless -->
<append key="info.capabilities" type="strlist">input.keymap</append>
</match>
</match>
diff-tree 447851d8b7064eeaa3a70c3cf16cc629e558cd52 (from dae9101265536e248a07ea28507b4dd093efdcc7)
Author: Andreas Thienemann <andreas at bawue.net>
Date: Tue Jul 10 14:03:05 2007 +0100
add keymap for hp nx5000
attached is a little patch adding support to the nx5000 keymaps.
regards,
andreas
diff --git a/fdi/information/10freedesktop/30-keymap-hp.fdi b/fdi/information/10freedesktop/30-keymap-hp.fdi
index 51d826f..f06976f 100644
--- a/fdi/information/10freedesktop/30-keymap-hp.fdi
+++ b/fdi/information/10freedesktop/30-keymap-hp.fdi
@@ -7,6 +7,14 @@
<match key="@input.originating_device:info.linux.driver" string="atkbd">
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix="Hewlett-Packard">
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="nx5000">
+ <append key="input.keymap.data" type="strlist">e001:lock</append> <!-- FnEsc -->
+ <append key="input.keymap.data" type="strlist">e008:tv</append> <!-- SVideo/Presentation -->
+ <append key="input.keymap.data" type="strlist">e009:battery</append> <!-- FnF8 (battery) -->
+ <append key="input.keymap.data" type="strlist">e00a:lock</append> <!-- Lock -->
+ <append key="input.keymap.data" type="strlist">e057:wlan</append> <!-- Wlan -->
+ <append key="info.capabilities" type="strlist">input.keymap</append>
+ </match>
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="nc6120">
<append key="input.keymap.data" type="strlist">e059:www</append> <!-- I key -->
<append key="input.keymap.data" type="strlist">e009:battery</append> <!-- FnF8 (battery) -->
diff-tree dae9101265536e248a07ea28507b4dd093efdcc7 (from 52e4dff46a49871bf98fb9420c621a320d6fdba9)
Author: Richard Hughes <richard at hughsie.com>
Date: Tue Jul 10 13:47:37 2007 +0100
add some more thinkpad models
Add the rest of the thinkpad models from http://thinkwiki.org/wiki/Default_meanings_of_special_keys
Some have to be verified, although this should be a really good start.
diff --git a/fdi/information/10freedesktop/30-keymap-module-thinkpad-acpi.fdi b/fdi/information/10freedesktop/30-keymap-module-thinkpad-acpi.fdi
index 08da118..36fdd52 100644
--- a/fdi/information/10freedesktop/30-keymap-module-thinkpad-acpi.fdi
+++ b/fdi/information/10freedesktop/30-keymap-module-thinkpad-acpi.fdi
@@ -70,10 +70,56 @@
<append key="input.keymap.data" type="strlist">0x17:vendor</append> <!-- ThinkPad/ThinkVantage button -->
<append key="info.capabilities" type="strlist">input.keymap</append>
</match>
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.version" contains="T3">
+ <append key="input.keymap.data" type="strlist">0x02:lock</append> <!-- Fn+F3 lock -->
+ <append key="input.keymap.data" type="strlist">0x03:sleep</append> <!-- Fn+F4 suspend -->
+ <append key="input.keymap.data" type="strlist">0x06:switchvideomode</append> <!-- Fn+F7 switch video output device -->
+ <append key="input.keymap.data" type="strlist">0x0b:suspend</append> <!-- Fn+F12 hibernate -->
+ <append key="input.keymap.data" type="strlist">0x0f:brightnessup</append> <!-- Fn+Home -->
+ <append key="input.keymap.data" type="strlist">0x10:brightnessdown</append> <!-- Fn+End -->
+ <append key="input.keymap.data" type="strlist">0x13:zoom</append> <!-- Fn+Space -->
+ <append key="input.keymap.data" type="strlist">0x17:vendor</append> <!-- ThinkPad/ThinkVantage button -->
+ <append key="info.capabilities" type="strlist">input.keymap</append>
+ </match>
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.version" contains="T4">
+ <append key="input.keymap.data" type="strlist">0x02:lock</append> <!-- Fn+F3 lock -->
+ <append key="input.keymap.data" type="strlist">0x03:sleep</append> <!-- Fn+F4 suspend -->
+ <append key="input.keymap.data" type="strlist">0x06:switchvideomode</append> <!-- Fn+F7 switch video output device -->
+ <append key="input.keymap.data" type="strlist">0x07:radio</append> <!-- Fn+F8 switch radio -->
+ <append key="input.keymap.data" type="strlist">0x0b:suspend</append> <!-- Fn+F12 hibernate -->
+ <append key="input.keymap.data" type="strlist">0x0f:brightnessup</append> <!-- Fn+Home -->
+ <append key="input.keymap.data" type="strlist">0x10:brightnessdown</append> <!-- Fn+End -->
+ <append key="input.keymap.data" type="strlist">0x13:zoom</append> <!-- Fn+Space -->
+ <append key="input.keymap.data" type="strlist">0x17:vendor</append> <!-- ThinkPad/ThinkVantage button -->
+ <append key="info.capabilities" type="strlist">input.keymap</append>
+ </match>
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.version" contains="X2">
+ <append key="input.keymap.data" type="strlist">0x02:lock</append> <!-- Fn+F3 lock -->
+ <append key="input.keymap.data" type="strlist">0x03:sleep</append> <!-- Fn+F4 suspend -->
+ <append key="input.keymap.data" type="strlist">0x06:switchvideomode</append> <!-- Fn+F7 switch video output device -->
+ <append key="input.keymap.data" type="strlist">0x0b:suspend</append> <!-- Fn+F12 hibernate -->
+ <append key="input.keymap.data" type="strlist">0x0f:brightnessup</append> <!-- Fn+Home -->
+ <append key="input.keymap.data" type="strlist">0x10:brightnessdown</append> <!-- Fn+End -->
+ <append key="input.keymap.data" type="strlist">0x13:zoom</append> <!-- Fn+Space -->
+ <append key="input.keymap.data" type="strlist">0x17:vendor</append> <!-- ThinkPad/ThinkVantage button -->
+ <append key="info.capabilities" type="strlist">input.keymap</append>
+ </match>
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.version" contains="X3">
+ <append key="input.keymap.data" type="strlist">0x02:lock</append> <!-- Fn+F3 lock -->
+ <append key="input.keymap.data" type="strlist">0x03:sleep</append> <!-- Fn+F4 suspend -->
+ <append key="input.keymap.data" type="strlist">0x06:switchvideomode</append> <!-- Fn+F7 switch video output device -->
+ <append key="input.keymap.data" type="strlist">0x07:radio</append> <!-- Fn+F8 switch radio -->
+ <append key="input.keymap.data" type="strlist">0x0b:suspend</append> <!-- Fn+F12 hibernate -->
+ <append key="input.keymap.data" type="strlist">0x0f:brightnessup</append> <!-- Fn+Home -->
+ <append key="input.keymap.data" type="strlist">0x10:brightnessdown</append> <!-- Fn+End -->
+ <append key="input.keymap.data" type="strlist">0x13:zoom</append> <!-- Fn+Space -->
+ <append key="input.keymap.data" type="strlist">0x17:vendor</append> <!-- ThinkPad/ThinkVantage button -->
+ <append key="info.capabilities" type="strlist">input.keymap</append>
+ </match>
</match>
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix="LENOVO">
- <match key="/org/freedesktop/Hal/devices/computer:system.hardware.version" contains="X60">
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.version" contains="X6">
<append key="input.keymap.data" type="strlist">0x01:coffee</append> <!-- Fn+F2 lock -->
<append key="input.keymap.data" type="strlist">0x02:battery</append> <!-- Fn+F3 battery -->
<append key="input.keymap.data" type="strlist">0x03:sleep</append> <!-- Fn+F4 suspend -->
@@ -88,6 +134,36 @@
<append key="input.keymap.data" type="strlist">0x17:vendor</append> <!-- ThinkPad/ThinkVantage button -->
<append key="info.capabilities" type="strlist">input.keymap</append>
</match>
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.version" contains="R6">
+ <append key="input.keymap.data" type="strlist">0x01:coffee</append> <!-- Fn+F2 lock -->
+ <append key="input.keymap.data" type="strlist">0x02:battery</append> <!-- Fn+F3 battery -->
+ <append key="input.keymap.data" type="strlist">0x03:sleep</append> <!-- Fn+F4 suspend -->
+ <append key="input.keymap.data" type="strlist">0x04:wifi</append> <!-- Fn+F5 wifi -->
+ <append key="input.keymap.data" type="strlist">0x06:switchvideomode</append> <!-- Fn+F7 switch video output device -->
+ <append key="input.keymap.data" type="strlist">0x07:prog1</append> <!-- Fn+F8 ultranav -->
+ <append key="input.keymap.data" type="strlist">0x08:eject</append> <!-- Fn+F9 eject -->
+ <append key="input.keymap.data" type="strlist">0x0b:suspend</append> <!-- Fn+F12 hibernate -->
+ <append key="input.keymap.data" type="strlist">0x0f:brightnessup</append> <!-- Fn+Home -->
+ <append key="input.keymap.data" type="strlist">0x10:brightnessdown</append> <!-- Fn+End -->
+ <append key="input.keymap.data" type="strlist">0x13:zoom</append> <!-- Fn+Space -->
+ <append key="input.keymap.data" type="strlist">0x17:vendor</append> <!-- ThinkPad/ThinkVantage button -->
+ <append key="info.capabilities" type="strlist">input.keymap</append>
+ </match>
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.version" contains="Z6">
+ <append key="input.keymap.data" type="strlist">0x01:coffee</append> <!-- Fn+F2 lock -->
+ <append key="input.keymap.data" type="strlist">0x02:battery</append> <!-- Fn+F3 battery -->
+ <append key="input.keymap.data" type="strlist">0x03:sleep</append> <!-- Fn+F4 suspend -->
+ <append key="input.keymap.data" type="strlist">0x04:wifi</append> <!-- Fn+F5 wifi -->
+ <append key="input.keymap.data" type="strlist">0x06:switchvideomode</append> <!-- Fn+F7 switch video output device -->
+ <append key="input.keymap.data" type="strlist">0x07:f22</append> <!-- Fn+F8 touchpad toggle -->
+ <append key="input.keymap.data" type="strlist">0x08:f24</append> <!-- Fn+F9 undock -->
+ <append key="input.keymap.data" type="strlist">0x0b:suspend</append> <!-- Fn+F12 hibernate -->
+ <append key="input.keymap.data" type="strlist">0x0f:brightnessup</append> <!-- Fn+Home -->
+ <append key="input.keymap.data" type="strlist">0x10:brightnessdown</append> <!-- Fn+End -->
+ <append key="input.keymap.data" type="strlist">0x13:zoom</append> <!-- Fn+Space -->
+ <append key="input.keymap.data" type="strlist">0x17:vendor</append> <!-- ThinkPad/ThinkVantage button -->
+ <append key="info.capabilities" type="strlist">input.keymap</append>
+ </match>
</match>
</match>
</device>
diff-tree 52e4dff46a49871bf98fb9420c621a320d6fdba9 (from 42b70c86be5650f58cc6af1a63c8b556f8ee2131)
Author: Parag Nemade <pnemade at redhat.com>
Date: Tue Jul 10 13:37:44 2007 +0100
add keymap for dell d620
I have read
http://people.freedesktop.org/~hughsient/quirk/quirk-keymap-index.html
and found that though Dell D420 is listed in file 30-keymap-dell.fdi and
its similar to Dell D620, I thought its good to have its entry there.
Based on information given in
http://people.freedesktop.org/~hughsient/quirk/quirk-keymap-scancodes.html , I even saw I am getting some scancode for doing wireless on and off. So, I added that key entry also. Its same code I got while doing on and off wireless(I don't know how it can be handled). If it looks incorrect kindly remove that key entry.
diff --git a/fdi/information/10freedesktop/30-keymap-dell.fdi b/fdi/information/10freedesktop/30-keymap-dell.fdi
index 19fc838..e88f14b 100644
--- a/fdi/information/10freedesktop/30-keymap-dell.fdi
+++ b/fdi/information/10freedesktop/30-keymap-dell.fdi
@@ -29,6 +29,19 @@
<append key="info.capabilities" type="strlist">input.keymap</append>
</match>
</match>
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" prefix="Latitude">
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="D620">
+ <append key="input.keymap.data" type="strlist">e007:battery</append> <!-- Fn+F3 battery icon -->
+ <append key="input.keymap.data" type="strlist">e00f:switchvideomode</append> <!-- Fn+F7 aspect ratio -->
+ <append key="input.keymap.data" type="strlist">e00b:displaytoggle</append> <!-- Fn+F8 CRT/LCD -->
+ <append key="input.keymap.data" type="strlist">e006:brightnessup</append> <!-- Fn+Up arrow Brightness Up -->
+ <append key="input.keymap.data" type="strlist">e005:brightnessdown</append> <!-- Fn+Down arrow Brightness Down -->
+ <append key="input.keymap.data" type="strlist">e013:autobrightness</append> <!-- Fn+Left arrow Auto Brightness -->
+ <append key="input.keymap.data" type="strlist">e00a:suspend</append> <!-- Fn+F1 hibernate -->
+ <append key="input.keymap.data" type="strlist">e008:WirelessOnOff</append> <!-- Turn On/Off Wireless -->
+ <append key="info.capabilities" type="strlist">input.keymap</append>
+ </match>
+ </match>
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" prefix="MXC062"> <!-- Dell XPS M1210 -->
<append key="input.keymap.data" type="strlist">e007:battery</append> <!-- Fn+F3 Battery icon -->
<append key="input.keymap.data" type="strlist">e00b:switchvideomode</append> <!-- Fn+F8 CRT/LCD -->
diff-tree 42b70c86be5650f58cc6af1a63c8b556f8ee2131 (from 841eec601fe08654c5ff3bc1c20c4fb602593106)
Author: Richard Hughes <richard at hughsie.com>
Date: Tue Jul 10 13:36:26 2007 +0100
add some thinkpad models
Add thinkpad models from http://thinkwiki.org/wiki/Default_meanings_of_special_keys
More have to be added, and some have to be verified.
diff --git a/fdi/information/10freedesktop/30-keymap-module-thinkpad-acpi.fdi b/fdi/information/10freedesktop/30-keymap-module-thinkpad-acpi.fdi
index c5a2ced..08da118 100644
--- a/fdi/information/10freedesktop/30-keymap-module-thinkpad-acpi.fdi
+++ b/fdi/information/10freedesktop/30-keymap-module-thinkpad-acpi.fdi
@@ -4,6 +4,74 @@
<device>
<!-- These are buttons synthesized in the thinkpad-acpi kernel module -->
<match key="input.product" string="ThinkPad Extra Buttons">
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix="IBM">
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.version" contains="600">
+ <append key="input.keymap.data" type="strlist">0x02:lock</append> <!-- Fn+F3 lock -->
+ <append key="input.keymap.data" type="strlist">0x03:sleep</append> <!-- Fn+F4 suspend -->
+ <append key="input.keymap.data" type="strlist">0x06:switchvideomode</append> <!-- Fn+F7 switch video output device -->
+ <append key="input.keymap.data" type="strlist">0x07:search</append> <!-- Fn+F8 screen expand -->
+ <append key="input.keymap.data" type="strlist">0x0b:suspend</append> <!-- Fn+F12 hibernate -->
+ <append key="input.keymap.data" type="strlist">0x17:vendor</append> <!-- ThinkPad/ThinkVantage button -->
+ <append key="info.capabilities" type="strlist">input.keymap</append>
+ </match>
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.version" contains="750">
+ <append key="input.keymap.data" type="strlist">0x02:battery</append> <!-- Fn+F3 battery -->
+ <append key="input.keymap.data" type="strlist">0x02:lock</append> <!-- Fn+F3 lock -->
+ <append key="input.keymap.data" type="strlist">0x03:sleep</append> <!-- Fn+F4 suspend -->
+ <append key="input.keymap.data" type="strlist">0x06:switchvideomode</append> <!-- Fn+F7 switch video output device -->
+ <append key="input.keymap.data" type="strlist">0x07:search</append> <!-- Fn+F8 screen expand -->
+ <append key="input.keymap.data" type="strlist">0x0a:mode</append> <!-- Fn+F11 power mode -->
+ <append key="input.keymap.data" type="strlist">0x0b:suspend</append> <!-- Fn+F12 hibernate -->
+ <append key="input.keymap.data" type="strlist">0x17:vendor</append> <!-- ThinkPad/ThinkVantage button -->
+ <append key="info.capabilities" type="strlist">input.keymap</append>
+ </match>
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.version" contains="A2">
+ <append key="input.keymap.data" type="strlist">0x02:lock</append> <!-- Fn+F3 lock -->
+ <append key="input.keymap.data" type="strlist">0x03:sleep</append> <!-- Fn+F4 suspend -->
+ <append key="input.keymap.data" type="strlist">0x06:switchvideomode</append> <!-- Fn+F7 switch video output device -->
+ <append key="input.keymap.data" type="strlist">0x0b:suspend</append> <!-- Fn+F12 hibernate -->
+ <append key="input.keymap.data" type="strlist">0x0f:brightnessup</append> <!-- Fn+Home -->
+ <append key="input.keymap.data" type="strlist">0x10:brightnessdown</append> <!-- Fn+End -->
+ <append key="input.keymap.data" type="strlist">0x13:zoom</append> <!-- Fn+Space -->
+ <append key="input.keymap.data" type="strlist">0x17:vendor</append> <!-- ThinkPad/ThinkVantage button -->
+ <append key="info.capabilities" type="strlist">input.keymap</append>
+ </match>
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.version" contains="G40">
+ <append key="input.keymap.data" type="strlist">0x02:lock</append> <!-- Fn+F3 lock -->
+ <append key="input.keymap.data" type="strlist">0x03:sleep</append> <!-- Fn+F4 suspend -->
+ <append key="input.keymap.data" type="strlist">0x06:switchvideomode</append> <!-- Fn+F7 switch video output device -->
+ <append key="input.keymap.data" type="strlist">0x07:radio</append> <!-- Fn+F8 switch radio -->
+ <append key="input.keymap.data" type="strlist">0x0b:suspend</append> <!-- Fn+F12 hibernate -->
+ <append key="input.keymap.data" type="strlist">0x0f:brightnessup</append> <!-- Fn+Home -->
+ <append key="input.keymap.data" type="strlist">0x10:brightnessdown</append> <!-- Fn+End -->
+ <append key="input.keymap.data" type="strlist">0x13:zoom</append> <!-- Fn+Space -->
+ <append key="input.keymap.data" type="strlist">0x17:vendor</append> <!-- ThinkPad/ThinkVantage button -->
+ <append key="info.capabilities" type="strlist">input.keymap</append>
+ </match>
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.version" contains="R3">
+ <append key="input.keymap.data" type="strlist">0x02:lock</append> <!-- Fn+F3 lock -->
+ <append key="input.keymap.data" type="strlist">0x03:sleep</append> <!-- Fn+F4 suspend -->
+ <append key="input.keymap.data" type="strlist">0x06:switchvideomode</append> <!-- Fn+F7 switch video output device -->
+ <append key="input.keymap.data" type="strlist">0x0b:suspend</append> <!-- Fn+F12 hibernate -->
+ <append key="input.keymap.data" type="strlist">0x0f:brightnessup</append> <!-- Fn+Home -->
+ <append key="input.keymap.data" type="strlist">0x10:brightnessdown</append> <!-- Fn+End -->
+ <append key="input.keymap.data" type="strlist">0x13:zoom</append> <!-- Fn+Space -->
+ <append key="input.keymap.data" type="strlist">0x17:vendor</append> <!-- ThinkPad/ThinkVantage button -->
+ <append key="info.capabilities" type="strlist">input.keymap</append>
+ </match>
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.version" contains="R5">
+ <append key="input.keymap.data" type="strlist">0x03:sleep</append> <!-- Fn+F4 suspend -->
+ <append key="input.keymap.data" type="strlist">0x04:radio</append> <!-- Fn+F5 switch wifi -->
+ <append key="input.keymap.data" type="strlist">0x06:switchvideomode</append> <!-- Fn+F7 switch video output device -->
+ <append key="input.keymap.data" type="strlist">0x0b:suspend</append> <!-- Fn+F12 hibernate -->
+ <append key="input.keymap.data" type="strlist">0x0f:brightnessup</append> <!-- Fn+Home -->
+ <append key="input.keymap.data" type="strlist">0x10:brightnessdown</append> <!-- Fn+End -->
+ <append key="input.keymap.data" type="strlist">0x13:zoom</append> <!-- Fn+Space -->
+ <append key="input.keymap.data" type="strlist">0x17:vendor</append> <!-- ThinkPad/ThinkVantage button -->
+ <append key="info.capabilities" type="strlist">input.keymap</append>
+ </match>
+ </match>
+
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix="LENOVO">
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.version" contains="X60">
<append key="input.keymap.data" type="strlist">0x01:coffee</append> <!-- Fn+F2 lock -->
diff-tree 841eec601fe08654c5ff3bc1c20c4fb602593106 (from 84080e56eb95b14f0c2fcd7c6eaaa45cf07631fe)
Author: Tyler Owen <tyler.l.owen at gmail.com>
Date: Tue Jul 10 12:57:30 2007 +0100
add keymap for DELL D820
I have attached a patch for the D820 scancodes. I have tested these
with the latest hal packages from utopia on my F7 laptop.
diff --git a/fdi/information/10freedesktop/30-keymap-dell.fdi b/fdi/information/10freedesktop/30-keymap-dell.fdi
index f29fb57..19fc838 100644
--- a/fdi/information/10freedesktop/30-keymap-dell.fdi
+++ b/fdi/information/10freedesktop/30-keymap-dell.fdi
@@ -18,6 +18,16 @@
<append key="input.keymap.data" type="strlist">e00a:suspend</append> <!-- Fn+F1 hibernate -->
<append key="info.capabilities" type="strlist">input.keymap</append>
</match>
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="D820">
+ <append key="input.keymap.data" type="strlist">e007:battery</append> <!-- Fn+F3 battery icon -->
+ <append key="input.keymap.data" type="strlist">e00f:switchvideomode</append> <!-- Fn+F7 aspect ratio -->
+ <append key="input.keymap.data" type="strlist">e00b:displaytoggle</append> <!-- Fn+F8 CRT/LCD -->
+ <append key="input.keymap.data" type="strlist">e006:brightnessup</append> <!-- Fn+Up arrow Brightness Up -->
+ <append key="input.keymap.data" type="strlist">e005:brightnessdown</append> <!-- Fn+Down arrow Brightness Down -->
+ <append key="input.keymap.data" type="strlist">e013:f13</append> <!-- FIXME Fn+Left arrow Auto Brightness -->
+ <append key="input.keymap.data" type="strlist">e00a:suspend</append> <!-- Fn+F1 hibernate -->
+ <append key="info.capabilities" type="strlist">input.keymap</append>
+ </match>
</match>
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" prefix="MXC062"> <!-- Dell XPS M1210 -->
<append key="input.keymap.data" type="strlist">e007:battery</append> <!-- Fn+F3 Battery icon -->
diff-tree 84080e56eb95b14f0c2fcd7c6eaaa45cf07631fe (from fd869c8ba653bdba21cb404780989a420ca5857d)
Author: Richard Hughes <richard at hughsie.com>
Date: Tue Jul 10 10:39:35 2007 +0100
use vendor rather than blue for the ibm button
diff --git a/fdi/information/10freedesktop/30-keymap-module-thinkpad-acpi.fdi b/fdi/information/10freedesktop/30-keymap-module-thinkpad-acpi.fdi
index 48abedd..c5a2ced 100644
--- a/fdi/information/10freedesktop/30-keymap-module-thinkpad-acpi.fdi
+++ b/fdi/information/10freedesktop/30-keymap-module-thinkpad-acpi.fdi
@@ -17,7 +17,7 @@
<append key="input.keymap.data" type="strlist">0x0f:brightnessup</append> <!-- Fn+Home -->
<append key="input.keymap.data" type="strlist">0x10:brightnessdown</append> <!-- Fn+End -->
<append key="input.keymap.data" type="strlist">0x13:zoom</append> <!-- Fn+Space -->
- <append key="input.keymap.data" type="strlist">0x17:blue</append> <!-- ThinkPad/ThinkVantage button -->
+ <append key="input.keymap.data" type="strlist">0x17:vendor</append> <!-- ThinkPad/ThinkVantage button -->
<append key="info.capabilities" type="strlist">input.keymap</append>
</match>
</match>
diff-tree fd869c8ba653bdba21cb404780989a420ca5857d (from 58b9a7041771f64bff6dde386cd2364205bd65d4)
Author: Aurélien Bompard <gauret at free.fr>
Date: Tue Jul 10 09:56:24 2007 +0100
add keymap for hp nc6320
This one is really straightforward, it's a simple copy from the 6120 definition.
diff --git a/fdi/information/10freedesktop/30-keymap-hp.fdi b/fdi/information/10freedesktop/30-keymap-hp.fdi
index 07ed507..51d826f 100644
--- a/fdi/information/10freedesktop/30-keymap-hp.fdi
+++ b/fdi/information/10freedesktop/30-keymap-hp.fdi
@@ -13,6 +13,12 @@
<append key="input.keymap.data" type="strlist">e008:tv</append> <!-- SVideo -->
<append key="info.capabilities" type="strlist">input.keymap</append>
</match>
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="nc6320">
+ <append key="input.keymap.data" type="strlist">e059:www</append> <!-- I key -->
+ <append key="input.keymap.data" type="strlist">e009:battery</append> <!-- FnF8 (battery) -->
+ <append key="input.keymap.data" type="strlist">e008:tv</append> <!-- SVideo -->
+ <append key="info.capabilities" type="strlist">input.keymap</append>
+ </match>
</match>
</match>
</device>
diff-tree 58b9a7041771f64bff6dde386cd2364205bd65d4 (from e2a01e0fd63a2ce67f6a4c954f896805e1de2f93)
Author: David Zeuthen <davidz at redhat.com>
Date: Mon Jul 9 15:31:11 2007 -0400
add note that ipw killswitch support requires recent hal version
diff --git a/configure.in b/configure.in
index 23383a1..5681e61 100644
--- a/configure.in
+++ b/configure.in
@@ -28,25 +28,25 @@ AM_CONDITIONAL(BUILD_KEYMAPS, test x$ena
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)
+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)
+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)
+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)
+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)
AM_CONDITIONAL(BUILD_KILLSWITCH_IPW_WLAN, test x$enable_killswitch_ipw_wlan == xyes)
AC_OUTPUT([
diff-tree e2a01e0fd63a2ce67f6a4c954f896805e1de2f93 (from 6e4cd71722d7ca190157370646b4944cd6fc90fe)
Author: David Zeuthen <davidz at redhat.com>
Date: Mon Jul 9 15:24:39 2007 -0400
fix up indenting
diff --git a/fdi/information/10freedesktop/10-ipw-rfkill-switch.fdi b/fdi/information/10freedesktop/10-ipw-rfkill-switch.fdi
index af19ab5..983e940 100644
--- a/fdi/information/10freedesktop/10-ipw-rfkill-switch.fdi
+++ b/fdi/information/10freedesktop/10-ipw-rfkill-switch.fdi
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<deviceinfo version="0.2">
-
- <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">
@@ -12,21 +11,20 @@
</match>
</match>
</device>
-
-<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">
- <match key="info.linux.driver" string="ipw2200">
+ <match key="info.linux.driver" string="ipw2200">
<spawn udi="/org/freedesktop/Hal/devices/ipw_wlan_switch"/>
</match>
</match>
</match>
</device>
-
- <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">
@@ -35,9 +33,8 @@
</match>
</match>
</match>
- </device>
+ </device>
-
<device>
<match key="info.udi" string="/org/freedesktop/Hal/devices/ipw_wlan_switch">
<append key="info.capabilities" type="strlist">killswitch</append>
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