hal-info: Branch 'master' - 6 commits
Danny Kukawka
dkukawka at kemper.freedesktop.org
Sat Aug 9 08:32:31 PDT 2008
fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi | 2
fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi | 4 +
fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi | 2
fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi | 4 -
fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi | 2
fdi/information/10freedesktop/30-keymap-dell.fdi | 48 ++++++------
6 files changed, 34 insertions(+), 28 deletions(-)
New commits:
commit 9301c9c9d9d7ee5429dc60ebde868e4fe85c5142
Author: Dave Topan <shad at topan.ca>
Date: Sat Aug 9 17:30:26 2008 +0200
added suspend quirks for a Dell C500
Added suspend quirks for a Dell C500.
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
index 34a8b5a..81cd1e3 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
@@ -5,6 +5,10 @@
<!-- Dell Latitude -->
<match key="system.hardware.product" prefix="Latitude">
+ <match key="system.hardware.product" contains="C500">
+ <merge key="power_management.quirk.dpms_suspend" type="bool">true</merge>
+ <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
+ </match>
<match key="system.hardware.product" contains="C600">
<merge key="power_management.quirk.radeon_off" type="bool">true</merge>
</match>
commit 98a7ccb38f024311371ed5ffda3fc698bac35bda
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Sat Aug 9 17:18:46 2008 +0200
added suspend quirk for a ASUS U6S
Added an adopted version of a patch contributed by Zaheer Merali
<zaheermerali at gmail.com> to suspend a ASUS U6S.
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi
index 448d1ca..8c3bc23 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi
@@ -5,7 +5,7 @@
<match key="system.hardware.product" prefix_outof="U5F ;M2000E">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
</match>
- <match key="system.hardware.product" prefix_outof="K8N-E-Deluxe;L2000D;M6Ne;M51Sr ">
+ <match key="system.hardware.product" prefix_outof="K8N-E-Deluxe;L2000D;M6Ne;M51Sr ;U6S">
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
<!--NOTE: s2ram list the F3F with power_management.quirk.none=true -->
commit 0c74505cc0af31a0d3a9502150a27717d83c842c
Author: Taneli Korri <tkorri at gmail.com>
Date: Sat Aug 9 17:15:05 2008 +0200
added sleep quirk for FSC Amilo M1425
Added sleep quirk for FSC Amilo M1425.
system.chassis.type = 'Desktop' (string)
system.firmware.release_date = '12/29/2004' (string)
system.firmware.vendor = 'American Megatrends Inc.' (string)
system.firmware.version = '080010' (string)
system.formfactor = 'laptop' (string)
system.hardware.primary_video.product = 20048 (0x4e50) (int)
system.hardware.primary_video.vendor = 4098 (0x1002) (int)
system.hardware.product = 'Amilo M1425' (string)
system.hardware.serial = 'To Be Filled By O.E.M.' (string)
system.hardware.vendor = 'FUJITSU SIEMENS' (string)
system.hardware.version = 'To Be Filled By O.E.M.' (string)
system.kernel.machine = 'i686' (string)
system.kernel.version = '2.6.25.6-55.fc9.i686' (string)
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi
index e0bbff1..e318b26 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi
@@ -4,7 +4,7 @@
<match key="system.hardware.vendor" prefix="FUJITSU">
<match key="system.hardware.product" contains_ncase="amilo">
- <match key="system.hardware.product" contains_outof="A1667G Serie;Pa 1510;Li 1718">
+ <match key="system.hardware.product" contains_outof="A1667G Serie;Pa 1510;Li 1718;M1425">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
</match>
<match key="system.hardware.product" contains_outof="Pro V3205;Pro Edition V3405;Pro Edition V3505;Xi 1546;Si 1520;A7640;Pi 1505;A1645">
commit ed5ccaebf6b44d28afefc7da771973d2180eb59a
Author: Jakub Hrozek <jakub.hrozek at gmail.com>
Date: Sat Aug 9 17:11:53 2008 +0200
suspend-to-ram quirk for Lenovo R61e
Added suspend-to-ram quirk for Lenovo R61e.
system.firmware.version = '7PET15WW (1.02 )' (string)
system.hardware.primary_video.product = 10754 (0x2a02) (int)
system.hardware.primary_video.vendor = 32902 (0x8086) (int)
system.hardware.product = '' (string)
system.hardware.serial = '' (string)
system.hardware.vendor = 'LENOVO' (string)
system.hardware.version = 'ThinkPad R61e' (string)
system.kernel.machine = 'i686' (string)
system.kernel.version = '2.6.24.7-92.fc8' (string)
system.product = ' ThinkPad R61e' (string)
system.vendor = 'LENOVO' (string)
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
index 85c9666..5ecbabc 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
@@ -25,13 +25,13 @@
</match>
</match>
- <!-- T60*, Z61* -->
+ <!-- T60*, Z61*, R61e -->
<match key="system.hardware.version" prefix="ThinkPad ">
<match key="system.hardware.version" suffix="T60">
<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.version" contains_outof="T60p;Z61m;Z61t;Z60m;Z61p">
+ <match key="system.hardware.version" contains_outof="T60p;Z61m;Z61t;Z60m;Z61p;R61e">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
commit 0ea02eb0887c4e2604b2f5950cd2462e428749b5
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Sat Aug 9 17:08:47 2008 +0200
fixed keymapping for Dell machines
Fixed keymapping for Dell machines. Do the default keymapping
only on laptops to prevent possible problems with desktop machines.
diff --git a/fdi/information/10freedesktop/30-keymap-dell.fdi b/fdi/information/10freedesktop/30-keymap-dell.fdi
index a5804db..e9f474b 100644
--- a/fdi/information/10freedesktop/30-keymap-dell.fdi
+++ b/fdi/information/10freedesktop/30-keymap-dell.fdi
@@ -6,29 +6,31 @@
<!-- 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="Dell">
- <append key="input.keymap.data" type="strlist">e001:playpause</append> <!-- Play/Pause -->
- <append key="input.keymap.data" type="strlist">e002:stop</append> <!-- Stop -->
- <append key="input.keymap.data" type="strlist">e003:previoussong</append> <!-- Previous song -->
- <append key="input.keymap.data" type="strlist">e004:nextsong</append> <!-- Next song -->
- <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:wlan</append> <!-- Fn+F2 Turn On/Off Wireless -->
- <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:displaytoggle</append> <!-- Fn+F8 CRT/LCD -->
- <append key="input.keymap.data" type="strlist">e00f:switchvideomode</append> <!-- Fn+F7 aspect ratio -->
- <append key="input.keymap.data" type="strlist">e010:previoussong</append> <!-- Front panel previous song -->
- <append key="input.keymap.data" type="strlist">e011:prog1</append> <!-- Wifi Catcher (DELL Specific) -->
- <append key="input.keymap.data" type="strlist">e012:media</append> <!-- MediaDirect button (house icon) -->
- <append key="input.keymap.data" type="strlist">e013:f23</append> <!-- FIXME Fn+Left arrow Auto Brightness -->
- <append key="input.keymap.data" type="strlist">e015:camera</append> <!-- Shutter button Takes a picture if optional camera available -->
- <append key="input.keymap.data" type="strlist">e019:nextsong</append> <!-- Front panel next song -->
- <append key="input.keymap.data" type="strlist">e022:playpause</append> <!-- Front panel play/pause -->
- <append key="input.keymap.data" type="strlist">e024:stop</append> <!-- Front panel stop -->
- <append key="input.keymap.data" type="strlist">e06d:media</append> <!-- MediaDirect button -->
- <append key="info.capabilities" type="strlist">input.keymap</append>
+ <match key="/org/freedesktop/Hal/devices/computer:system.formfactor" string="laptop">
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix="Dell">
+ <append key="input.keymap.data" type="strlist">e001:playpause</append> <!-- Play/Pause -->
+ <append key="input.keymap.data" type="strlist">e002:stop</append> <!-- Stop -->
+ <append key="input.keymap.data" type="strlist">e003:previoussong</append> <!-- Previous song -->
+ <append key="input.keymap.data" type="strlist">e004:nextsong</append> <!-- Next song -->
+ <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:wlan</append> <!-- Fn+F2 Turn On/Off Wireless -->
+ <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:displaytoggle</append> <!-- Fn+F8 CRT/LCD -->
+ <append key="input.keymap.data" type="strlist">e00f:switchvideomode</append> <!-- Fn+F7 aspect ratio -->
+ <append key="input.keymap.data" type="strlist">e010:previoussong</append> <!-- Front panel previous song -->
+ <append key="input.keymap.data" type="strlist">e011:prog1</append> <!-- Wifi Catcher (DELL Specific) -->
+ <append key="input.keymap.data" type="strlist">e012:media</append> <!-- MediaDirect button (house icon) -->
+ <append key="input.keymap.data" type="strlist">e013:f23</append> <!-- FIXME Fn+Left arrow Auto Brightness -->
+ <append key="input.keymap.data" type="strlist">e015:camera</append> <!-- Shutter button Takes a picture if optional camera available -->
+ <append key="input.keymap.data" type="strlist">e019:nextsong</append> <!-- Front panel next song -->
+ <append key="input.keymap.data" type="strlist">e022:playpause</append> <!-- Front panel play/pause -->
+ <append key="input.keymap.data" type="strlist">e024:stop</append> <!-- Front panel stop -->
+ <append key="input.keymap.data" type="strlist">e06d:media</append> <!-- MediaDirect button -->
+ <append key="info.capabilities" type="strlist">input.keymap</append>
+ </match>
</match>
</match>
</device>
commit b9e20e93ad0902b7fd14813e0576cbeaee254a58
Author: Carl Gable Watts <C.G.Watts at comcast.net>
Date: Sat Aug 9 16:45:18 2008 +0200
suspend quirks for Toshiba R200 and R205
Added suspend quirks for Toshiba R200 and R205.
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi
index 8fdaf29..e8b01b8 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi
@@ -62,7 +62,7 @@
<!-- Portege Laptops -->
<match key="system.hardware.product" prefix="PORTEGE">
- <match key="system.hardware.product" contains="R500">
+ <match key="system.hardware.product" contains_outof="R200;R205;R500">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
More information about the hal-commit
mailing list