hal: Branch 'master'

[Danny Kukawka]

 fdi/information/10freedesktop/10-usb-card-readers.fdi |   21 ++++++++++++++++++
 1 files changed, 21 insertions(+)

New commits:
diff-tree 3ee894062938f08ee7b54490dd8d4dbdcb4d0c61 (from ec00295d496ae9fc0e2a2fc82448148e9b566020)
Author: Lennart Poettering <mzsqb at 0pointer.de>
Date:   Thu Aug 31 22:59:33 2006 +0200

    added some USB card reader from fd.o bug #7749
    
    It adds support for some noname USB card reader ("IC1210") and for
    SanDisk ImageMate II CF reader. (see fd.o bug #7749).

diff --git a/fdi/information/10freedesktop/10-usb-card-readers.fdi b/fdi/information/10freedesktop/10-usb-card-readers.fdi
index fe45668..9c6eac4 100644
--- a/fdi/information/10freedesktop/10-usb-card-readers.fdi
+++ b/fdi/information/10freedesktop/10-usb-card-readers.fdi
@@ -74,6 +74,20 @@
         <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>
+
       <!-- Lexar CF Reader -->
       <match key="@storage.physical_device:usb.vendor_id" int="0x05dc">
         <match key="@storage.physical_device:usb.product_id" int="0x0002">
@@ -81,6 +95,13 @@
         </match>
       </match>
 
+      <!-- SanDisk ImageMate II CF Reader -->
+      <match key="@storage.physical_device:usb.vendor_id" int="0x0781">
+        <match key="@storage.physical_device:usb.product_id" int="0x0002">
+          <merge key="storage.drive_type" type="string">compact_flash</merge>
+        </match>
+      </match>
+
       <!-- Sony Ericsson Handys with Memory Stick (Duo) -->
       <match key="@storage.physical_device:usb.vendor_id" int="0xfce">
         <!-- K750i -->