hal/hald/linux2/probing probe-storage.c, 1.20, 1.21 probe-volume.c, 1.25, 1.26

[David Zeuthen]

Update of /cvs/hal/hal/hald/linux2/probing
In directory kemper:/tmp/cvs-serv5893/hald/linux2/probing

Modified Files:
	probe-storage.c probe-volume.c 
Log Message:
2006-02-22  David Zeuthen  <davidz at redhat.com>

        Patch from Artem Kachitchkine <Artem.Kachitchkin at Sun.COM>. Add
        Blu-ray and HD DVD to storage.cdrom and volume.disc.type per the
        latest MMC-5 draft. See Table 87 - Profile List in
        http://www.t10.org/drafts.htm#mmc5 . Probe-volume should do the
        right thing, but probe-storage needs fixing (noted in FIXME
        comment).

        * doc/spec/hal-spec.xml.in:

        * hald/linux2/probing/probe-volume.c (main):

        * hald/linux2/probing/probe-storage.c (main):



Index: probe-storage.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux2/probing/probe-storage.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- probe-storage.c	23 Jan 2006 12:15:50 -0000	1.20
+++ probe-storage.c	22 Feb 2006 21:27:52 -0000	1.21
@@ -195,6 +195,12 @@
 			libhal_device_set_property_bool (ctx, udi, "storage.cdrom.dvdplusr", FALSE, &error);
 			libhal_device_set_property_bool (ctx, udi, "storage.cdrom.dvdplusrw", FALSE, &error);
 			libhal_device_set_property_bool (ctx, udi, "storage.cdrom.dvdplusrdl", FALSE, &error);
+			libhal_device_set_property_bool (ctx, udi, "storage.cdrom.bd", FALSE, &error);
+			libhal_device_set_property_bool (ctx, udi, "storage.cdrom.bdr", FALSE, &error);
+			libhal_device_set_property_bool (ctx, udi, "storage.cdrom.bdre", FALSE, &error);
+			libhal_device_set_property_bool (ctx, udi, "storage.cdrom.hddvd", FALSE, &error);
+			libhal_device_set_property_bool (ctx, udi, "storage.cdrom.hddvdr", FALSE, &error);
+			libhal_device_set_property_bool (ctx, udi, "storage.cdrom.hddvdrw", FALSE, &error);
 			
 			if (capabilities & CDC_CD_R) {
 				libhal_device_set_property_bool (ctx, udi, "storage.cdrom.cdr", TRUE, &error);
@@ -206,8 +212,8 @@
 			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)
+				/** @todo FIXME BUG XXX: need to check for dvdrw, Blue-ray and HD DVD
+				 * (prolly need to rewrite much of the linux_dvdrw_utils.c file)
 				 */
 				
 				libhal_device_set_property_bool (ctx, udi, "storage.cdrom.dvd", TRUE, &error);

Index: probe-volume.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux2/probing/probe-volume.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- probe-volume.c	13 Feb 2006 03:42:26 -0000	1.25
+++ probe-volume.c	22 Feb 2006 21:27:52 -0000	1.26
@@ -406,8 +406,8 @@
 			break;
 		}
 		
-		/* see table 373 in MMC-3 for details on disc type
-		 * http://www.t10.org/drafts.htm#mmc3
+		/* see table 87 - Profile List in MMC-5 for details on disc type
+		 * http://www.t10.org/drafts.htm#mmc5
 		 */
 		type = get_disc_type (fd);
 		dbg ("get_disc_type returned 0x%02x", type);
@@ -451,6 +451,29 @@
 			case 0x2B: /* DVD+R Double Layer */
                           	libhal_device_set_property_string (ctx, udi, "volume.disc.type", "dvd_plus_r_dl", &error);
 				break;
+			case 0x40: /* BD-ROM  */
+                          	libhal_device_set_property_string (ctx, udi, "volume.disc.type", "bd_rom", &error);
+				break;
+			case 0x41: /* BD-R Sequential */
+                          	libhal_device_set_property_string (ctx, udi, "volume.disc.type", "bd_r", &error);
+				break;
+			case 0x42: /* BD-R Random */
+                          	libhal_device_set_property_string (ctx, udi, "volume.disc.type", "bd_r", &error);
+				break;
+			case 0x43: /* BD-RE */
+                          	libhal_device_set_property_string (ctx, udi, "volume.disc.type", "bd_re", &error);
+				libhal_device_set_property_bool (ctx, udi, "volume.disc.is_rewritable", TRUE, &error);
+				break;
+			case 0x50: /* HD DVD-ROM */
+                          	libhal_device_set_property_string (ctx, udi, "volume.disc.type", "hddvd_rom", &error);
+				break;
+			case 0x51: /* HD DVD-R */
+                          	libhal_device_set_property_string (ctx, udi, "volume.disc.type", "hddvd_r", &error);
+				break;
+			case 0x52: /* HD DVD-Rewritable */
+                          	libhal_device_set_property_string (ctx, udi, "volume.disc.type", "hddvd_rw", &error);
+				libhal_device_set_property_bool (ctx, udi, "volume.disc.is_rewritable", TRUE, &error);
+				break;
 			default: 
 				break;
 			}