hal: Branch 'origin' - 9 commits
Richard Hughes
hughsient at kemper.freedesktop.org
Mon Jul 16 10:16:49 PDT 2007
fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi | 5 -
fdi/information/10freedesktop/30-keymap-compaq.fdi | 2
fdi/information/10freedesktop/30-keymap-dell.fdi | 39 +++++++--
fdi/information/10freedesktop/30-keymap-hp.fdi | 4
fdi/information/10freedesktop/30-keymap-misc.fdi | 19 ++++
fdi/information/10freedesktop/30-keymap-module-thinkpad-acpi.fdi | 41 ++++++----
6 files changed, 84 insertions(+), 26 deletions(-)
New commits:
diff-tree fd31e8c2c7268bfefbe3fd2383ef7757a1b7b52d (from d81f55dc037a435f4d91ec5e27ed7315f600869c)
Author: Daniel Drake <dsd at gentoo.org>
Date: Thu Jul 12 13:35:35 2007 +0100
add keymap for Dell Inspiron 640m
Also correct some other names, slightly munged by me
diff --git a/fdi/information/10freedesktop/30-keymap-dell.fdi b/fdi/information/10freedesktop/30-keymap-dell.fdi
index de0faa5..c316de8 100644
--- a/fdi/information/10freedesktop/30-keymap-dell.fdi
+++ b/fdi/information/10freedesktop/30-keymap-dell.fdi
@@ -26,7 +26,7 @@
<append key="input.keymap.data" type="strlist">e005:brightnessdown</append> <!-- Fn+Down arrow Brightness Down -->
<append key="input.keymap.data" type="strlist">e013:f23</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">e008:wlan</append> <!-- Turn On/Off Wireless -->
<append key="info.capabilities" type="strlist">input.keymap</append>
</match>
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="D630">
@@ -37,7 +37,7 @@
<append key="input.keymap.data" type="strlist">e005:brightnessdown</append> <!-- Fn+Down arrow Brightness Down -->
<append key="input.keymap.data" type="strlist">e013:f23</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">e008:wlan</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>
@@ -53,6 +53,18 @@
</match>
</match> <!-- prefix="Latitude" -->
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" prefix="MXC061"> <!-- Dell Inspiron 640m -->
+ <append key="input.keymap.data" type="strlist">e00a:suspend</append> <!-- Fn+F1 hibernate -->
+ <append key="input.keymap.data" type="strlist">e008:wlan</append> <!-- Fn+F2 Toggle WiFi -->
+ <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">e009:ejectclosecd</append> <!-- Fn+F10 Eject CD -->
+ <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">e012:media</append> <!-- MediaDirect button (house icon) -->
+ <append key="info.capabilities" type="strlist">input.keymap</append>
+ </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 d81f55dc037a435f4d91ec5e27ed7315f600869c (from c99133aec8e7c1450ba1f371b2acdd111ddd07b0)
Author: Richard Hughes <richard at hughsie.com>
Date: Thu Jul 12 13:09:55 2007 +0100
fix several keymap quirks found by my keymap checker
diff --git a/fdi/information/10freedesktop/30-keymap-dell.fdi b/fdi/information/10freedesktop/30-keymap-dell.fdi
index 1417512..de0faa5 100644
--- a/fdi/information/10freedesktop/30-keymap-dell.fdi
+++ b/fdi/information/10freedesktop/30-keymap-dell.fdi
@@ -14,7 +14,7 @@
<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">e005:f23</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>
@@ -24,7 +24,7 @@
<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> <!-- Fn+Left arrow Auto Brightness -->
+ <append key="input.keymap.data" type="strlist">e013:f23</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="info.capabilities" type="strlist">input.keymap</append>
@@ -35,7 +35,7 @@
<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:f23</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) -->
@@ -47,7 +47,7 @@
<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">e013:f23</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>
@@ -72,7 +72,7 @@
<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="input.keymap.data" type="strlist">e009:ejectclosecd</append> <!-- Fn+F10 Eject CD -->
<append key="info.capabilities" type="strlist">input.keymap</append>
</match>
</match>
@@ -81,8 +81,8 @@
<append key="input.keymap.data" type="strlist">e006:brightnessup</append> <!-- Fn+Up arrow Brightness Up -->
<append key="input.keymap.data" type="strlist">e007:battery</append> <!-- Fn+F3 battery icon -->
<append key="input.keymap.data" type="strlist">e008:bluetooth</append> <!-- Fn+F2 bluetooth -->
- <append key="input.keymap.data" type="strlist">e009:ejectclosedcd</append> <!-- Fn+F10 Eject CD -->
- <append key="input.keymap.data" type="strlist">e00a:hibernate</append> <!-- Fn+F1 Hibernate -->
+ <append key="input.keymap.data" type="strlist">e009:ejectclosecd</append> <!-- Fn+F10 Eject CD -->
+ <append key="input.keymap.data" type="strlist">e00a:suspend</append> <!-- Fn+F1 Hibernate -->
<append key="input.keymap.data" type="strlist">e00b:switchvideomode</append> <!-- Fn+F8 CRT/LCD -->
<append key="input.keymap.data" type="strlist">e012:media</append> <!-- MediaDirect button (house icon) -->
<append key="info.capabilities" type="strlist">input.keymap</append>
diff --git a/fdi/information/10freedesktop/30-keymap-hp.fdi b/fdi/information/10freedesktop/30-keymap-hp.fdi
index f06976f..730e4c4 100644
--- a/fdi/information/10freedesktop/30-keymap-hp.fdi
+++ b/fdi/information/10freedesktop/30-keymap-hp.fdi
@@ -8,10 +8,10 @@
<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">e001:screenlock</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">e00a:screenlock</append> <!-- Lock -->
<append key="input.keymap.data" type="strlist">e057:wlan</append> <!-- Wlan -->
<append key="info.capabilities" type="strlist">input.keymap</append>
</match>
diff --git a/fdi/information/10freedesktop/30-keymap-module-thinkpad-acpi.fdi b/fdi/information/10freedesktop/30-keymap-module-thinkpad-acpi.fdi
index 2999480..479a087 100644
--- a/fdi/information/10freedesktop/30-keymap-module-thinkpad-acpi.fdi
+++ b/fdi/information/10freedesktop/30-keymap-module-thinkpad-acpi.fdi
@@ -6,7 +6,7 @@
<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">0x02:screenlock</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 -->
@@ -16,7 +16,7 @@
</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">0x02:screenlock</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 -->
@@ -26,7 +26,7 @@
<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">0x02:screenlock</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 -->
@@ -37,7 +37,7 @@
<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">0x02:screenlock</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 -->
@@ -49,7 +49,7 @@
<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">0x02:screenlock</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 -->
@@ -71,7 +71,7 @@
<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">0x02:screenlock</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 -->
@@ -82,7 +82,7 @@
<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">0x02:screenlock</append> <!-- Fn+F3 lock -->
<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 radio -->
<append key="input.keymap.data" type="strlist">0x06:switchvideomode</append> <!-- Fn+F7 switch video output device -->
@@ -94,7 +94,7 @@
<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">0x02:screenlock</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 -->
@@ -105,7 +105,7 @@
<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">0x02:screenlock</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 -->
@@ -117,7 +117,7 @@
<append key="info.capabilities" type="strlist">input.keymap</append>
</match>
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.version" contains="X4">
- <append key="input.keymap.data" type="strlist">0x02:lock</append> <!-- Fn+F3 lock -->
+ <append key="input.keymap.data" type="strlist">0x02:screenlock</append> <!-- Fn+F3 lock -->
<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 radio -->
<append key="input.keymap.data" type="strlist">0x06:switchvideomode</append> <!-- Fn+F7 switch video output device -->
@@ -136,7 +136,7 @@
<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">0x04:radio</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 touchpadtoggle -->
<append key="input.keymap.data" type="strlist">0x08:f24</append> <!-- Fn+F9 undock -->
@@ -151,10 +151,10 @@
<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">0x04:radio</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">0x08:ejectcd</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 -->
@@ -166,7 +166,7 @@
<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">0x04:radio</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 -->
diff-tree c99133aec8e7c1450ba1f371b2acdd111ddd07b0 (from d41b99195921196b42cb1ac9a6d0d7e93a7d986e)
Author: Richard Hughes <richard at hughsie.com>
Date: Thu Jul 12 11:47:06 2007 +0100
fix a couple of keys spotted by Florian Festi
diff --git a/fdi/information/10freedesktop/30-keymap-compaq.fdi b/fdi/information/10freedesktop/30-keymap-compaq.fdi
index 60b86c7..c6d51dd 100644
--- a/fdi/information/10freedesktop/30-keymap-compaq.fdi
+++ b/fdi/information/10freedesktop/30-keymap-compaq.fdi
@@ -9,7 +9,7 @@
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix="Compaq">
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="E500">
<append key="input.keymap.data" type="strlist">e023:www</append> <!-- I key -->
- <append key="input.keymap.data" type="strlist">e01f:home</append> <!-- Home key -->
+ <append key="input.keymap.data" type="strlist">e01f:homepage</append> <!-- Home key -->
<append key="input.keymap.data" type="strlist">e01a:search</append> <!-- Search key -->
<append key="input.keymap.data" type="strlist">e01e:email</append> <!-- Email -->
<append key="info.capabilities" type="strlist">input.keymap</append>
diff --git a/fdi/information/10freedesktop/30-keymap-dell.fdi b/fdi/information/10freedesktop/30-keymap-dell.fdi
index 4330aa6..1417512 100644
--- a/fdi/information/10freedesktop/30-keymap-dell.fdi
+++ b/fdi/information/10freedesktop/30-keymap-dell.fdi
@@ -62,7 +62,7 @@
<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="input.keymap.data" type="strlist">e015:camera</append> <!-- Shutter button Takes a picture if optional camera available -->
<append key="info.capabilities" type="strlist">input.keymap</append>
</match>
diff-tree d41b99195921196b42cb1ac9a6d0d7e93a7d986e (from f97a91e81c37ed39c325f229d52705a58772177d)
Author: Lennart Poettering <mzuny at 0pointer.de>
Date: Wed Jul 11 21:18:04 2007 +0100
add keymap quirks for msi-s270
The attached patch contains the keymap data for MSI S270 laptops.
This laptop generates keyboard events when the power cable is plugged
in/plugged out. These events are completely redundant, because ACPI
events are sent anyway. Thus I'd like to map this key to some code
where they are essentially eaten. KEY_RESERVED is not an option,
because this still fills up dmesg with those well known warnings about
setkeycode. I am now using KEY_UNKNOWN which fills up dmesg slightly
less, but still generates a warning when X11 is listening for raw kbd
events. Better then before but not much better. I guess it would make
sense to have a proper KEY_NULL or similar in the kernel.
diff --git a/fdi/information/10freedesktop/30-keymap-misc.fdi b/fdi/information/10freedesktop/30-keymap-misc.fdi
index a8fa30c..8c2d0cb 100644
--- a/fdi/information/10freedesktop/30-keymap-misc.fdi
+++ b/fdi/information/10freedesktop/30-keymap-misc.fdi
@@ -31,7 +31,26 @@
<append key="info.capabilities" type="strlist">input.keymap</append>
</match>
</match>
+
+ <match key="/org/freedesktop/Hal/devices/computer:system.chassis.manufacturer" prefix="MICRO-STAR">
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.version" string="0131">
+ <append key="input.keymap.data" type="strlist">e078:brightnessup</append> <!-- Fn-F4 Brightness up -->
+ <append key="input.keymap.data" type="strlist">e077:brightnessdown</append> <!-- Fn-F5 Brightness down -->
+ <append key="input.keymap.data" type="strlist">e02e:volumedown</append> <!-- Fn-F7 Volume down -->
+ <append key="input.keymap.data" type="strlist">e030:volumeup</append> <!-- Fn-F8 Volume up -->
+ <append key="input.keymap.data" type="strlist">e020:mute</append> <!-- Fn-F9 Sound On/Off -->
+ <append key="input.keymap.data" type="strlist">e05f:sleep</append> <!-- Fn-F12 Sleep -->
+ <append key="input.keymap.data" type="strlist">e06c:email</append> <!-- envelope button -->
+ <append key="input.keymap.data" type="strlist">e032:www</append> <!-- www button -->
+ <append key="input.keymap.data" type="strlist">e076:wlan</append> <!-- wlan -->
+ <append key="input.keymap.data" type="strlist">e079:search</append> <!-- search -->
+ <append key="input.keymap.data" type="strlist">e071:unknown</append> <!-- plug -->
+ <append key="input.keymap.data" type="strlist">e072:unknown</append> <!-- unplug -->
+ <append key="info.capabilities" type="strlist">input.keymap</append>
+ </match>
+ </match>
+
</match>
</device>
diff-tree f97a91e81c37ed39c325f229d52705a58772177d (from 6c7fcb6e3e1679fd6eef98c0f9b6dada17c1776d)
Author: Tom Mannerhagen <tom.mannerhagen at gmail.com>
Date: Wed Jul 11 15:21:04 2007 +0100
add resume quirk for satellite pro 6100
here's a HAL patch I figured out to improve the display-activation of my Toshiba SatPro 6100 under Ubuntu 7.10.
The graphics card is an nVidia Geforce 4 Go 420.
I am using the free nv driver.
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi
index 5efe243..eefd3c5 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi
@@ -33,9 +33,12 @@
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
+ <match key="system.hardware.product" prefix="Satellite Pro 6100">
+ <merge key="power_management.quirk.dpms_on" type="bool">true</merge>
+ </match>
<match key="system.hardware.product" prefix="TECRA 8200">
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
</match>
</device>
-</deviceinfo>
+</deviceinfo>
\ No newline at end of file
diff-tree 6c7fcb6e3e1679fd6eef98c0f9b6dada17c1776d (from 9a4c2b716568b9db1255208f92fa83edd5805675)
Author: Eric Harney <eharney at gmail.com>
Date: Wed Jul 11 09:56:07 2007 +0100
add keymap for dell inspiron e1505
I've written a patch to enable extra keys on the Insprion E1505. This
is a rebranded Inspiron 6400, which is what HAL sees the laptop as.
diff --git a/fdi/information/10freedesktop/30-keymap-dell.fdi b/fdi/information/10freedesktop/30-keymap-dell.fdi
index 81164f8..4330aa6 100644
--- a/fdi/information/10freedesktop/30-keymap-dell.fdi
+++ b/fdi/information/10freedesktop/30-keymap-dell.fdi
@@ -76,6 +76,17 @@
<append key="info.capabilities" type="strlist">input.keymap</append>
</match>
</match>
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" prefix="MM061"> <!-- Inspiron E1505/6400 -->
+ <append key="input.keymap.data" type="strlist">e005:brightnessdown</append> <!-- Fn+Down arrow Brightness Down -->
+ <append key="input.keymap.data" type="strlist">e006:brightnessup</append> <!-- Fn+Up arrow Brightness Up -->
+ <append key="input.keymap.data" type="strlist">e007:battery</append> <!-- Fn+F3 battery icon -->
+ <append key="input.keymap.data" type="strlist">e008:bluetooth</append> <!-- Fn+F2 bluetooth -->
+ <append key="input.keymap.data" type="strlist">e009:ejectclosedcd</append> <!-- Fn+F10 Eject CD -->
+ <append key="input.keymap.data" type="strlist">e00a:hibernate</append> <!-- Fn+F1 Hibernate -->
+ <append key="input.keymap.data" type="strlist">e00b:switchvideomode</append> <!-- Fn+F8 CRT/LCD -->
+ <append key="input.keymap.data" type="strlist">e012:media</append> <!-- MediaDirect button (house icon) -->
+ <append key="info.capabilities" type="strlist">input.keymap</append>
+ </match>
</match>
</match>
</device>
diff-tree 9a4c2b716568b9db1255208f92fa83edd5805675 (from 5f238c85f3387949b0c7f9d4ae9923d877527a0f)
Author: Richard Hughes <richard at hughsie.com>
Date: Tue Jul 10 23:24:12 2007 +0100
correct quirk for T42, my typo
diff --git a/fdi/information/10freedesktop/30-keymap-module-thinkpad-acpi.fdi b/fdi/information/10freedesktop/30-keymap-module-thinkpad-acpi.fdi
index 4d951b2..2999480 100644
--- a/fdi/information/10freedesktop/30-keymap-module-thinkpad-acpi.fdi
+++ b/fdi/information/10freedesktop/30-keymap-module-thinkpad-acpi.fdi
@@ -84,8 +84,8 @@
<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">0x04:radio</append> <!-- Fn+F5 switch radio -->
<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 -->
diff-tree 5f238c85f3387949b0c7f9d4ae9923d877527a0f (from parents)
Merge: 109e79e0bcd16e18c1a965d08632775d01a43733 00ded4be1c4037cf06c04230ff05745dccdc929d
Author: Richard Hughes <richard at hughsie.com>
Date: Tue Jul 10 23:19:23 2007 +0100
Merge branch 'master' of git+ssh://hughsient@git.freedesktop.org/git/hal-info
diff-tree 109e79e0bcd16e18c1a965d08632775d01a43733 (from f6a3238fa22256e17864c27e37167830aa8fc4d4)
Author: Zack Cerza <zcerza at redhat.com>
Date: Tue Jul 10 23:18:56 2007 +0100
add keymap for ibm x40
Attached is a patch for the X41 keymap. I don't have the tablet version,
though, so we'll see if that matters later...
diff --git a/fdi/information/10freedesktop/30-keymap-module-thinkpad-acpi.fdi b/fdi/information/10freedesktop/30-keymap-module-thinkpad-acpi.fdi
index 36fdd52..4d951b2 100644
--- a/fdi/information/10freedesktop/30-keymap-module-thinkpad-acpi.fdi
+++ b/fdi/information/10freedesktop/30-keymap-module-thinkpad-acpi.fdi
@@ -116,6 +116,19 @@
<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="X4">
+ <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">0x04:radio</append> <!-- Fn+F5 switch radio -->
+ <append key="input.keymap.data" type="strlist">0x06:switchvideomode</append> <!-- Fn+F7 switch video output device -->
+ <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 key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix="LENOVO">
More information about the hal-commit
mailing list