hal-info: Branch 'master'

[Danny Kukawka]

 fdi/information/10freedesktop/10-usb-card-readers.fdi |   58 ++++--------------
 1 file changed, 16 insertions(+), 42 deletions(-)

New commits:
commit 51ee7e45645e040ae883e763545492c7b6fb0536
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Thu Jan 29 15:09:15 2009 +0100

    put some of the existing USB cardreader entries together
    
    Put three of the existing USB cardreader entries together to
    one match.

diff --git a/fdi/information/10freedesktop/10-usb-card-readers.fdi b/fdi/information/10freedesktop/10-usb-card-readers.fdi
index 7068263..6711cb1 100644
--- a/fdi/information/10freedesktop/10-usb-card-readers.fdi
+++ b/fdi/information/10freedesktop/10-usb-card-readers.fdi
@@ -19,34 +19,22 @@
 
     <!-- Generic catch all -->
     <match key="storage.bus" string="usb">
-      <match key="storage.model" contains="HS-CF">
-        <merge key="storage.drive_type" type="string">compact_flash</merge>
-      </match>
-      <match key="storage.model" contains="HS-MS">
-        <merge key="storage.drive_type" type="string">memory_stick</merge>
-      </match>
-      <match key="storage.model" contains="HS-SM">
-        <merge key="storage.drive_type" type="string">smart_media</merge>
-      </match>
-      <match key="storage.model" contains="HS-xD">
-        <merge key="storage.drive_type" type="string">smart_media</merge>
-      </match>
-      <match key="storage.model" contains="HS-SD">
-        <merge key="storage.drive_type" type="string">sd_mmc</merge>
-      </match>
-
-      <!-- Yet another common theme -->
-      <match key="storage.model" contains="Reader-CF">
-        <merge key="storage.drive_type" type="string">compact_flash</merge>
-      </match>
-      <match key="storage.model" contains="Reader-MS">
-        <merge key="storage.drive_type" type="string">memory_stick</merge>
-      </match>
-      <match key="storage.model" contains="Reader-SM">
-        <merge key="storage.drive_type" type="string">smart_media</merge>
-      </match>
-      <match key="storage.model" contains="Reader-SD">
-        <merge key="storage.drive_type" type="string">sd_mmc</merge>
+      <match key="storage.model" prefix_outof="HS-;Reader-;IC1210        ">
+        <match key="storage.model" suffix="CF">
+          <merge key="storage.drive_type" type="string">compact_flash</merge>
+        </match>
+        <match key="storage.model" suffix="MS">
+          <merge key="storage.drive_type" type="string">memory_stick</merge>
+        </match>
+        <match key="storage.model" suffix="SM">
+          <merge key="storage.drive_type" type="string">smart_media</merge>
+        </match>
+        <match key="storage.model" suffix="xD">
+          <merge key="storage.drive_type" type="string">smart_media</merge>
+        </match>
+        <match key="storage.model" suffix="SD">
+          <merge key="storage.drive_type" type="string">sd_mmc</merge>
+        </match>
       </match>
 
       <!-- Yet another common theme -->
@@ -66,20 +54,6 @@
         <merge key="storage.drive_type" type="string">sd_mmc</merge>
       </match>
 
-      <!-- Some noname USB2.0 Card Reader -->
-      <match key="storage.model" string="IC1210        CF">
-        <merge key="storage.drive_type" type="string">compact_flash</merge>
-      </match>
-      <match key="storage.model" string="IC1210        MS">
-        <merge key="storage.drive_type" type="string">memory_stick</merge>
-      </match>
-      <match key="storage.model" string="IC1210        SM">
-        <merge key="storage.drive_type" type="string">smart_media</merge>
-      </match>
-      <match key="storage.model" string="IC1210    MMC/SD">
-        <merge key="storage.drive_type" type="string">sd_mmc</merge>
-      </match>
-
       <!-- Hama card reader -->
       <match key="storage.model" contains_outof="Card;USB">
         <match key="storage.model" contains="Reader">