hal: Branch 'master' - 5 commits
Danny Kukawka
dkukawka at kemper.freedesktop.org
Mon Dec 3 06:04:13 PST 2007
fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi | 11 +++++++++-
fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi | 2 -
fdi/information/10freedesktop/30-keymap-dell.fdi | 2 -
fdi/information/10freedesktop/30-keymap-module-sony-laptop.fdi | 2 -
4 files changed, 13 insertions(+), 4 deletions(-)
New commits:
commit 52d3a0077d4dc02d426a0fca6a3bd49d924fb9b9
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Mon Dec 3 15:02:45 2007 +0100
added Dell Inspiron 1501 keymap
Added adopted patch from Philip Dorr <tagno25 at gmail.com> to add keymap
for a Dell Inspiron 1501.
diff --git a/fdi/information/10freedesktop/30-keymap-dell.fdi b/fdi/information/10freedesktop/30-keymap-dell.fdi
index 2147a9a..e9779a8 100644
--- a/fdi/information/10freedesktop/30-keymap-dell.fdi
+++ b/fdi/information/10freedesktop/30-keymap-dell.fdi
@@ -99,7 +99,7 @@
<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 key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="XPS Gen2">
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="XPS Gen2;1501">
<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 -->
commit 0608adf27e3a582c851ff9ccf11b338ef957175e
Author: Jarmo Rosenqvist <jarmo.rosenqvist at arwidson.fi>
Date: Mon Dec 3 14:59:24 2007 +0100
add keymap support for Sony VGN-TZ11XN_B
Added more keyboard support for Sony VGN-TZ11XN_B.
diff --git a/fdi/information/10freedesktop/30-keymap-module-sony-laptop.fdi b/fdi/information/10freedesktop/30-keymap-module-sony-laptop.fdi
index e735b42..7f6d5b7 100644
--- a/fdi/information/10freedesktop/30-keymap-module-sony-laptop.fdi
+++ b/fdi/information/10freedesktop/30-keymap-module-sony-laptop.fdi
@@ -17,7 +17,7 @@
<append key="info.capabilities" type="strlist">input.keymap</append>
</match>
- <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" string="VGN-FS790B">
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" string_outof="VGN-FS790B;VGN-TZ11XN_B">
<append key="input.keymap.data" type="strlist">0x06:mute</append> <!-- Fn+F2 mute -->
<append key="input.keymap.data" type="strlist">0x07:volumedown</append> <!-- Fn+F3 mixer down -->
<append key="input.keymap.data" type="strlist">0x08:volumeup</append> <!-- Fn+F4 mixer up -->
commit 8b3c0af324210bf58d1f3451af699f928a30b255
Author: Kyle McMartin <kmcmartin at redhat.com>
Date: Mon Dec 3 14:56:51 2007 +0100
add another Lenovo T61 suspend quirk
This patch fixes the suspend/resume quirk on the Lenovo T61... Not sure
why it's gone unnoticed for so long...
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
index 18f85ed..9fddd53 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
@@ -5,7 +5,7 @@
<!-- ThinkPads -->
<!-- X60 / X60s / T61 / R61 / X61 Tablet -->
- <match key="system.hardware.product" prefix_outof="1702;1704;1706;1709;6363;6364;7658;8919;7767C3U;7768">
+ <match key="system.hardware.product" prefix_outof="1702;1704;1706;1709;6363;6364;7658;8919;7767C3U;7768;7661W1P">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
commit 63b38ddaf4869c6caa4db15ccd74c4c3072e0b41
Author: Andy Walls <cwalls at radix.net>
Date: Mon Dec 3 14:52:42 2007 +0100
suspend video quirks for HP Media Center PC m7330n
Attached is the git diff for suspend quirks for my "HP Media Center
m7330n" desktop machine running Fedora 7.
vbe_post & vbestate_restore are required for this machine.
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
index 721e1d4..bfc3281 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
@@ -171,5 +171,14 @@
</match>
</match>
+
+ <!-- HP Media Center PC m7330n w/ ATI RS480 [Radeon Xpress 200G Series] -->
+ <match key="system.hardware.vendor" prefix="HP Pavilion">
+ <match key="system.hardware.product" contains="M7330N">
+ <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
+ </match>
+ </match>
+
</device>
</deviceinfo>
commit a4e102cad32a0ae7b4e3b39a7d834257d7cb559b
Author: Jeremy Katz <katzj at redhat.com>
Date: Mon Dec 3 14:42:46 2007 +0100
suspend quirk for HP/Compaq 6510b
The HP 6510b needs vbepost/vbestate_restore for resume to work properly.
This adds it to the list of models needing the quirk
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
index 2fb66cf..721e1d4 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
@@ -65,7 +65,7 @@
<merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
<merge key="power_management.quirk.no_fb" type="bool">true</merge>
</match>
- <match key="system.hardware.product" contains_outof="OmniBook XE3 G;R3200;nx5000;nx7000;nc6120;nx6325">
+ <match key="system.hardware.product" contains_outof="OmniBook XE3 G;R3200;nx5000;nx7000;nc6120;nx6325;6510b">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
<merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
More information about the hal-commit
mailing list