hal: Branch 'master'
Danny Kukawka
dkukawka at kemper.freedesktop.org
Wed Aug 29 05:55:48 PDT 2007
fdi/information/10freedesktop/10-recall-battery-dell.fdi | 113 ------------
fdi/information/10freedesktop/10-recall-battery-fujitsu.fdi | 23 --
fdi/information/10freedesktop/10-recall-battery-gateway.fdi | 14 -
fdi/information/10freedesktop/10-recall-battery-ibm.fdi | 35 ---
fdi/information/10freedesktop/10-recall-battery-toshiba.fdi | 17 -
5 files changed, 5 insertions(+), 197 deletions(-)
New commits:
diff-tree ac078c9dff93cd86b7d263c6bc73104ca1a00ef2 (from 151368d14d8bf8e166dbfbfd8d74f469dada9935)
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Wed Aug 29 14:55:15 2007 +0200
consolidate 10-recall-battery-* fdi files
Used new contains_outof fdi match directive to reduce the number of matches
and the size of the files (from 12307 to 4177 Bytes --> ~ -64 %).
diff --git a/fdi/information/10freedesktop/10-recall-battery-dell.fdi b/fdi/information/10freedesktop/10-recall-battery-dell.fdi
index d470c55..f17d3a8 100644
--- a/fdi/information/10freedesktop/10-recall-battery-dell.fdi
+++ b/fdi/information/10freedesktop/10-recall-battery-dell.fdi
@@ -5,118 +5,7 @@
<match key="battery.model" contains="DELL">
<match key="battery.vendor" string="Sony">
- <match key="battery.model" contains="1K055">
- <merge key="info.is_recalled" type="bool">true</merge>
- </match>
- <match key="battery.model" contains="C5446">
- <merge key="info.is_recalled" type="bool">true</merge>
- </match>
- <match key="battery.model" contains="F2100">
- <merge key="info.is_recalled" type="bool">true</merge>
- </match>
- <match key="battery.model" contains="KD494">
- <merge key="info.is_recalled" type="bool">true</merge>
- </match>
- <match key="battery.model" contains="W5915">
- <merge key="info.is_recalled" type="bool">true</merge>
- </match>
- <match key="battery.model" contains="Y1333">
- <merge key="info.is_recalled" type="bool">true</merge>
- </match>
- <match key="battery.model" contains="3K590">
- <merge key="info.is_recalled" type="bool">true</merge>
- </match>
- <match key="battery.model" contains="C6269">
- <merge key="info.is_recalled" type="bool">true</merge>
- </match>
- <match key="battery.model" contains="F5132">
- <merge key="info.is_recalled" type="bool">true</merge>
- </match>
- <match key="battery.model" contains="OR331">
- <merge key="info.is_recalled" type="bool">true</merge>
- </match>
- <match key="battery.model" contains="X5308">
- <merge key="info.is_recalled" type="bool">true</merge>
- </match>
- <match key="battery.model" contains="Y4500">
- <merge key="info.is_recalled" type="bool">true</merge>
- </match>
- <match key="battery.model" contains="5P474">
- <merge key="info.is_recalled" type="bool">true</merge>
- </match>
- <match key="battery.model" contains="C6270">
- <merge key="info.is_recalled" type="bool">true</merge>
- </match>
- <match key="battery.model" contains="GD785">
- <merge key="info.is_recalled" type="bool">true</merge>
- </match>
- <match key="battery.model" contains="M3006">
- <merge key="info.is_recalled" type="bool">true</merge>
- </match>
- <match key="battery.model" contains="X5329">
- <merge key="info.is_recalled" type="bool">true</merge>
- </match>
- <match key="battery.model" contains="Y5466">
- <merge key="info.is_recalled" type="bool">true</merge>
- </match>
- <match key="battery.model" contains="6P922">
- <merge key="info.is_recalled" type="bool">true</merge>
- </match>
- <match key="battery.model" contains="D2961">
- <merge key="info.is_recalled" type="bool">true</merge>
- </match>
- <match key="battery.model" contains="H3191">
- <merge key="info.is_recalled" type="bool">true</merge>
- </match>
- <match key="battery.model" contains="RD857">
- <merge key="info.is_recalled" type="bool">true</merge>
- </match>
- <match key="battery.model" contains="X5332">
- <merge key="info.is_recalled" type="bool">true</merge>
- </match>
- <match key="battery.model" contains="C2603">
- <merge key="info.is_recalled" type="bool">true</merge>
- </match>
- <match key="battery.model" contains="D5555">
- <merge key="info.is_recalled" type="bool">true</merge>
- </match>
- <match key="battery.model" contains="J1524">
- <merge key="info.is_recalled" type="bool">true</merge>
- </match>
- <match key="battery.model" contains="TD349">
- <merge key="info.is_recalled" type="bool">true</merge>
- </match>
- <match key="battery.model" contains="X5333">
- <merge key="info.is_recalled" type="bool">true</merge>
- </match>
- <match key="battery.model" contains="C5339">
- <merge key="info.is_recalled" type="bool">true</merge>
- </match>
- <match key="battery.model" contains="D6024">
- <merge key="info.is_recalled" type="bool">true</merge>
- </match>
- <match key="battery.model" contains="JD616">
- <merge key="info.is_recalled" type="bool">true</merge>
- </match>
- <match key="battery.model" contains="U5867">
- <merge key="info.is_recalled" type="bool">true</merge>
- </match>
- <match key="battery.model" contains="X5875">
- <merge key="info.is_recalled" type="bool">true</merge>
- </match>
- <match key="battery.model" contains="C5340">
- <merge key="info.is_recalled" type="bool">true</merge>
- </match>
- <match key="battery.model" contains="D6025">
- <merge key="info.is_recalled" type="bool">true</merge>
- </match>
- <match key="battery.model" contains="JD617">
- <merge key="info.is_recalled" type="bool">true</merge>
- </match>
- <match key="battery.model" contains="U5882">
- <merge key="info.is_recalled" type="bool">true</merge>
- </match>
- <match key="battery.model" contains="X5877">
+ <match key="battery.model" contains_outof="1K055;C5446;F2100;KD494;W5915;Y1333;3K590;C6269;F5132;OR331;X5308;Y4500;5P474;C6270;GD785;M3006;X5329;Y5466;6P922;D2961;H3191;RD857;X5332;C2603;D5555;J1524;TD349;X5333;C5339;D6024;JD616;U5867;X5875;C5340;D6025;JD617;U5882;X5877">
<merge key="info.is_recalled" type="bool">true</merge>
</match>
diff --git a/fdi/information/10freedesktop/10-recall-battery-fujitsu.fdi b/fdi/information/10freedesktop/10-recall-battery-fujitsu.fdi
index 9d2b0dd..c427ec4 100644
--- a/fdi/information/10freedesktop/10-recall-battery-fujitsu.fdi
+++ b/fdi/information/10freedesktop/10-recall-battery-fujitsu.fdi
@@ -4,28 +4,7 @@
<match key="battery.vendor" string="Fujitsu">
- <match key="battery.model" contains="CP255100">
- <merge key="info.is_recalled" type="bool">true</merge>
- </match>
- <match key="battery.model" contains="CP255108">
- <merge key="info.is_recalled" type="bool">true</merge>
- </match>
- <match key="battery.model" contains="CP229720">
- <merge key="info.is_recalled" type="bool">true</merge>
- </match>
- <match key="battery.model" contains="CP229725">
- <merge key="info.is_recalled" type="bool">true</merge>
- </match>
- <match key="battery.model" contains="CP234003">
- <merge key="info.is_recalled" type="bool">true</merge>
- </match>
- <match key="battery.model" contains="CP234019">
- <merge key="info.is_recalled" type="bool">true</merge>
- </match>
- <match key="battery.model" contains="CP283030">
- <merge key="info.is_recalled" type="bool">true</merge>
- </match>
- <match key="battery.model" contains="CP267910">
+ <match key="battery.model" contains_outof="CP255100;CP255108;CP229720;CP229725;CP234003;CP234019;CP283030;CP267910">
<merge key="info.is_recalled" type="bool">true</merge>
</match>
diff --git a/fdi/information/10freedesktop/10-recall-battery-gateway.fdi b/fdi/information/10freedesktop/10-recall-battery-gateway.fdi
index 7c35bfe..d20c518 100644
--- a/fdi/information/10freedesktop/10-recall-battery-gateway.fdi
+++ b/fdi/information/10freedesktop/10-recall-battery-gateway.fdi
@@ -4,19 +4,7 @@
<match key="battery.vendor" string="Gateway">
- <match key="battery.model" contains="916C4610F">
- <merge key="info.is_recalled" type="bool">true</merge>
- </match>
- <match key="battery.model" contains="916C4720F">
- <merge key="info.is_recalled" type="bool">true</merge>
- </match>
- <match key="battery.model" contains="916C4730F">
- <merge key="info.is_recalled" type="bool">true</merge>
- </match>
- <match key="battery.model" contains="916C5010F">
- <merge key="info.is_recalled" type="bool">true</merge>
- </match>
- <match key="battery.model" contains="W230">
+ <match key="battery.model" contains_outof="916C4610F;916C4720F;916C4730F;916C5010F;W230">
<merge key="info.is_recalled" type="bool">true</merge>
</match>
diff --git a/fdi/information/10freedesktop/10-recall-battery-ibm.fdi b/fdi/information/10freedesktop/10-recall-battery-ibm.fdi
index 57eeebd..f7032fa 100644
--- a/fdi/information/10freedesktop/10-recall-battery-ibm.fdi
+++ b/fdi/information/10freedesktop/10-recall-battery-ibm.fdi
@@ -5,40 +5,7 @@
<match key="battery.model" contains="IBM">
<match key="battery.vendor" string="SONY">
- <match key="battery.model" contains="92P1072">
- <merge key="info.is_recalled" type="bool">true</merge>
- </match>
- <match key="battery.model" contains="92P1073">
- <merge key="info.is_recalled" type="bool">true</merge>
- </match>
- <match key="battery.model" contains="92P1088">
- <merge key="info.is_recalled" type="bool">true</merge>
- </match>
- <match key="battery.model" contains="92P1089">
- <merge key="info.is_recalled" type="bool">true</merge>
- </match>
- <match key="battery.model" contains="92P1142">
- <merge key="info.is_recalled" type="bool">true</merge>
- </match>
- <match key="battery.model" contains="92P1141">
- <merge key="info.is_recalled" type="bool">true</merge>
- </match>
- <match key="battery.model" contains="92P1170">
- <merge key="info.is_recalled" type="bool">true</merge>
- </match>
- <match key="battery.model" contains="92P1169">
- <merge key="info.is_recalled" type="bool">true</merge>
- </match>
- <match key="battery.model" contains="93P5028">
- <merge key="info.is_recalled" type="bool">true</merge>
- </match>
- <match key="battery.model" contains="92P1174">
- <merge key="info.is_recalled" type="bool">true</merge>
- </match>
- <match key="battery.model" contains="92P1173">
- <merge key="info.is_recalled" type="bool">true</merge>
- </match>
- <match key="battery.model" contains="93P5030">
+ <match key="battery.model" contains_outof="92P1072;92P1073;92P1088;92P1089;92P1142;92P1141;92P1170;92P1169;93P5028;92P1174;92P1173;93P5030">
<merge key="info.is_recalled" type="bool">true</merge>
</match>
diff --git a/fdi/information/10freedesktop/10-recall-battery-toshiba.fdi b/fdi/information/10freedesktop/10-recall-battery-toshiba.fdi
index 02bb19f..c668451 100644
--- a/fdi/information/10freedesktop/10-recall-battery-toshiba.fdi
+++ b/fdi/information/10freedesktop/10-recall-battery-toshiba.fdi
@@ -4,22 +4,7 @@
<match key="battery.vendor" string="TOSHIBA">
- <match key="battery.model" contains="PA3465U">
- <merge key="info.is_recalled" type="bool">true</merge>
- </match>
- <match key="battery.model" contains="PA3399U">
- <merge key="info.is_recalled" type="bool">true</merge>
- </match>
- <match key="battery.model" contains="PA3400U">
- <merge key="info.is_recalled" type="bool">true</merge>
- </match>
- <match key="battery.model" contains="PA3465U">
- <merge key="info.is_recalled" type="bool">true</merge>
- </match>
- <match key="battery.model" contains="PA3399U">
- <merge key="info.is_recalled" type="bool">true</merge>
- </match>
- <match key="battery.model" contains="PA3400U">
+ <match key="battery.model" contains_outof="PA3465U;PA3399U;PA3400U;PA3465U;PA3399U;PA3400U">
<merge key="info.is_recalled" type="bool">true</merge>
</match>
More information about the hal-commit
mailing list