hal: Branch 'master' - 2 commits
Richard Hughes
hughsient at kemper.freedesktop.org
Mon Jul 9 07:40:22 PDT 2007
fdi/information/10freedesktop/30-keymap-lenovo.fdi | 25 ---------
fdi/information/10freedesktop/30-keymap-module-sony-laptop.fdi | 23 ++++++++
fdi/information/10freedesktop/30-keymap-module-thinkpad-acpi.fdi | 27 ++++++++++
fdi/information/10freedesktop/Makefile.am | 12 ++--
4 files changed, 57 insertions(+), 30 deletions(-)
New commits:
diff-tree f9f3173ffdae7ada29ea27b8d450a4c7a659f70f (from cd40d84736345aa21152eb428152a9172e31e706)
Author: Richard Hughes <richard at hughsie.com>
Date: Mon Jul 9 15:37:44 2007 +0100
move the thinkpad-acpi to a seporate fdi file
For the quirks page, I want to seporate the MSC_SCAN and scancodes
parts. For this we need two files.
diff --git a/fdi/information/10freedesktop/30-keymap-lenovo.fdi b/fdi/information/10freedesktop/30-keymap-lenovo.fdi
index 6d2876b..23fcd28 100644
--- a/fdi/information/10freedesktop/30-keymap-lenovo.fdi
+++ b/fdi/information/10freedesktop/30-keymap-lenovo.fdi
@@ -17,30 +17,5 @@
</match>
</device>
-
- <device>
-
- <!-- These are buttons synthesized in other kernel drivers -->
- <match key="input.product" string="ThinkPad Extra Buttons">
- <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 -->
- <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 touchpadtoggle -->
- <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:blue</append> <!-- ThinkPad/ThinkVantage button -->
- <append key="info.capabilities" type="strlist">input.keymap</append>
- </match>
- </match>
- </match>
-
- </device>
</deviceinfo>
diff --git a/fdi/information/10freedesktop/30-keymap-module-thinkpad-acpi.fdi b/fdi/information/10freedesktop/30-keymap-module-thinkpad-acpi.fdi
new file mode 100644
index 0000000..48abedd
--- /dev/null
+++ b/fdi/information/10freedesktop/30-keymap-module-thinkpad-acpi.fdi
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
+
+<deviceinfo version="0.2">
+ <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="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 -->
+ <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 touchpadtoggle -->
+ <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:blue</append> <!-- ThinkPad/ThinkVantage button -->
+ <append key="info.capabilities" type="strlist">input.keymap</append>
+ </match>
+ </match>
+ </match>
+ </device>
+</deviceinfo>
+
diff --git a/fdi/information/10freedesktop/Makefile.am b/fdi/information/10freedesktop/Makefile.am
index cab9eea..00a00f4 100644
--- a/fdi/information/10freedesktop/Makefile.am
+++ b/fdi/information/10freedesktop/Makefile.am
@@ -40,6 +40,7 @@ endif
if BUILD_KEYMAPS
dist_fdi_DATA += \
30-keymap-module-sony-laptop.fdi \
+ 30-keymap-module-thinkpad-acpi.fdi \
30-keymap-misc.fdi \
30-keymap-hp.fdi \
30-keymap-compaq.fdi \
diff-tree cd40d84736345aa21152eb428152a9172e31e706 (from 9cb925b5143798f1e0e3081437029ee59f4216a9)
Author: Richard Hughes <richard at hughsie.com>
Date: Mon Jul 9 15:34:42 2007 +0100
add keymap for Sony VGN-S1XP(GB)
Add a keymap for the sony-laptop module where we can
use MSC_SCAN to remap the INPUT keys. This makes all
the buttons work on Bastiens' Sony Laptop
diff --git a/fdi/information/10freedesktop/30-keymap-module-sony-laptop.fdi b/fdi/information/10freedesktop/30-keymap-module-sony-laptop.fdi
new file mode 100644
index 0000000..76f7e82
--- /dev/null
+++ b/fdi/information/10freedesktop/30-keymap-module-sony-laptop.fdi
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
+
+<deviceinfo version="0.2">
+ <device>
+ <!-- These are buttons synthesized in the sony-laptop kernel module
+ You can find the scancodes in /usr/include/linux/sonypi.h -->
+ <match key="input.product" string="Sony Vaio Keys">
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix="Sony">
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" string="VGN-S1XP(GB)">
+ <append key="input.keymap.data" type="strlist">0x0d:mute</append> <!-- Fn+F2 mute -->
+ <append key="input.keymap.data" type="strlist">0x0e:volumedown</append> <!-- Fn+F3 mixer down -->
+ <append key="input.keymap.data" type="strlist">0x0f:volumeup</append> <!-- Fn+F4 mixer up -->
+ <append key="input.keymap.data" type="strlist">0x10:brightnessdown</append> <!-- Fn+F5 brightness up -->
+ <append key="input.keymap.data" type="strlist">0x11:brightnessup</append> <!-- Fn+F6 brightness down -->
+ <append key="input.keymap.data" type="strlist">0x12:switchvideomode</append> <!-- Fn+F7 switch crt/lcd -->
+ <append key="input.keymap.data" type="strlist">0x17:suspend</append> <!-- Fn+F12 hibernate -->
+ <append key="info.capabilities" type="strlist">input.keymap</append>
+ </match>
+ </match>
+ </match>
+ </device>
+</deviceinfo>
+
diff --git a/fdi/information/10freedesktop/Makefile.am b/fdi/information/10freedesktop/Makefile.am
index dae40e8..cab9eea 100644
--- a/fdi/information/10freedesktop/Makefile.am
+++ b/fdi/information/10freedesktop/Makefile.am
@@ -38,11 +38,12 @@ dist_fdi_DATA += \
endif
if BUILD_KEYMAPS
-dist_fdi_DATA += \
- 30-keymap-misc.fdi \
- 30-keymap-hp.fdi \
- 30-keymap-compaq.fdi \
- 30-keymap-lenovo.fdi \
+dist_fdi_DATA += \
+ 30-keymap-module-sony-laptop.fdi \
+ 30-keymap-misc.fdi \
+ 30-keymap-hp.fdi \
+ 30-keymap-compaq.fdi \
+ 30-keymap-lenovo.fdi \
30-keymap-dell.fdi
endif
More information about the hal-commit
mailing list