hal/fdi/20freedesktop 6in1-card-reader.fdi, 1.1, 1.2 lexar-media-cf-reader.fdi, 1.1, 1.2

[David Zeuthen]

Update of /cvs/hal/hal/fdi/20freedesktop
In directory pdx:/tmp/cvs-serv6345/fdi/20freedesktop

Modified Files:
	6in1-card-reader.fdi lexar-media-cf-reader.fdi 
Log Message:
2004-05-05  David Zeuthen  <david at fubar.dk>

	* hald/linux/linux_dvd_rw_utils.c (get_dvd_media_type): new function

	* hald/linux/block_class_device.c: rename some properties and ensure
	that all properties for a namespace is always available with default
	values - it's easiest to look at the diff to see what's changed; one
	highlight is the introduction of the volume.* namespace.
	(detect_media): use new utility in linux_dvd_rw_utils.c to get the
	disc type for DVD's.

	* tools/callouts/fstab-update.sh: property names changed

	* fdi/20freedesktop/lexar-media-cf-reader.fdi: propertys name changed

	* fdi/20freedesktop/6in1-card-reader.fdi: property names changed



Index: 6in1-card-reader.fdi
===================================================================
RCS file: /cvs/hal/hal/fdi/20freedesktop/6in1-card-reader.fdi,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- a/6in1-card-reader.fdi	12 Apr 2004 16:45:03 -0000	1.1
+++ b/6in1-card-reader.fdi	5 May 2004 20:46:34 -0000	1.2
@@ -5,10 +5,10 @@
     <match key="info.bus" string="usb">
       <match key="usb.vendor_id" int="0x0424">
         <match key="usb.product_id" int="0x20fc">
-          <merge key="storage_lun0.media" type="string">compact_flash</merge>
-          <merge key="storage_lun1.media" type="string">memory_stick</merge>
-          <merge key="storage_lun2.media" type="string">smart_media</merge>
-          <merge key="storage_lun3.media" type="string">sd_mmc</merge>
+          <merge key="storage_lun0.drive_type" type="string">compact_flash</merge>
+          <merge key="storage_lun1.drive_type" type="string">memory_stick</merge>
+          <merge key="storage_lun2.drive_type" type="string">smart_media</merge>
+          <merge key="storage_lun3.drive_type" type="string">sd_mmc</merge>
         </match>
       </match>
     </match>

Index: lexar-media-cf-reader.fdi
===================================================================
RCS file: /cvs/hal/hal/fdi/20freedesktop/lexar-media-cf-reader.fdi,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- a/lexar-media-cf-reader.fdi	12 Apr 2004 16:45:03 -0000	1.1
+++ b/lexar-media-cf-reader.fdi	5 May 2004 20:46:34 -0000	1.2
@@ -5,7 +5,7 @@
     <match key="info.bus" string="usb">
       <match key="usb.vendor_id" int="0x05dc">
         <match key="usb.product_id" int="0x0002">
-          <merge key="storage.media" type="string">compact_flash</merge>
+          <merge key="storage.drive_type" type="string">compact_flash</merge>
         </match>
       </match>
     </match>