hal-info: Branch 'master'
Danny Kukawka
dkukawka at kemper.freedesktop.org
Thu Oct 23 04:37:04 PDT 2008
VERSION | 2 +-
fdi/information/10freedesktop/10-modem.fdi | 8 ++++----
fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi | 2 +-
fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi | 2 +-
fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi | 2 +-
fdi/preprobe/10osvendor/10-ide-drives.fdi | 12 ++++++------
6 files changed, 14 insertions(+), 14 deletions(-)
New commits:
commit 1799df7fbaa51dcbfb6cc9dcc8cd07c5a32cd9cb
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Thu Oct 23 13:35:22 2008 +0200
fixed usage of *_outof and ';'
Fixed usage of *_outof and ';'. Removed ';' from comment lines to
make it easier to grep for misusage of *_outof.
diff --git a/VERSION b/VERSION
index 628a134..2df69bb 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-20081022
+20081023
diff --git a/fdi/information/10freedesktop/10-modem.fdi b/fdi/information/10freedesktop/10-modem.fdi
index 82b6874..78f37f4 100644
--- a/fdi/information/10freedesktop/10-modem.fdi
+++ b/fdi/information/10freedesktop/10-modem.fdi
@@ -29,9 +29,9 @@
<!-- Option -->
<match key="@info.parent:usb.vendor_id" int="0x0af0">
- <!-- Colt,Ricola,Ricola Light,Ricola Quad,Ricola Quad Light,Ricola Ndis,Ricola Ndis Light;Ricola Ndis Quad,Ricola Ndis Quad Light,
+ <!-- Colt,Ricola,Ricola Light,Ricola Quad,Ricola Quad Light,Ricola Ndis,Ricola Ndis Light, Ricola Ndis Quad,Ricola Ndis Quad Light,
Cobra,Cobra Bus,Viper,Viper Bus,Gt Max Ready,Gt Max,Fuji Modem Light,Fuji Modem Gt,Fuji Modem Ex,Fuji Network Light,Fuji Network Gt,
- Fuji Network Ex,Koi Modem,Koi Network,Scorpion Modem,Scorpion Network,Etna Modem,Etna Network,Etna Modem Lite;Etna Modem Gt,
+ Fuji Network Ex,Koi Modem,Koi Network,Scorpion Modem,Scorpion Network,Etna Modem,Etna Network,Etna Modem Lite, Etna Modem Gt,
Etna Modem Ex,Etna Network Lite,Etna Network Gt,Etna Network Ex,Etna Koi Modem,Etna Koi Network -->
<match key="@info.parent:usb.product_id" int_outof="0x5000;0x6000;0x6100;0x6200;0x6300;0x6050;0x6150;0x6250;0x6350;0x6500;0x6501;0x6600;0x6601;0x6701;0x6711;0x6721;0x6741;0x6761;0x6731;0x6751;0x6771;0x6800;0x6811;0x6901;0x6911;0x7001;0x7011;0x7021;0x7041;0x7061;0x7031;0x7051;0x7071;0x7100;0x7111">
<match key="@info.parent:usb.interface.number" int="0">
@@ -173,7 +173,7 @@
<!-- Pantech -->
<match key="@info.parent:usb.vendor_id" int="0x106c">
- <!-- PC5740;PC5750;UM150 EVDO rev A card -->
+ <!-- PC5740, PC5750, UM150 EVDO rev A card -->
<match key="@info.parent:usb.product_id" int_outof="0x3701;0x3702;0x3711">
<match key="@info.parent:usb.interface.number" int="0">
<append key="modem.command_sets" type="strlist">IS-707-A</append>
@@ -358,7 +358,7 @@
<!-- LG -->
<match key="@info.parent:usb.vendor_id" int="0x1004">
<!-- U990 -->
- <match key="@info.parent:usb.product_id" int_outof="0x6000">
+ <match key="@info.parent:usb.product_id" int="0x6000">
<append key="modem.command_sets" type="strlist">GSM-07.07</append>
<append key="modem.command_sets" type="strlist">GSM-07.05</append>
</match>
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
index 75a662a..a33a2f4 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
@@ -169,7 +169,7 @@
<merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
</match>
- <!-- these need no quirks : Dimension E520, DXP051, Inspiron: 1300, E1702/E1705, 630m; M1710 (only resumes with vesafb) -->
+ <!-- these need no quirks : Dimension E520, DXP051, Inspiron: 1300, E1702/E1705, 630m, M1710 (only resumes with vesafb) -->
<match key="system.hardware.product" contains_outof="DM061 ;DXP051;ME051;MP061;MXC051;MXG061;XPS M1530">
<merge key="power_management.quirk.none" 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 9ebb828..fe4fce1 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
@@ -41,7 +41,7 @@
<match key="system.hardware.product" prefix_outof="2366;2653">
<merge key="power_management.quirk.radeon_off" type="bool">true</merge>
</match>
- <!-- X22, X40; X32 -->
+ <!-- X22, X40, X32 -->
<match key="system.hardware.product" prefix_outof="2662;2672;2673">
<merge key="power_management.quirk.radeon_off" type="bool">true</merge>
<match key="system.hardware.version" contains_not="X31">
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
index 1302c66..2e2013c 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
@@ -77,7 +77,7 @@
</match>
</match>
<match key="system.hardware.version" prefix_ncase="3000 N200">
- <match key="system.hardware.product" string="0769BBG;0769AC6">
+ <match key="system.hardware.product" string_outof="0769BBG;0769AC6">
<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/preprobe/10osvendor/10-ide-drives.fdi b/fdi/preprobe/10osvendor/10-ide-drives.fdi
index 71ecf32..35a005e 100644
--- a/fdi/preprobe/10osvendor/10-ide-drives.fdi
+++ b/fdi/preprobe/10osvendor/10-ide-drives.fdi
@@ -24,7 +24,7 @@
<merge key="storage.drive_type" type="string">zip</merge>
<merge key="storage.no_partitions_hint" type="bool">true</merge>
<merge key="storage.requires_eject" type="bool">true</merge>
- <!-- treat as floppy and data at partition 4; adjust device file -->
+ <!-- treat as floppy and data at partition 4, adjust device file -->
<append key="block.device" type="string">4</append>
</match>
@@ -33,7 +33,7 @@
<merge key="storage.drive_type" type="string">zip</merge>
<merge key="storage.no_partitions_hint" type="bool">true</merge>
<merge key="storage.requires_eject" type="bool">true</merge>
- <!-- treat as floppy and data at partition 4; adjust device file -->
+ <!-- treat as floppy and data at partition 4, adjust device file -->
<append key="block.device" type="string">4</append>
</match>
@@ -42,7 +42,7 @@
<merge key="storage.drive_type" type="string">jaz</merge>
<merge key="storage.no_partitions_hint" type="bool">true</merge>
<merge key="storage.requires_eject" type="bool">true</merge>
- <!-- treat as floppy and data at partition 4; adjust device file -->
+ <!-- treat as floppy and data at partition 4, adjust device file -->
<append key="block.device" type="string">4</append>
</match>
</match>
@@ -55,7 +55,7 @@
<merge key="storage.drive_type" type="string">zip</merge>
<merge key="storage.no_partitions_hint" type="bool">true</merge>
<merge key="storage.requires_eject" type="bool">true</merge>
- <!-- treat as floppy and data at partition 4; adjust device file -->
+ <!-- treat as floppy and data at partition 4, adjust device file -->
<append key="block.device" type="string">4</append>
</match>
@@ -64,7 +64,7 @@
<merge key="storage.drive_type" type="string">zip</merge>
<merge key="storage.no_partitions_hint" type="bool">true</merge>
<merge key="storage.requires_eject" type="bool">true</merge>
- <!-- treat as floppy and data at partition 4; adjust device file -->
+ <!-- treat as floppy and data at partition 4, adjust device file -->
<append key="block.device" type="string">4</append>
</match>
@@ -73,7 +73,7 @@
<merge key="storage.drive_type" type="string">jaz</merge>
<merge key="storage.no_partitions_hint" type="bool">true</merge>
<merge key="storage.requires_eject" type="bool">true</merge>
- <!-- treat as floppy and data at partition 4; adjust device file -->
+ <!-- treat as floppy and data at partition 4, adjust device file -->
<append key="block.device" type="string">4</append>
</match>
</match>
More information about the hal-commit
mailing list