hal: Branch 'master'

[David Zeuthen]

 fdi/preprobe/10osvendor/10-ide-drives.fdi |   23 +++++++++++++++++++++++
 1 files changed, 23 insertions(+)

New commits:
diff-tree f734a4ff07fd26f762f36e5a3b98816ba354b380 (from ff20966d70fe8a0f23b2195ec8d6579201c0d4ba)
Author: David Zeuthen <davidz at redhat.com>
Date:   Thu Feb 22 14:57:44 2007 -0500

    with Linux's libata, IDE Zip drives can now be polled for media changes
    
    So identify drives and put merge storage.requires_eject=TRUE so media
    is properly ejected. I have no idea why polling the drive using libata
    don't make tons of noise. Perhaps the old ide-floppy driver was just
    broken.

diff --git a/fdi/preprobe/10osvendor/10-ide-drives.fdi b/fdi/preprobe/10osvendor/10-ide-drives.fdi
index 61fa1ff..0749499 100644
--- a/fdi/preprobe/10osvendor/10-ide-drives.fdi
+++ b/fdi/preprobe/10osvendor/10-ide-drives.fdi
@@ -65,6 +65,29 @@
 	</match>
       </match>
     </match>
+
+    <match key="storage.bus" string="scsi">
+      <match key="storage.drive_type" string="disk">
+	<!-- IOMEGA Zip Drive -->
+	<match key="storage.model" contains_ncase="ZIP">
+          <merge key="storage.drive_type" type="string">zip</merge>
+          <merge key="storage.requires_eject" type="bool">true</merge>
+	</match>
+	
+	<!-- IOMEGA CLIK! Drive -->
+	<match key="storage.model" contains_ncase="CLIK">
+          <merge key="storage.drive_type" type="string">zip</merge>
+          <merge key="storage.requires_eject" type="bool">true</merge>
+	</match>
+	
+	<!-- Jaz -->
+	<match key="storage.model" contains_ncase="JAZ">
+          <merge key="storage.drive_type" type="string">jaz</merge>
+          <merge key="storage.requires_eject" type="bool">true</merge>
+	</match>
+      </match>
+    </match>
+
       
   </device>
 </deviceinfo>