hal/hald/linux block_class_device.c,1.69,1.70

[David Zeuthen]

Update of /cvs/hal/hal/hald/linux
In directory gabe:/tmp/cvs-serv28588/hald/linux

Modified Files:
	block_class_device.c 
Log Message:
2004-09-14  David Zeuthen  <david at fubar.dk>

	* hald/linux/block_class_device.c (cdrom_get_properties): Also set
	storage.cdrom.dvdrw to FALSE. Add note about we should be giving 
	the SCSI ioctl stuff some love soon.

	* hald/linux/volume_id/volume_id.c (probe_vfat): Don't le16_to_cpu
	for vs->sectors_per_cluster - it's a 8-bit quantity. Fixes bug with
	one of my FAT32 volume labels



Index: block_class_device.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux/block_class_device.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- block_class_device.c	12 Sep 2004 21:26:10 -0000	1.69
+++ block_class_device.c	14 Sep 2004 12:08:40 -0000	1.70
@@ -286,6 +286,7 @@
 	hal_device_property_set_bool (d, "storage.cdrom.cdrw", FALSE);
 	hal_device_property_set_bool (d, "storage.cdrom.dvd", FALSE);
 	hal_device_property_set_bool (d, "storage.cdrom.dvdr", FALSE);
+	hal_device_property_set_bool (d, "storage.cdrom.dvdrw", FALSE);
 	hal_device_property_set_bool (d, "storage.cdrom.dvdram", FALSE);
 	hal_device_property_set_bool (d, "storage.cdrom.dvdplusr", FALSE);
 	hal_device_property_set_bool (d, "storage.cdrom.dvdplusrw", FALSE);
@@ -299,6 +300,10 @@
 	}
 	if (capabilities & CDC_DVD) {
 		int profile;
+
+		/** @todo FIXME BUG XXX: need to check for dvdrw (prolly need to rewrite much of 
+		 *  the linux_dvdrw_utils.c file)
+		 */
 		
 		hal_device_property_set_bool (d, "storage.cdrom.dvd", TRUE);
 		
@@ -308,8 +313,7 @@
 			hal_device_property_set_bool (d, "storage.cdrom.dvdplusr", TRUE);
 			hal_device_property_set_bool (d, "storage.cdrom.dvdplusrw", TRUE);
 		} else if (profile == 0) {
-			hal_device_property_set_bool(d, "storage.cdrom.dvdplusr",
-					     TRUE);
+			hal_device_property_set_bool(d, "storage.cdrom.dvdplusr", TRUE);
 		} else if (profile == 1) {
 			hal_device_property_set_bool (d, "storage.cdrom.dvdplusrw", TRUE);
 		}