hal: Branch 'origin'
David Zeuthen
david at kemper.freedesktop.org
Wed Feb 28 18:57:57 PST 2007
fdi/information/10freedesktop/10-laptop-panel-hardware.fdi | 14 -
fdi/information/10freedesktop/10-sony-bluetooth-switch.fdi | 2
fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi | 32 +-
fdi/information/10freedesktop/20-video-quirk-pm-apple.fdi | 6
fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi | 16 -
fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi | 70 ++---
fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi | 16 -
fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi | 46 +--
fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi | 150 ++++++------
fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi | 14 -
fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi | 38 +--
fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi | 8
fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi | 32 +-
13 files changed, 222 insertions(+), 222 deletions(-)
New commits:
diff-tree 2130ae571cbadb02c223fcd948b989649f33323c (from 25711a267d6c58e64d71d1816a0c753a884489fe)
Author: Richard Hughes <richard at hughsie.com>
Date: Wed Feb 28 23:33:28 2007 +0000
fix the smbios.*.* keys to be a little more sane
Attached are two patches against hal and hal-info that deprecate the
smbios.* keys and replace them with:
smbios.system.manufacturer -> system.hardware.vendor
smbios.system.product -> system.hardware.product
smbios.system.version -> system.hardware.version
smbios.system.serial -> system.hardware.serial
smbios.system.uuid -> system.hardware.uuid
smbios.bios.vendor -> system.firmware.vendor
smbios.bios.version -> system.firmware.version
smbios.bios.release_date -> system.firmware.release_date
smbios.chassis.manufacturer -> system.chassis.manufacturer
smbios.chassis.type -> system.chassis.type
This means stuff like OLPC and N800 doesn't have to use the
smbios.bios.* prefix for system firmware and is therefore more abstract.
This is important to get in before 0.5.9 as hal-info spec can't change
after it's formally released.
The old keys are copied from the new names, so everything should work as
it used to.
diff --git a/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi b/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi
index f5e98b8..8c72bcc 100644
--- a/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi
+++ b/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi
@@ -7,22 +7,22 @@
This is a hardware "feature" seen on some IBM and Lenovo laptops. -->
<device>
<match key="info.category" string="laptop_panel">
- <match key="/org/freedesktop/Hal/devices/computer:smbios.system.manufacturer" string="IBM">
- <match key="/org/freedesktop/Hal/devices/computer:smbios.system.version" contains="ThinkPad">
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" string="IBM">
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.version" contains="ThinkPad">
<merge key="laptop_panel.brightness_in_hardware" type="bool">true</merge>
</match>
</match>
- <match key="/org/freedesktop/Hal/devices/computer:smbios.system.manufacturer" string="LENOVO">
- <match key="/org/freedesktop/Hal/devices/computer:smbios.system.version" string="ThinkPad Z31t">
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" string="LENOVO">
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.version" string="ThinkPad Z31t">
<merge key="laptop_panel.brightness_in_hardware" type="bool">true</merge>
</match>
- <match key="/org/freedesktop/Hal/devices/computer:smbios.system.version" string="ThinkPad T60">
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.version" string="ThinkPad T60">
<merge key="laptop_panel.brightness_in_hardware" type="bool">true</merge>
</match>
- <match key="/org/freedesktop/Hal/devices/computer:smbios.system.version" string="ThinkPad X60">
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.version" string="ThinkPad X60">
<merge key="laptop_panel.brightness_in_hardware" type="bool">true</merge>
</match>
- <match key="/org/freedesktop/Hal/devices/computer:smbios.system.version" string="ThinkPad X60s">
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.version" string="ThinkPad X60s">
<merge key="laptop_panel.brightness_in_hardware" type="bool">true</merge>
</match>
</match>
diff --git a/fdi/information/10freedesktop/10-sony-bluetooth-switch.fdi b/fdi/information/10freedesktop/10-sony-bluetooth-switch.fdi
index 0755fec..e68eb6b 100644
--- a/fdi/information/10freedesktop/10-sony-bluetooth-switch.fdi
+++ b/fdi/information/10freedesktop/10-sony-bluetooth-switch.fdi
@@ -4,7 +4,7 @@
<device>
<match key="system.kernel.name" string="Linux">
- <match key="smbios.system.manufacturer" string="Sony Corporation">
+ <match key="system.hardware.vendor" string="Sony Corporation">
<match key="system.formfactor" string="laptop">
<match key="system.product" contains="VGN-S1XP">
<spawn udi="/org/freedesktop/Hal/devices/sonypic_bluetooth_switch"/>
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi
index 4788db2..1d4b75c 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi
@@ -1,60 +1,60 @@
<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
<deviceinfo version="0.2">
<device>
- <match key="smbios.system.manufacturer" prefix="Acer">
- <match key="smbios.system.product" prefix="TravelMate">
- <match key="smbios.system.product" contains="C300">
+ <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>
</match>
- <match key="smbios.system.product" contains="3220">
+ <match key="system.hardware.product" contains="3220">
<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="smbios.system.product" contains="4650">
+ <match key="system.hardware.product" contains="4650">
<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="smbios.system.product" contains="290">
+ <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>
</match>
- <match key="smbios.system.product" contains="660">
+ <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>
</match>
- <match key="smbios.system.product" contains="650">
+ <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>
</match>
- <match key="smbios.system.product" contains="3000">
+ <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>
</match>
- <match key="smbios.system.product" contains="8100">
+ <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>
</match>
</match>
- <match key="smbios.system.product" prefix="Aspire">
- <match key="smbios.system.product" contains="2000">
+ <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>
</match>
- <match key="smbios.system.product" contains="3000">
+ <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>
</match>
- <match key="smbios.system.product" contains="1690">
+ <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.no_fb" type="bool">true</merge>
</match>
</match>
- <match key="smbios.system.product" string="Extensa 4150">
+ <match key="system.hardware.product" string="Extensa 4150">
<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="smbios.system.product" string="Ferrari 4000">
+ <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.no_fb" type="bool">true</merge>
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-apple.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-apple.fdi
index 34eba52..047cc98 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-apple.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-apple.fdi
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
<deviceinfo version="0.2">
<device>
- <match key="smbios.system.manufacturer" prefix="Apple">
- <match key="smbios.system.product" string="MacBook1,1">
+ <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>
</match>
- <match key="smbios.system.product" string="MacBookPro2,2">
+ <match key="system.hardware.product" string="MacBookPro2,2">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi
index bb06317..0d5b16e 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi
@@ -1,30 +1,30 @@
<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
<deviceinfo version="0.2">
<device>
- <match key="smbios.system.manufacturer" prefix="ASUS">
- <match key="smbios.system.product" string="L2000D">
+ <match key="system.hardware.vendor" prefix="ASUS">
+ <match key="system.hardware.product" string="L2000D">
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
- <match key="smbios.system.product" string="L3000D">
+ <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>
</match>
- <match key="smbios.system.product" string="L7000G">
+ <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>
</match>
- <match key="smbios.system.product" prefix="M6Ne">
+ <match key="system.hardware.product" prefix="M6Ne">
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
- <match key="smbios.system.product" prefix="M6VA">
+ <match key="system.hardware.product" prefix="M6VA">
<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="smbios.system.product" prefix="W5A">
+ <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>
</match>
- <match key="smbios.system.product" string="V6V">
+ <match key="system.hardware.product" string="V6V">
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
</match>
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
index 9e9fc04..3078b28 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
@@ -1,137 +1,137 @@
<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
<deviceinfo version="0.2">
<device>
- <match key="smbios.system.manufacturer" prefix="Dell">
- <match key="smbios.system.product" prefix="Latitude">
- <match key="smbios.system.product" contains="D410">
+ <match key="system.hardware.vendor" prefix="Dell">
+ <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>
</match>
- <match key="smbios.system.product" contains="D610">
+ <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.no_fb" type="bool">true</merge>
</match>
- <match key="smbios.system.product" contains="110L">
+ <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>
</match>
- <match key="smbios.system.product" contains="D510">
+ <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>
</match>
- <match key="smbios.system.product" contains="D810">
+ <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>
</match>
- <match key="smbios.system.product" contains="X1">
+ <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>
</match>
- <match key="smbios.system.product" contains="X300">
+ <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>
</match>
- <match key="smbios.system.product" contains="110L">
+ <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>
</match>
- <match key="smbios.system.product" contains="D410">
+ <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>
</match>
- <match key="smbios.system.product" contains="D510">
+ <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>
</match>
- <match key="smbios.system.product" contains="D810">
+ <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>
</match>
- <match key="smbios.system.product" contains="X300">
+ <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>
</match>
- <match key="smbios.system.product" contains="D800">
+ <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>
</match>
- <match key="smbios.system.product" contains="C600">
+ <match key="system.hardware.product" contains="C600">
<merge key="power_management.quirk.radeon_off" type="bool">true</merge>
</match>
- <match key="smbios.system.product" contains="D600">
+ <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.no_fb" type="bool">true</merge>
</match>
</match>
- <match key="smbios.system.product" prefix="Inspiron">
- <match key="smbios.system.product" contains="700m">
+ <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>
</match>
- <match key="smbios.system.product" contains="1200">
+ <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>
</match>
- <match key="smbios.system.product" contains="6000">
+ <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>
</match>
- <match key="smbios.system.product" contains="8100">
+ <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>
</match>
- <match key="smbios.system.product" contains="8200">
+ <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>
</match>
- <match key="smbios.system.product" contains="8600">
+ <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>
</match>
- <match key="smbios.system.product" contains="9300">
+ <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>
</match>
- <match key="smbios.system.product" contains="700m">
+ <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>
</match>
- <match key="smbios.system.product" contains="1200">
+ <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>
</match>
- <match key="smbios.system.product" contains="6000">
+ <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>
</match>
- <match key="smbios.system.product" contains="8100">
+ <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>
</match>
- <match key="smbios.system.product" contains="8200">
+ <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>
</match>
- <match key="smbios.system.product" contains="8600">
+ <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>
</match>
- <match key="smbios.system.product" contains="9300">
+ <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>
</match>
- <match key="smbios.system.product" contains="5150">
+ <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>
</match>
- <match key="smbios.system.product" contains="8000">
+ <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>
</match>
</match>
- <match key="smbios.system.product" contains="Precision M20">
+ <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>
</match>
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi
index 6427749..9ca232f 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi
@@ -1,33 +1,33 @@
<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
<deviceinfo version="0.2">
<device>
- <match key="smbios.system.manufacturer" prefix="FUJITSU">
- <match key="smbios.system.product" prefix="Amilo M">
+ <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>
</match>
- <match key="smbios.system.product" prefix="Amilo A7640">
+ <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.s3_bios" type="bool">true</merge>
</match>
- <match key="smbios.system.product" string="LifeBook S Series">
+ <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>
</match>
- <match key="smbios.system.product" string="LIFEBOOK S6120">
+ <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>
</match>
- <match key="smbios.system.product" string="LIFEBOOK P7010">
+ <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>
</match>
- <match key="smbios.system.product" string="Stylistic ST5000">
+ <match key="system.hardware.product" string="Stylistic ST5000">
<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="smbios.system.product" string="SCENIC W300/W600">
+ <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>
</match>
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
index 22a0c30..988ec9b 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
@@ -1,86 +1,86 @@
<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
<deviceinfo version="0.2">
<device>
- <match key="smbios.system.manufacturer" string="Hewlett Packard">
- <match key="smbios.system.version" prefix="HP OmniBook XE3 GF">
+ <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>
</match>
</match>
</device>
<device>
- <match key="smbios.system.manufacturer" prefix="Hewlett-Packard">
- <match key="smbios.system.product" contains="nx5000">
- <match key="smbios.bios.version" prefix="68BCU">
+ <match key="system.hardware.vendor" prefix="Hewlett-Packard">
+ <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>
</match>
</match>
- <match key="smbios.system.product" contains="nx5000">
- <match key="smbios.bios.version" prefix="68BCU">
+ <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>
</match>
</match>
- <match key="smbios.system.product" contains="nc6000">
- <match key="smbios.bios.version" prefix="68BDD">
+ <match key="system.hardware.product" contains="nc6000">
+ <match key="system.firmware.version" prefix="68BDD">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
</match>
- <match key="smbios.system.product" contains="nx6125">
+ <match key="system.hardware.product" contains="nx6125">
<merge key="power_management.quirk.vbe_save" type="bool">true</merge>
<merge key="power_management.quirk.no_fb" type="bool">true</merge>
</match>
- <match key="smbios.system.product" contains="nc6230">
+ <match key="system.hardware.product" contains="nc6230">
<merge key="power_management.quirk.vbe_save" type="bool">true</merge>
<merge key="power_management.quirk.no_fb" type="bool">true</merge>
</match>
- <match key="smbios.system.product" contains="nx8220">
+ <match key="system.hardware.product" contains="nx8220">
<merge key="power_management.quirk.vbe_save" type="bool">true</merge>
<merge key="power_management.quirk.no_fb" type="bool">true</merge>
</match>
- <match key="smbios.system.product" contains="nc4200">
+ <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>
</match>
- <match key="smbios.system.product" contains="nx6110">
+ <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>
</match>
- <match key="smbios.system.product" contains="nc6120">
+ <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>
</match>
- <match key="smbios.system.product" contains="nc6220">
+ <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>
</match>
- <match key="smbios.system.product" contains="nc8230">
+ <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>
</match>
- <match key="smbios.system.product" contains="dv1000">
+ <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>
</match>
- <match key="smbios.system.product" contains="zt3000">
+ <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>
</match>
- <match key="smbios.system.product" contains="zd7000">
+ <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>
</match>
- <match key="smbios.system.product" contains="Tx1100">
+ <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>
</match>
- <match key="smbios.system.product" contains="TR1105">
+ <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>
</match>
- <match key="smbios.system.product" contains="R4100">
+ <match key="system.hardware.product" contains="R4100">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
index bfb00e5..c68e494 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
@@ -1,319 +1,319 @@
<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
<deviceinfo version="0.2">
<device>
- <match key="smbios.system.manufacturer" string="IBM">
- <match key="smbios.system.version" string="ThinkPad X32">
+ <match key="system.hardware.vendor" string="IBM">
+ <match key="system.hardware.version" string="ThinkPad X32">
<merge key="power_management.quirk.radeon_off" type="bool">true</merge>
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
<!-- T30 -->
- <match key="smbios.system.product" prefix="1860">
+ <match key="system.hardware.product" prefix="1860">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
<!-- X31 -->
- <match key="smbios.system.product" prefix="2366">
+ <match key="system.hardware.product" prefix="2366">
<merge key="power_management.quirk.radeon_off" type="bool">true</merge>
</match>
<!-- X40 -->
- <match key="smbios.system.product" prefix="2672">
+ <match key="system.hardware.product" prefix="2672">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
<merge key="power_management.quirk.radeon_off" type="bool">true</merge>
</match>
<!-- T42p -->
- <match key="smbios.system.product" prefix="2371">
- <match key="smbios.system.version" string="ThinkPad X40">
+ <match key="system.hardware.product" prefix="2371">
+ <match key="system.hardware.version" string="ThinkPad X40">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
</match>
<!-- T41p -->
- <match key="smbios.system.product" prefix="2373">
+ <match key="system.hardware.product" prefix="2373">
<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="smbios.system.product" prefix="2374">
+ <match key="system.hardware.product" prefix="2374">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
<!-- G40 -->
- <match key="smbios.system.product" prefix="2668">
- <match key="smbios.system.version" string="ThinkPad T43">
+ <match key="system.hardware.product" prefix="2668">
+ <match key="system.hardware.version" string="ThinkPad T43">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
</match>
- <match key="smbios.system.product" prefix="2388">
+ <match key="system.hardware.product" prefix="2388">
<merge key="power_management.quirk.vbe_save" type="bool">true</merge>
</match>
<!-- Z60m -->
- <match key="smbios.system.product" prefix="2529">
+ <match key="system.hardware.product" prefix="2529">
<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="smbios.system.product" prefix="2682">
+ <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>
</match>
- <match key="smbios.system.product" prefix="2683">
+ <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>
</match>
- <match key="smbios.system.product" prefix="2692">
+ <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>
</match>
- <match key="smbios.system.product" prefix="2693">
+ <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>
</match>
- <match key="smbios.system.product" prefix="2696">
+ <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>
</match>
- <match key="smbios.system.product" prefix="2698">
+ <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>
</match>
- <match key="smbios.system.product" prefix="2699">
+ <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>
</match>
- <match key="smbios.system.product" prefix="2723">
+ <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>
</match>
- <match key="smbios.system.product" prefix="2724">
+ <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>
</match>
<!-- R50/p -->
- <match key="smbios.system.product" prefix="2897">
+ <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>
</match>
- <match key="smbios.system.product" prefix="1829">
+ <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>
</match>
- <match key="smbios.system.product" prefix="1830">
+ <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>
</match>
- <match key="smbios.system.product" prefix="1831">
+ <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>
</match>
- <match key="smbios.system.product" prefix="1832">
+ <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>
</match>
- <match key="smbios.system.product" prefix="1833">
+ <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>
</match>
- <match key="smbios.system.product" prefix="1836">
+ <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>
</match>
- <match key="smbios.system.product" prefix="1840">
+ <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>
</match>
<!-- R50e needs not yet implemented save_video_pci_state -->
- <match key="smbios.system.product" prefix="1841">
+ <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>
</match>
- <match key="smbios.system.product" prefix="1846">
+ <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>
</match>
- <match key="smbios.system.product" prefix="1847">
+ <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>
</match>
- <match key="smbios.system.product" prefix="1848">
+ <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>
</match>
- <match key="smbios.system.product" prefix="1849">
+ <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>
</match>
- <match key="smbios.system.product" prefix="1850">
+ <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>
</match>
<!-- T21 -->
- <match key="smbios.system.product" prefix="1870">
+ <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>
</match>
- <match key="smbios.system.product" prefix="2647">
+ <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>
</match>
<!-- T23 -->
- <match key="smbios.system.product" prefix="2648">
+ <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>
</match>
<!-- T40/T41/T42/p -->
- <match key="smbios.system.product" prefix="475S">
+ <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>
</match>
- <match key="smbios.system.product" prefix="2375">
+ <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>
</match>
- <match key="smbios.system.product" prefix="2376">
+ <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>
</match>
- <match key="smbios.system.product" prefix="2378">
+ <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>
</match>
<!-- T43 -->
- <match key="smbios.system.product" prefix="2379">
+ <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>
</match>
- <match key="smbios.system.product" prefix="1871">
+ <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>
</match>
- <match key="smbios.system.product" prefix="1872">
+ <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>
</match>
- <match key="smbios.system.product" prefix="1873">
+ <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>
</match>
- <match key="smbios.system.product" prefix="1874">
+ <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>
</match>
- <match key="smbios.system.product" prefix="1875">
+ <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>
</match>
<!-- T43/p -->
- <match key="smbios.system.product" prefix="1876">
+ <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>
</match>
- <match key="smbios.system.product" prefix="2668">
+ <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>
</match>
- <match key="smbios.system.product" prefix="2669">
+ <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>
</match>
- <match key="smbios.system.product" prefix="2678">
+ <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>
</match>
- <match key="smbios.system.product" prefix="2679">
+ <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>
</match>
- <match key="smbios.system.product" prefix="2686">
+ <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>
</match>
<!-- X30 -->
- <match key="smbios.system.product" prefix="2687">
+ <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>
</match>
- <match key="smbios.system.product" prefix="2673">
+ <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.radeon_off" type="bool">true</merge>
</match>
- <match key="smbios.system.product" prefix="2884">
+ <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.radeon_off" type="bool">true</merge>
</match>
- <match key="smbios.system.product" prefix="2885">
+ <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.radeon_off" type="bool">true</merge>
</match>
- <match key="smbios.system.product" prefix="2890">
+ <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.radeon_off" type="bool">true</merge>
</match>
<!-- X40 -->
- <match key="smbios.system.product" prefix="2891">
+ <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.radeon_off" type="bool">true</merge>
</match>
- <match key="smbios.system.product" prefix="2369">
+ <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>
</match>
- <match key="smbios.system.product" prefix="2370">
+ <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>
</match>
- <match key="smbios.system.product" prefix="2372">
+ <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>
</match>
- <match key="smbios.system.product" prefix="2382">
+ <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>
</match>
<!-- X41 -->
- <match key="smbios.system.product" prefix="2386">
+ <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>
</match>
- <match key="smbios.system.product" prefix="1864">
+ <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>
</match>
- <match key="smbios.system.product" prefix="1865">
+ <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>
</match>
- <match key="smbios.system.product" prefix="2525">
+ <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>
</match>
- <match key="smbios.system.product" prefix="2526">
+ <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>
</match>
- <match key="smbios.system.product" prefix="2527">
+ <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>
</match>
<!-- X41 Tablet -->
- <match key="smbios.system.product" prefix="2528">
+ <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>
</match>
- <match key="smbios.system.product" prefix="1866">
+ <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>
</match>
- <match key="smbios.system.product" prefix="1867">
+ <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>
</match>
- <match key="smbios.system.product" prefix="1869">
+ <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>
</match>
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
index 208f44e..180b698 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
@@ -1,30 +1,30 @@
<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
<deviceinfo version="0.2">
<device>
- <match key="smbios.system.manufacturer" string="LENOVO">
+ <match key="system.hardware.vendor" string="LENOVO">
<!-- X60 / X60s -->
- <match key="smbios.system.product" prefix="1702">
+ <match key="system.hardware.product" prefix="1702">
<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="smbios.system.product" prefix="1704">
+ <match key="system.hardware.product" prefix="1704">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
<!-- T60p -->
- <match key="smbios.system.product" prefix="1706">
+ <match key="system.hardware.product" prefix="1706">
<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="smbios.system.version" prefix_ncase="ThinkPad R60">
+ <match key="system.hardware.version" prefix_ncase="ThinkPad R60">
<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="smbios.system.version" string="ThinkPad T60">
+ <match key="system.hardware.version" string="ThinkPad 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="smbios.system.version" string="ThinkPad T60p">
+ <match key="system.hardware.version" string="ThinkPad T60p">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
index 54f3587..993746e 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
@@ -1,40 +1,40 @@
<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
<deviceinfo version="0.2">
<device>
- <match key="smbios.system.manufacturer" contains="ERGOUK">
- <match key="smbios.system.product" contains="M2N">
+ <match key="system.hardware.vendor" contains="ERGOUK">
+ <match key="system.hardware.product" contains="M2N">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
</match>
</device>
<device>
- <match key="smbios.system.manufacturer" string="Compaq">
- <match key="smbios.system.product" contains="N620c ">
+ <match key="system.hardware.vendor" string="Compaq">
+ <match key="system.hardware.product" contains="N620c ">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
</match>
</device>
<device>
- <match key="smbios.system.manufacturer" prefix="LG">
- <match key="smbios.system.product" string="M1-3DGBG">
+ <match key="system.hardware.vendor" prefix="LG">
+ <match key="system.hardware.product" string="M1-3DGBG">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
</match>
</device>
<device>
- <match key="smbios.system.manufacturer" contains="Matsushita">
- <match key="smbios.system.product" contains="CF-51E">
+ <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>
</match>
</match>
</device>
<device>
- <match key="smbios.system.manufacturer" string="Samsung">
- <match key="smbios.system.product" string="SQ10">
+ <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>
</match>
@@ -42,35 +42,35 @@
</device>
<!-- VIA EPIA M Mini-ITX Motherboard with onboard gfx -->
<device>
- <match key="smbios.system.manufacturer" prefix="VIA">
- <match key="smbios.system.product" string="VT8623-8235">
+ <match key="system.hardware.vendor" prefix="VIA">
+ <match key="system.hardware.product" string="VT8623-8235">
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
</match>
</device>
<device>
- <match key="smbios.system.manufacturer" string="ECS">
- <match key="smbios.system.product" contains="G556 Centrino">
+ <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>
</match>
</match>
</device>
<device>
- <match key="smbios.system.manufacturer" prefix="Samsung">
- <match key="smbios.system.product" contains="NX05S">
+ <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>
</match>
- <match key="smbios.system.product" string="SX20S">
+ <match key="system.hardware.product" string="SX20S">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
</match>
</device>
<device>
- <match key="smbios.system.manufacturer" prefix="SHARP">
- <match key="smbios.system.product" contains="PC-MM20 Series">
+ <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>
</match>
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi
index a361a92..2da3286 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
<deviceinfo version="0.2">
<device>
- <match key="smbios.system.manufacturer" string="Sony Corporation">
- <match key="smbios.system.product" string="VGN-FS115B">
+ <match key="system.hardware.vendor" string="Sony Corporation">
+ <match key="system.hardware.product" string="VGN-FS115B">
<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="smbios.system.product" string="VGN-FS115Z">
+ <match key="system.hardware.product" string="VGN-FS115Z">
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
- <match key="smbios.system.product" prefix="PCG-U101">
+ <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>
</match>
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi
index bdc0d13..7c43986 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi
@@ -1,59 +1,59 @@
<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
<deviceinfo version="0.2">
<device>
- <match key="smbios.system.manufacturer" string="TOSHIBA">
+ <match key="system.hardware.vendor" string="TOSHIBA">
<!-- Toshiba Satellite 4080XCDT -->
- <match key="smbios.system.product" string="Portable PC">
- <match key="smbios.system.version" string="Version 1.0">
- <match key="smbios.bios.version" string="Version 7.80">
+ <match key="system.hardware.product" string="Portable PC">
+ <match key="system.hardware.version" string="Version 1.0">
+ <match key="system.firmware.version" string="Version 7.80">
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
</match>
</match>
- <match key="smbios.system.product" string="Satellite A30">
+ <match key="system.hardware.product" string="Satellite A30">
<merge key="power_management.quirk.vbe_save" type="bool">true</merge>
</match>
- <match key="smbios.system.product" string="Satellite L10">
+ <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>
</match>
- <match key="smbios.system.product" prefix="Satellite 1900">
+ <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>
</match>
- <match key="smbios.system.product" prefix="libretto U100">
+ <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>
</match>
- <match key="smbios.system.product" prefix="P4000">
+ <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>
</match>
- <match key="smbios.system.product" prefix="PORTEGE A100">
+ <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>
</match>
- <match key="smbios.system.product" prefix="PORTEGE A200">
+ <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>
</match>
- <match key="smbios.system.product" prefix="PORTEGE M200">
+ <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>
</match>
- <match key="smbios.system.product" prefix="PORTEGE R200">
+ <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>
</match>
- <match key="smbios.system.product" prefix="TECRA A2">
+ <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>
</match>
- <match key="smbios.system.product" prefix="TECRA A5">
+ <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>
</match>
- <match key="smbios.system.product" prefix="TECRA M2">
+ <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>
</match>
More information about the hal-commit
mailing list