hal/fdi/20freedesktop ide-drives.fdi, 1.1.2.1, 1.1.2.2 usb-zip-drives.fdi, 1.1.2.1, 1.1.2.2

[David Zeuthen]

Update of /cvs/hal/hal/fdi/20freedesktop
In directory gabe:/tmp/cvs-serv10974/fdi/20freedesktop

Modified Files:
      Tag: hal-0_4-stable-branch
	ide-drives.fdi usb-zip-drives.fdi 
Log Message:
2004-11-30  David Zeuthen  <davidz at redhat.com>

	* fdi/20freedesktop/ide-drives.fdi: Add blacklist for certain slave
	IDE drives on Dell Laptops - stopgap solution for now (RH Bug #138148)

	* fdi/20freedesktop/usb-zip-drives.fdi: Fix a syntax error

	* hald/linux/osspec.c (compute_coldplug_visit_device): Don't spew
	too much debug now that we ascent into the tree down to the leafs

	* libhal-storage/libhal-storage.c (hal_drive_from_udi): Comment out
	types for ZIP and JAZ drives since that will require ABI changes

	* libhal-storage/libhal-storage.h: -do-



Index: ide-drives.fdi
===================================================================
RCS file: /cvs/hal/hal/fdi/20freedesktop/Attic/ide-drives.fdi,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- ide-drives.fdi	22 Nov 2004 21:53:50 -0000	1.1.2.1
+++ ide-drives.fdi	1 Dec 2004 04:28:57 -0000	1.1.2.2
@@ -1,9 +1,23 @@
 <?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- --> 
 
 <deviceinfo version="0.2">
+
   <device>
-    <!-- Handle weird IDE drives (Jaz and Zip) by matching on the IDE model -->
 
+    <!-- Handle weird Dell Laptops that slow down the system if the optical 
+	 drive is polled (RH Bug #138148) -->
+    <match key="storage.bus" string="ide">
+      <match key="storage.model" string="HL-DT-STCD-RW/DVD-ROM GCC-4240N">
+	<match key="block.device" string="/dev/hdb">
+          <merge key="storage.media_check_enabled" type="bool">false</merge>
+	</match>
+	<match key="block.device" string="/dev/hdd">
+          <merge key="storage.media_check_enabled" type="bool">false</merge>
+	</match>
+      </match>
+    </match>
+    
+    <!-- Handle weird IDE drives (Jaz and Zip) by matching on the IDE model -->
     <match key="storage.bus" string="ide">
       <!-- IOMEGA Zip Drive -->
       <match key="storage.model" contains_ncase="ZIP">

Index: usb-zip-drives.fdi
===================================================================
RCS file: /cvs/hal/hal/fdi/20freedesktop/Attic/usb-zip-drives.fdi,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- usb-zip-drives.fdi	22 Nov 2004 21:53:50 -0000	1.1.2.1
+++ usb-zip-drives.fdi	1 Dec 2004 04:28:57 -0000	1.1.2.2
@@ -13,5 +13,5 @@
       </match>
     </match>
 
-  <device>
+  </device>
 </deviceinfo>