hal: Branch 'master' - 2 commits
Richard Hughes
hughsient at kemper.freedesktop.org
Tue Jul 10 05:40:43 PDT 2007
fdi/information/10freedesktop/30-keymap-dell.fdi | 13 +
fdi/information/10freedesktop/30-keymap-module-thinkpad-acpi.fdi | 68 ++++++++++
2 files changed, 81 insertions(+)
New commits:
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 -->
More information about the hal-commit
mailing list