hal: Branch 'origin' - 5 commits
David Zeuthen
david at kemper.freedesktop.org
Tue Mar 13 14:44:14 PDT 2007
fdi/information/10freedesktop/10-recall-battery-lenovo.fdi | 20 +
fdi/information/10freedesktop/10-usb-music-players.fdi | 8
fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi | 20 -
fdi/information/10freedesktop/20-video-quirk-pm-apple.fdi | 2
fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi | 6
fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi | 62 ++---
fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi | 12 -
fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi | 32 +--
fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi | 126 ++++++------
fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi | 10
fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi | 2
fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi | 24 +-
fdi/information/10freedesktop/Makefile.am | 1
13 files changed, 177 insertions(+), 148 deletions(-)
New commits:
diff-tree 98b34973933fc6db1735ae94053ed369826226f7 (from a949ee5340b3037d1e480718ff3336c8b439930b)
Author: Elias Probst <elias.probst at gmx.de>
Date: Wed Mar 7 15:21:15 2007 +0100
added iRiver T20 to USB musicplayers
Added iRiver T20 to USB musicplayers list.
diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 9b94bb5..338702a 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -673,6 +673,14 @@
<!-- iRiver -->
<match key="@storage.originating_device:usb.vendor_id" int="0x4102">
+ <!-- T20 UMS -->
+ <match key="@storage.originating_device:usb.product_id" int="0x1014">
+ <merge key="portable_audio_player.type" type="string">generic</merge>
+ <merge key="portable_audio_player.access_method" type="string">storage</merge>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
+ <append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
+ <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
+ </match>
<!-- T30 UMS -->
<match key="@storage.originating_device:usb.product_id" int="0x1018">
<merge key="portable_audio_player.type" type="string">generic</merge>
diff-tree a949ee5340b3037d1e480718ff3336c8b439930b (from b932b43fd0cf7fcc56523bf8801ddc42bdb66af1)
Author: Richard Hughes <richard at hughsie.com>
Date: Tue Mar 6 17:57:51 2007 +0000
fix up vbestate_restore for display resuming
We were using the old names in hal-info, which got changed
on the HAL list after review. The spec uses the new names,
as does the hal-spec so we should switch hal-info to use them.
Patch from Frederic Crozat <fcrozat at mandriva.com>
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi
index 1d4b75c..5c225f6 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi
@@ -4,7 +4,7 @@
<match key="system.hardware.vendor" prefix="Acer">
<match key="system.hardware.product" prefix="TravelMate">
<match key="system.hardware.product" contains="C300">
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" contains="3220">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
@@ -16,37 +16,37 @@
</match>
<match key="system.hardware.product" contains="290">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" contains="660">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" contains="650">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" contains="3000">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" contains="8100">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
</match>
<match key="system.hardware.product" prefix="Aspire">
<match key="system.hardware.product" contains="2000">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" contains="3000">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" contains="1690">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
<merge key="power_management.quirk.no_fb" type="bool">true</merge>
</match>
</match>
@@ -56,7 +56,7 @@
</match>
<match key="system.hardware.product" string="Ferrari 4000">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
<merge key="power_management.quirk.no_fb" type="bool">true</merge>
</match>
</match>
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-apple.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-apple.fdi
index 047cc98..4fc3036 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-apple.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-apple.fdi
@@ -3,7 +3,7 @@
<device>
<match key="system.hardware.vendor" prefix="Apple">
<match key="system.hardware.product" string="MacBook1,1">
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" string="MacBookPro2,2">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi
index 0d5b16e..881a7df 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi
@@ -7,11 +7,11 @@
</match>
<match key="system.hardware.product" string="L3000D">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" string="L7000G">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" prefix="M6Ne">
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
@@ -22,7 +22,7 @@
</match>
<match key="system.hardware.product" prefix="W5A">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" string="V6V">
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
index 3078b28..f6e3641 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
@@ -5,135 +5,135 @@
<match key="system.hardware.product" prefix="Latitude">
<match key="system.hardware.product" contains="D410">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" contains="D610">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <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="110L">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" contains="D510">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" contains="D810">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" contains="X1">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" contains="X300">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" contains="110L">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" 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.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" contains="D510">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" contains="D810">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" contains="X300">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" contains="D800">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" contains="C600">
<merge key="power_management.quirk.radeon_off" type="bool">true</merge>
</match>
<match key="system.hardware.product" contains="D600">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
<merge key="power_management.quirk.no_fb" type="bool">true</merge>
</match>
</match>
<match key="system.hardware.product" prefix="Inspiron">
<match key="system.hardware.product" contains="700m">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" contains="1200">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" contains="6000">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" contains="8100">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" contains="8200">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" contains="8600">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" contains="9300">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" contains="700m">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" contains="1200">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" contains="6000">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" contains="8100">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" contains="8200">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" contains="8600">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" contains="9300">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" contains="5150">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" contains="8000">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
</match>
<match key="system.hardware.product" contains="Precision M20">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
</match>
</device>
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi
index 9ca232f..c2ee4a3 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi
@@ -4,24 +4,24 @@
<match key="system.hardware.vendor" prefix="FUJITSU">
<match key="system.hardware.product" prefix="Amilo M">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" prefix="Amilo A7640">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
</match>
<match key="system.hardware.product" string="LifeBook S Series">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" string="LIFEBOOK S6120">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" string="LIFEBOOK P7010">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" string="Stylistic ST5000">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
@@ -29,7 +29,7 @@
</match>
<match key="system.hardware.product" string="SCENIC W300/W600">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
</match>
</device>
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
index 988ec9b..8679d18 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
@@ -4,7 +4,7 @@
<match key="system.hardware.vendor" string="Hewlett Packard">
<match key="system.hardware.version" prefix="HP OmniBook XE3 GF">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
</match>
</device>
@@ -13,13 +13,13 @@
<match key="system.hardware.product" contains="nx5000">
<match key="system.firmware.version" prefix="68BCU">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
</match>
<match key="system.hardware.product" contains="nx5000">
<match key="system.firmware.version" prefix="68BCU">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
</match>
<match key="system.hardware.product" contains="nc6000">
@@ -29,56 +29,56 @@
</match>
</match>
<match key="system.hardware.product" contains="nx6125">
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <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="nc6230">
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <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="nx8220">
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <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="nc4200">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" contains="nx6110">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_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.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" contains="nc6220">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" contains="nc8230">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" contains="dv1000">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" contains="zt3000">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" contains="zd7000">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" contains="Tx1100">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" contains="TR1105">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" contains="R4100">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
index c68e494..7add3af 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
@@ -46,7 +46,7 @@
</match>
</match>
<match key="system.hardware.product" prefix="2388">
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<!-- Z60m -->
<match key="system.hardware.product" prefix="2529">
@@ -55,267 +55,267 @@
</match>
<match key="system.hardware.product" prefix="2682">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" prefix="2683">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" prefix="2692">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" prefix="2693">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" prefix="2696">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" prefix="2698">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" prefix="2699">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" prefix="2723">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" prefix="2724">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<!-- R50/p -->
<match key="system.hardware.product" prefix="2897">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" prefix="1829">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" prefix="1830">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" prefix="1831">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" prefix="1832">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" prefix="1833">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" prefix="1836">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" prefix="1840">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<!-- R50e needs not yet implemented save_video_pci_state -->
<match key="system.hardware.product" prefix="1841">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" prefix="1846">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" prefix="1847">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" prefix="1848">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" prefix="1849">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" prefix="1850">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<!-- T21 -->
<match key="system.hardware.product" prefix="1870">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" prefix="2647">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<!-- T23 -->
<match key="system.hardware.product" prefix="2648">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<!-- T40/T41/T42/p -->
<match key="system.hardware.product" prefix="475S">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" prefix="2375">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" prefix="2376">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" prefix="2378">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<!-- T43 -->
<match key="system.hardware.product" prefix="2379">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" prefix="1871">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" prefix="1872">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" prefix="1873">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" prefix="1874">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" prefix="1875">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<!-- T43/p -->
<match key="system.hardware.product" prefix="1876">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" prefix="2668">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" prefix="2669">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" prefix="2678">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" prefix="2679">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" prefix="2686">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<!-- X30 -->
<match key="system.hardware.product" prefix="2687">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" prefix="2673">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
<merge key="power_management.quirk.radeon_off" type="bool">true</merge>
</match>
<match key="system.hardware.product" prefix="2884">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
<merge key="power_management.quirk.radeon_off" type="bool">true</merge>
</match>
<match key="system.hardware.product" prefix="2885">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
<merge key="power_management.quirk.radeon_off" type="bool">true</merge>
</match>
<match key="system.hardware.product" prefix="2890">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
<merge key="power_management.quirk.radeon_off" type="bool">true</merge>
</match>
<!-- X40 -->
<match key="system.hardware.product" prefix="2891">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
<merge key="power_management.quirk.radeon_off" type="bool">true</merge>
</match>
<match key="system.hardware.product" prefix="2369">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" prefix="2370">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" prefix="2372">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" prefix="2382">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<!-- X41 -->
<match key="system.hardware.product" prefix="2386">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" prefix="1864">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" prefix="1865">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" prefix="2525">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" prefix="2526">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" prefix="2527">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<!-- X41 Tablet -->
<match key="system.hardware.product" prefix="2528">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" prefix="1866">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" prefix="1867">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" prefix="1869">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
</match>
</device>
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
index 993746e..d10081b 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
@@ -28,7 +28,7 @@
<match key="system.hardware.vendor" contains="Matsushita">
<match key="system.hardware.product" contains="CF-51E">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
</match>
</device>
@@ -36,7 +36,7 @@
<match key="system.hardware.vendor" string="Samsung">
<match key="system.hardware.product" string="SQ10">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
</match>
</device>
@@ -52,7 +52,7 @@
<match key="system.hardware.vendor" string="ECS">
<match key="system.hardware.product" contains="G556 Centrino">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
</match>
</device>
@@ -60,7 +60,7 @@
<match key="system.hardware.vendor" prefix="Samsung">
<match key="system.hardware.product" contains="NX05S">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" string="SX20S">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
@@ -72,7 +72,7 @@
<match key="system.hardware.vendor" prefix="SHARP">
<match key="system.hardware.product" contains="PC-MM20 Series">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
</match>
</device>
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi
index 2da3286..663a7c0 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi
@@ -11,7 +11,7 @@
</match>
<match key="system.hardware.product" prefix="PCG-U101">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
</match>
</device>
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi
index 7c43986..85abf89 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi
@@ -11,51 +11,51 @@
</match>
</match>
<match key="system.hardware.product" string="Satellite A30">
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" string="Satellite L10">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" prefix="Satellite 1900">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" prefix="libretto U100">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" prefix="P4000">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" prefix="PORTEGE A100">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" prefix="PORTEGE A200">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" prefix="PORTEGE M200">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" prefix="PORTEGE R200">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" prefix="TECRA A2">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" prefix="TECRA A5">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" prefix="TECRA M2">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_save" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
</match>
</device>
diff-tree b932b43fd0cf7fcc56523bf8801ddc42bdb66af1 (from parents)
Merge: ea0289241e74d9216134e984001d1e4b2065c651 aee9db6892551a86c1da0f31ba2a1c776dd8419a
Author: Richard Hughes <richard at hughsie.com>
Date: Mon Mar 5 20:33:01 2007 +0000
Merge branch 'master' of git+ssh://hughsient@git.freedesktop.org/git/hal-info
diff-tree ea0289241e74d9216134e984001d1e4b2065c651 (from parents)
Merge: aaba08582dad15bb0325b9a596655586c93e8be0 302840ec67441f55ba07cae9991538e6c91f7fdc
Author: Richard Hughes <richard at hughsie.com>
Date: Sun Mar 4 15:43:23 2007 +0000
Merge branch 'master' of git+ssh://hughsient@git.freedesktop.org/git/hal-info
diff-tree aaba08582dad15bb0325b9a596655586c93e8be0 (from 2130ae571cbadb02c223fcd948b989649f33323c)
Author: Richard Hughes <richard at hughsie.com>
Date: Thu Mar 1 23:35:46 2007 +0000
add lenovo battery recall data
Today Lenovo recalled 208,000 batteries. Add them to hal-info so we can try to
find at least a few.
Many thanks to Steven Garrity for the quick response for data.
diff --git a/fdi/information/10freedesktop/10-recall-battery-lenovo.fdi b/fdi/information/10freedesktop/10-recall-battery-lenovo.fdi
new file mode 100644
index 0000000..3ec948f
--- /dev/null
+++ b/fdi/information/10freedesktop/10-recall-battery-lenovo.fdi
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<deviceinfo version="0.2">
+ <device>
+
+ <match key="battery.vendor" string="SANYO">
+
+ <match key="battery.model" string="92P1131">
+ <merge key="info.is_recalled" type="bool">true</merge>
+ </match>
+
+ <!-- only matching on specific model and vendor SANYO -->
+ <match key="info.is_recalled" bool="true">
+ <merge key="info.recall.vendor" type="string">LENOVO</merge>
+ <merge key="info.recall.website_url" type="string">http://www.lenovo.com/batteryprogram</merge>
+ </match>
+
+ </match>
+
+ </device>
+</deviceinfo>
diff --git a/fdi/information/10freedesktop/Makefile.am b/fdi/information/10freedesktop/Makefile.am
index 8fac4ca..833f768 100644
--- a/fdi/information/10freedesktop/Makefile.am
+++ b/fdi/information/10freedesktop/Makefile.am
@@ -14,6 +14,7 @@ if BUILD_RECALL
dist_fdi_DATA += \
10-recall-battery-dell.fdi \
10-recall-battery-ibm.fdi \
+ 10-recall-battery-lenovo.fdi \
10-recall-battery-fujitsu.fdi \
10-recall-battery-gateway.fdi \
10-recall-battery-toshiba.fdi
More information about the hal-commit
mailing list