hal/libhal-storage libhal-storage.c, 1.34, 1.35 libhal-storage.h, 1.19, 1.20

[Danny Kukawka]

Update of /cvs/hal/hal/libhal-storage
In directory kemper:/tmp/cvs-serv27206/libhal-storage

Modified Files:
	libhal-storage.c libhal-storage.h 
Log Message:
2006-05-09  Danny Kukawka  <danny.kukawka at web.de>

        * doc/spec/hal-spec.xml.in: added property for DVD+RW DL to spec
        * hald/linux2/probing/linux_dvd_rw_utils.c,
          hald/linux2/probing/linux_dvd_rw_utils.h: (get_dvd_r_rw_profile):
        reworked detection of device capabilities to get correct DVD-RW info
        and added DVD+RW DL detection.
        * hald/linux2/probing/probe-storage.c: (main): fixed mapping of
        return value of get_dvd_r_rw_profile() related to changes
        * libhal-storage/libhal-storage.c:
        (libhal_drive_policy_compute_display_name),
        (libhal_drive_from_udi):
        * libhal-storage/libhal-storage.h: added property DVD+RW DL



Index: libhal-storage.c
===================================================================
RCS file: /cvs/hal/hal/libhal-storage/libhal-storage.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- libhal-storage.c	10 Mar 2006 18:46:16 -0000	1.34
+++ libhal-storage.c	9 May 2006 20:28:01 -0000	1.35
@@ -278,7 +278,8 @@
 		}
 		if ((drive_cdrom_caps & LIBHAL_DRIVE_CDROM_CAPS_DVDRW) &&
 		    (drive_cdrom_caps & LIBHAL_DRIVE_CDROM_CAPS_DVDPLUSRW)) {
-                        if(drive_cdrom_caps & LIBHAL_DRIVE_CDROM_CAPS_DVDPLUSRDL)
+                        if(drive_cdrom_caps & LIBHAL_DRIVE_CDROM_CAPS_DVDPLUSRDL || 
+			   drive_cdrom_caps & LIBHAL_DRIVE_CDROM_CAPS_DVDPLUSRWDL)
                                 second = "/DVD±RW DL";
                         else
                                 second = "/DVD±RW";
@@ -932,6 +933,7 @@
 		LIBHAL_PROP_EXTRACT_BOOL_BITFIELD ("storage.cdrom.dvd", drive->cdrom_caps, LIBHAL_DRIVE_CDROM_CAPS_DVDROM);
 		LIBHAL_PROP_EXTRACT_BOOL_BITFIELD ("storage.cdrom.dvdplusr", drive->cdrom_caps, LIBHAL_DRIVE_CDROM_CAPS_DVDPLUSR);
 		LIBHAL_PROP_EXTRACT_BOOL_BITFIELD ("storage.cdrom.dvdplusrw", drive->cdrom_caps, LIBHAL_DRIVE_CDROM_CAPS_DVDPLUSRW);
+		LIBHAL_PROP_EXTRACT_BOOL_BITFIELD ("storage.cdrom.dvdplusrwdl", drive->cdrom_caps, LIBHAL_DRIVE_CDROM_CAPS_DVDPLUSRWDL);
 		LIBHAL_PROP_EXTRACT_BOOL_BITFIELD ("storage.cdrom.dvdplusrdl", drive->cdrom_caps, LIBHAL_DRIVE_CDROM_CAPS_DVDPLUSRDL);
 		LIBHAL_PROP_EXTRACT_BOOL_BITFIELD ("storage.cdrom.dvdr", drive->cdrom_caps, LIBHAL_DRIVE_CDROM_CAPS_DVDR);
 		LIBHAL_PROP_EXTRACT_BOOL_BITFIELD ("storage.cdrom.dvdrw", drive->cdrom_caps, LIBHAL_DRIVE_CDROM_CAPS_DVDRW);

Index: libhal-storage.h
===================================================================
RCS file: /cvs/hal/hal/libhal-storage/libhal-storage.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- libhal-storage.h	10 Mar 2006 18:46:16 -0000	1.19
+++ libhal-storage.h	9 May 2006 20:28:01 -0000	1.20
@@ -167,22 +167,23 @@
 } LibHalDriveType;
 
 typedef enum {
-	LIBHAL_DRIVE_CDROM_CAPS_CDROM      = 0x0001,
-	LIBHAL_DRIVE_CDROM_CAPS_CDR        = 0x0002,
-	LIBHAL_DRIVE_CDROM_CAPS_CDRW       = 0x0004,
-	LIBHAL_DRIVE_CDROM_CAPS_DVDRAM     = 0x0008,
-	LIBHAL_DRIVE_CDROM_CAPS_DVDROM     = 0x0010,
-	LIBHAL_DRIVE_CDROM_CAPS_DVDR       = 0x0020,
-	LIBHAL_DRIVE_CDROM_CAPS_DVDRW      = 0x0040,
-	LIBHAL_DRIVE_CDROM_CAPS_DVDPLUSR   = 0x0080,
-	LIBHAL_DRIVE_CDROM_CAPS_DVDPLUSRW  = 0x0100,
-	LIBHAL_DRIVE_CDROM_CAPS_DVDPLUSRDL = 0x0200,
-	LIBHAL_DRIVE_CDROM_CAPS_BDROM      = 0x0400,
-	LIBHAL_DRIVE_CDROM_CAPS_BDR        = 0x0800,
-	LIBHAL_DRIVE_CDROM_CAPS_BDRE       = 0x1000,
-	LIBHAL_DRIVE_CDROM_CAPS_HDDVDROM   = 0x2000,
-	LIBHAL_DRIVE_CDROM_CAPS_HDDVDR     = 0x4000,
-	LIBHAL_DRIVE_CDROM_CAPS_HDDVDRW    = 0x8000
+	LIBHAL_DRIVE_CDROM_CAPS_CDROM       = 0x00001,
+	LIBHAL_DRIVE_CDROM_CAPS_CDR         = 0x00002,
+	LIBHAL_DRIVE_CDROM_CAPS_CDRW        = 0x00004,
+	LIBHAL_DRIVE_CDROM_CAPS_DVDRAM      = 0x00008,
+	LIBHAL_DRIVE_CDROM_CAPS_DVDROM      = 0x00010,
+	LIBHAL_DRIVE_CDROM_CAPS_DVDR        = 0x00020,
+	LIBHAL_DRIVE_CDROM_CAPS_DVDRW       = 0x00040,
+	LIBHAL_DRIVE_CDROM_CAPS_DVDPLUSR    = 0x00080,
+	LIBHAL_DRIVE_CDROM_CAPS_DVDPLUSRW   = 0x00100,
+	LIBHAL_DRIVE_CDROM_CAPS_DVDPLUSRDL  = 0x00200,
+	LIBHAL_DRIVE_CDROM_CAPS_DVDPLUSRWDL = 0x00400,
+	LIBHAL_DRIVE_CDROM_CAPS_BDROM       = 0x00800,
+	LIBHAL_DRIVE_CDROM_CAPS_BDR         = 0x01000,
+	LIBHAL_DRIVE_CDROM_CAPS_BDRE        = 0x02000,
+	LIBHAL_DRIVE_CDROM_CAPS_HDDVDROM    = 0x04000,
+	LIBHAL_DRIVE_CDROM_CAPS_HDDVDR      = 0x08000,
+	LIBHAL_DRIVE_CDROM_CAPS_HDDVDRW     = 0x10000
 } LibHalDriveCdromCaps;
 
 LibHalDrive         *libhal_drive_from_udi                    (LibHalContext *hal_ctx,