hal: Branch 'origin' - 15 commits
David Zeuthen
david at kemper.freedesktop.org
Mon Jul 9 12:23:49 PDT 2007
fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi | 4 +
fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi | 3 +
fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi | 4 +
fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi | 8 ++
fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi | 21 +++++++
fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi | 3 +
fdi/information/10freedesktop/30-keymap-dell.fdi | 14 ++++-
fdi/information/10freedesktop/30-keymap-hp.fdi | 20 +++++++
fdi/information/10freedesktop/30-keymap-lenovo.fdi | 21 -------
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 | 11 ++--
12 files changed, 132 insertions(+), 27 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
diff-tree 9cb925b5143798f1e0e3081437029ee59f4216a9 (from b9c7a2e5a9c05c4a2b7d73a260f0cd42b9f74efb)
Author: Roy Dragseth <roy.dragseth at cc.uit.no>
Date: Mon Jul 9 15:25:11 2007 +0100
add video quirk for ASUS S6F
Here is a patch to make suspend work on ASUS S6F laptops.
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi
index 4922612..12b3dde 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi
@@ -31,6 +31,10 @@
<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="S6F">
+ <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
+ <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
+ </match>
</match>
<!-- ASUS a7v600 motherboard, has no usable sys_* entries besides bios_version -->
<match key="smbios.bios.version" prefix="ASUS A7V600">
diff-tree b9c7a2e5a9c05c4a2b7d73a260f0cd42b9f74efb (from 89e45b45cb2433541cdd017c54a740eb1ff03aa2)
Author: William Ritchie <billr at domsys.com>
Date: Mon Jul 9 15:23:32 2007 +0100
add keybinding for hp nc6120
here is a new file for hp laptops that I started. The only one listed is
the nc6120. The only missing keys were the I button, the Svideo button
and the battery button.
diff --git a/fdi/information/10freedesktop/30-keymap-hp.fdi b/fdi/information/10freedesktop/30-keymap-hp.fdi
new file mode 100644
index 0000000..07ed507
--- /dev/null
+++ b/fdi/information/10freedesktop/30-keymap-hp.fdi
@@ -0,0 +1,20 @@
+<?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="Hewlett-Packard">
+ <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) -->
+ <append key="input.keymap.data" type="strlist">e008:tv</append> <!-- SVideo -->
+ <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 eefc158..dae40e8 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-misc.fdi \
+ 30-keymap-hp.fdi \
30-keymap-compaq.fdi \
30-keymap-lenovo.fdi \
30-keymap-dell.fdi
diff-tree 89e45b45cb2433541cdd017c54a740eb1ff03aa2 (from d94c858ff130a64348c802848a1ba630757d1654)
Author: William Ritchie <billr at domsys.com>
Date: Mon Jul 9 15:19:49 2007 +0100
add video resume quirk for hp nc6120
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
index 58c0131..065f768 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
@@ -62,6 +62,10 @@
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
<merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
</match>
+ <match key="system.hardware.product" contains="nc6120">
+ <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
+ <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
+ </match>
</match>
</device>
</deviceinfo>
diff-tree d94c858ff130a64348c802848a1ba630757d1654 (from b137361d1a3be9cb0b79b747d209f512a3e53ce7)
Author: Richard Hughes <richard at hughsie.com>
Date: Sun Jul 8 08:50:11 2007 +0100
fix quirk for dell x300
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
index 2a70adc..bfe018f 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
@@ -59,7 +59,7 @@
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
</match>
<match key="system.hardware.product" contains="X300">
- <merge key="power_management.quirk.vmestate_restore" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
</match>
<match key="system.hardware.product" prefix="Inspiron">
diff-tree b137361d1a3be9cb0b79b747d209f512a3e53ce7 (from 37f99db2ddc708b41c12bf87b9c760f12a2abb32)
Author: Andreas Schneider <mail at cynapses.org>
Date: Sun Jul 8 08:48:23 2007 +0100
add video commit fix for T61
attached is a patch to support suspend on my new T61.
gladiac at krikkit:~> lshal | grep system.hardware
system.hardware.product = '766314G' (string)
system.hardware.serial = 'L3B6097' (string)
system.hardware.uuid = '25D6E501-4976-11CB-BAFB-F3BEC990E6E0' (string)
system.hardware.vendor = 'LENOVO' (string)
system.hardware.version = 'ThinkPad T61' (string)
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
index a6a4037..92377d7 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
@@ -39,6 +39,10 @@
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
+ <!-- T61 -->
+ <match key="system.hardware.version" string="766314G">
+ <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
+ </match>
</match>
</device>
</deviceinfo>
diff-tree 37f99db2ddc708b41c12bf87b9c760f12a2abb32 (from 1c2c2b47596e4be97b603e2fd1b8e57b0d3192b4)
Author: Jim Radford <radford at blackbean.org>
Date: Sat Jul 7 18:26:29 2007 +0100
add video quirk for dell latitude x300
With this quirk, suspend works for me on my Dell Latitude X300 in f7
if I also remove these usb modules first.
SUSPEND_MODULES=ehci_hcd
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
index f9cc6c3..2a70adc 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
@@ -58,6 +58,9 @@
<match key="system.hardware.product" suffix="X1">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
</match>
+ <match key="system.hardware.product" contains="X300">
+ <merge key="power_management.quirk.vmestate_restore" type="bool">true</merge>
+ </match>
</match>
<match key="system.hardware.product" prefix="Inspiron">
<match key="system.hardware.product" contains="5150">
diff-tree 1c2c2b47596e4be97b603e2fd1b8e57b0d3192b4 (from 9c7a902a252d7484b1264a19b8107dc05006c7ee)
Author: Stuart Fairley <stuart at seegrid.com>
Date: Sat Jul 7 11:08:18 2007 +0100
add quirk for Sony Vaio VGN-FS730 resume
As outlined in the HAL Sleep Quirks page:
The attached patch allows me to successfully suspend and resume (without
it I'd have a live machine - Ctrl-Alt-Del reboots cleanly, but dead
display).
Tested successfully once from run level 3 and 4 times from X, run level 5.
Thanks for the easy to use instructions
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi
index 8e04237..d49f049 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi
@@ -9,6 +9,9 @@
<match key="system.hardware.product" string="VGN-FS115Z">
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
+ <match key="system.hardware.product" string="VGN-FS730">
+ <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
+ </match>
</match>
</device>
</deviceinfo>
diff-tree 9c7a902a252d7484b1264a19b8107dc05006c7ee (from 99716c902a1bf0f19c6b4522520f1722a79aac85)
Author: Simon Goodall <sg at ecs.soton.ac.uk>
Date: Sat Jul 7 11:04:23 2007 +0100
add keymap for dell inspiron 8500
Please see attached for keybindings for a dell inspiron 8500. I've
tested this against the version of hal in the utopia repository and
against the git repo's make check.
The cdrom eject button does not appear to do anything. I tried both
ejectcd and ejectclosedcd.
diff --git a/fdi/information/10freedesktop/30-keymap-dell.fdi b/fdi/information/10freedesktop/30-keymap-dell.fdi
index 4f37dce..f29fb57 100644
--- a/fdi/information/10freedesktop/30-keymap-dell.fdi
+++ b/fdi/information/10freedesktop/30-keymap-dell.fdi
@@ -31,10 +31,20 @@
<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>
+ <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>
</deviceinfo>
+
diff-tree 99716c902a1bf0f19c6b4522520f1722a79aac85 (from 0fefde9d6fc57f27ebb076d49be66fa8b24c5186)
Author: James Ettle <jhe at phys.soton.ac.uk>
Date: Sat Jul 7 11:02:15 2007 +0100
add quick for MiTAC 8011 for suspend
Please find attached a quirk patch I use for my MiTAC 8011-based
notebook, BIOS 1.05. (This is a chassis that may cover a wide variety of
models sold under various brand names).
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
index 8421755..094411b 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
@@ -97,6 +97,14 @@
</device>
<device>
+ <match key="system.hardware.vendor" prefix="MTC">
+ <match key="system.hardware.product" string="Montara-GML">
+ <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
+ </match>
+ </match>
+ </device>
+
+ <device>
<match key="system.hardware.vendor" string="MiTAC">
<!-- Mitac 8350
system.hardware.product = '' (string)
diff-tree 0fefde9d6fc57f27ebb076d49be66fa8b24c5186 (from 852987a6ebdbb5fd39ded75c3ccc7ab09c83856a)
Author: Nigel Cunningham <nigel at nigel.suspend2.net>
Date: Sat Jul 7 10:58:52 2007 +0100
add quirk for mitac 8350
Here's a patch for my Mitac 8350 based laptop. Unfortunately, they don't provide much info that can be used to identify it.
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
index 4ed56cb..8421755 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
@@ -96,4 +96,17 @@
</match>
</device>
+ <device>
+ <match key="system.hardware.vendor" string="MiTAC">
+ <!-- Mitac 8350
+ system.hardware.product = '' (string)
+ system.hardware.serial = '' (string)
+ system.hardware.uuid = '64DBBBB4-5631-DA11-8000-4E45435F4349' (string)
+ system.hardware.vendor = 'MiTAC' (string)
+ system.hardware.version = '5a' (string)
+ -->
+ <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
+ <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
+ </match>
+ </device>
</deviceinfo>
diff-tree 852987a6ebdbb5fd39ded75c3ccc7ab09c83856a (from parents)
Merge: 7568efd6e3489a86d3c36d9ad1dff12c68bc5a7d b68097f2997d57bf1be81b7b0810c87254f46e4f
Author: Richard Hughes <richard at hughsie.com>
Date: Sat Jul 7 10:56:15 2007 +0100
Merge branch 'master' of git+ssh://hughsient@git.freedesktop.org/git/hal-info
diff-tree 7568efd6e3489a86d3c36d9ad1dff12c68bc5a7d (from 8498ef7caded7e88d0c582c0be67495b6aacb0cc)
Author: Bryan O'Sullivan <bos at serpentine.com>
Date: Sat Jul 7 10:52:57 2007 +0100
add suspend quirk for another x60
Added quirk for another x60 model
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
index 5fb237f..a6a4037 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
@@ -11,6 +11,10 @@
<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="1709">
+ <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="63664DU">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
</match>
diff-tree 8498ef7caded7e88d0c582c0be67495b6aacb0cc (from d90c832ba2353c12008c2ff02396613337ec8de2)
Author: Richard Hughes <richard at hughsie.com>
Date: Thu Jul 5 13:47:11 2007 +0100
add some new entries for the thinkpad driver
Now the thinkpad driver can discover high-bit keys without polling it can
be used with setkeycodes to emit input events for these buttons. This means
we can get the blue thinkpad button and brightness button events.
diff --git a/fdi/information/10freedesktop/30-keymap-lenovo.fdi b/fdi/information/10freedesktop/30-keymap-lenovo.fdi
index 83b13a5..6d2876b 100644
--- a/fdi/information/10freedesktop/30-keymap-lenovo.fdi
+++ b/fdi/information/10freedesktop/30-keymap-lenovo.fdi
@@ -32,6 +32,10 @@
<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>
More information about the hal-commit
mailing list