hal: Branch 'origin' - 4 commits
Richard Hughes
hughsient at kemper.freedesktop.org
Wed Jun 6 01:02:47 PDT 2007
configure.in | 6 +++
fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi | 3 +
fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi | 4 ++
fdi/information/10freedesktop/30-keymap-lenovo.fdi | 30 +++++++++++++++
fdi/information/10freedesktop/Makefile.am | 5 ++
5 files changed, 48 insertions(+)
New commits:
diff-tree 8e51fc7898707934079be1c74ce6f5e03ceb3dd5 (from c8b6c3084c79fe0853befa2795e1738fb11fa5c2)
Author: Richard Hughes <richard at hughsie.com>
Date: Tue Jun 5 16:52:15 2007 +0100
add keymap capabilities into hal-info
Add keymapping data into hal-info so we can remap scancode->keycodes
at boot time, fixing many multimedia keyboards.
diff --git a/fdi/information/10freedesktop/30-keymap-lenovo.fdi b/fdi/information/10freedesktop/30-keymap-lenovo.fdi
new file mode 100644
index 0000000..1262a8e
--- /dev/null
+++ b/fdi/information/10freedesktop/30-keymap-lenovo.fdi
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
+
+<deviceinfo version="0.2">
+ <device>
+
+ <!-- These are raw scancodes produced by the atkbd driver -->
+ <match key="@input.originating_device:info.linux.driver" string="atkbd">
+
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix="LENOVO">
+ <match key="/org/freedesktop/Hal/devices/computer:smbios.system.version" contains="3000">
+ <append key="input.keymap.data" type="strlist">e016:wlan</append> <!-- Fn+F5 wireless -->
+ <append key="input.keymap.data" type="strlist">e017:sleep</append> <!-- Fn+F4 suspend -->
+ <append key="input.keymap.data" type="strlist">e018:suspend</append> <!-- Fn+F12 hibernate -->
+ <append key="info.capabilities" type="strlist">input.keymap</append>
+ </match>
+ </match>
+
+ </match>
+
+ <!-- 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">
+ <append key="input.keymap.data" type="strlist">007f:coffee</append> <!-- thinkvantage -->
+ <append key="info.capabilities" type="strlist">input.keymap</append>
+ </match>
+ </match>
+
+ </device>
+</deviceinfo>
+
diff-tree c8b6c3084c79fe0853befa2795e1738fb11fa5c2 (from ba588f11f380a32a318fb9c9718d81fe5dd071a2)
Author: Richard Hughes <richard at hughsie.com>
Date: Tue Jun 5 16:48:19 2007 +0100
add keymap capabilities into hal-info
Add keymapping data into hal-info so we can remap scancode->keycodes
at boot time, fixing many multimedia keyboards.
diff --git a/configure.in b/configure.in
index 452dabd..1c3fbc9 100644
--- a/configure.in
+++ b/configure.in
@@ -19,6 +19,12 @@ dnl ------------------------------------
AC_ARG_ENABLE(video, [ --enable-video include video suspend data],enable_video=$enableval,enable_video=yes)
AM_CONDITIONAL(BUILD_VIDEO, test x$enable_video == xyes)
+dnl ---------------------------------------------------------------------------
+dnl - Should we ship the keymap data (makes random vendor keys work)
+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)
+
AC_OUTPUT([
Makefile
fdi/Makefile
diff --git a/fdi/information/10freedesktop/Makefile.am b/fdi/information/10freedesktop/Makefile.am
index 594606c..cb604dd 100644
--- a/fdi/information/10freedesktop/Makefile.am
+++ b/fdi/information/10freedesktop/Makefile.am
@@ -37,6 +37,11 @@ dist_fdi_DATA += \
20-video-quirk-pm-toshiba.fdi
endif
+if BUILD_KEYMAPS
+dist_fdi_DATA += \
+ 30-keymap-lenovo.fdi
+endif
+
check:
for f in $(dist_fdi_DATA); do \
echo -n "Validate XML in $$f : "; \
diff-tree ba588f11f380a32a318fb9c9718d81fe5dd071a2 (from 2ebf1f1354e708fc884b4dbd16e782766e520753)
Author: Frederic Crozat <fcrozat at mandriva.com>
Date: Tue Jun 5 14:08:24 2007 +0100
add quirk for Dell Latitude D400
The attached quirk fixes suspend / resumes for D400 with both old i810
and new intel driver, for X and console (console was buggy).
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
index 6245568..04f5595 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
@@ -3,6 +3,9 @@
<device>
<match key="system.hardware.vendor" prefix="Dell">
<match key="system.hardware.product" prefix="Latitude">
+ <match key="system.hardware.product" contains="D400">
+ <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
+ </match>
<match key="system.hardware.product" contains="D410">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
<merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
diff-tree 2ebf1f1354e708fc884b4dbd16e782766e520753 (from dd2df012362d608e50b52dee5cf9f6e4903bc229)
Author: ilw <ilw at adx.ru>
Date: Tue Jun 5 11:59:21 2007 +0100
add quirk for HP Pavilion ze2000
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
index a064fb9..58c0131 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
@@ -16,6 +16,10 @@
<merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
</match>
+ <match key="system.hardware.product" contains="ze2000">
+ <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" contains="nc6000">
<match key="system.firmware.version" prefix="68BDD">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
More information about the hal-commit
mailing list