hal/libhal-storage libhal-storage.c, 1.15, 1.16 libhal-storage.h, 1.9, 1.10

[David Zeuthen]

Update of /cvs/hal/hal/libhal-storage
In directory gabe:/tmp/cvs-serv29661/libhal-storage

Modified Files:
	libhal-storage.c libhal-storage.h 
Log Message:
2005-06-28  David Zeuthen  <davidz at redhat.com>

        * libhal-storage/libhal-storage.h: Add new LibHalVolumeDiscType field
        LIBHAL_VOLUME_DISC_TYPE_DVDPLUSR_DL. Add new LibHalDriveBus field
        LIBHAL_DRIVE_BUS_CCW.

        * libhal-storage/libhal-storage.c (libhal_drive_from_udi): Set
        drive->bus to LIBHAL_DRIVE_BUS_CCW if appropriate
        (libhal_volume_from_udi): Fix a bug: it's dvd_plus_[r|rw] not
        dvd_plus[r|rw]. Add support for dvd_plus_r_dl.



Index: libhal-storage.c
===================================================================
RCS file: /cvs/hal/hal/libhal-storage/libhal-storage.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- libhal-storage.c	4 Apr 2005 18:00:21 -0000	1.15
+++ libhal-storage.c	28 Jun 2005 15:47:51 -0000	1.16
@@ -934,6 +934,8 @@
 			drive->bus = LIBHAL_DRIVE_BUS_IDE;
 		} else if (strcmp (bus_textual, "scsi") == 0) {
 			drive->bus = LIBHAL_DRIVE_BUS_SCSI;
+		} else if (strcmp (bus_textual, "ccw") == 0) {
+			drive->bus = LIBHAL_DRIVE_BUS_CCW;
 		}
 	}
 
@@ -1057,10 +1059,12 @@
 			vol->disc_type = LIBHAL_VOLUME_DISC_TYPE_DVDR;
 		} else if (strcmp (disc_type_textual, "dvd_rw") == 0) {
 			vol->disc_type = LIBHAL_VOLUME_DISC_TYPE_DVDRW;
-		} else if (strcmp (disc_type_textual, "dvd_plusr") == 0) {
+		} else if (strcmp (disc_type_textual, "dvd_plus_r") == 0) {
 			vol->disc_type = LIBHAL_VOLUME_DISC_TYPE_DVDPLUSR;
-		} else if (strcmp (disc_type_textual, "dvd_plusrw") == 0) {
+		} else if (strcmp (disc_type_textual, "dvd_plus_rw") == 0) {
 			vol->disc_type = LIBHAL_VOLUME_DISC_TYPE_DVDPLUSRW;
+		} else if (strcmp (disc_type_textual, "dvd_plus_r_dl") == 0) {
+			vol->disc_type = LIBHAL_VOLUME_DISC_TYPE_DVDPLUSR_DL;
 		}
 	}
 

Index: libhal-storage.h
===================================================================
RCS file: /cvs/hal/hal/libhal-storage/libhal-storage.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- libhal-storage.h	26 Feb 2005 22:31:42 -0000	1.9
+++ libhal-storage.h	28 Jun 2005 15:47:51 -0000	1.10
@@ -146,7 +146,8 @@
 	LIBHAL_DRIVE_BUS_IDE         = 0x01,
 	LIBHAL_DRIVE_BUS_SCSI        = 0x02,
 	LIBHAL_DRIVE_BUS_USB         = 0x03,
-	LIBHAL_DRIVE_BUS_IEEE1394    = 0x04
+	LIBHAL_DRIVE_BUS_IEEE1394    = 0x04,
+	LIBHAL_DRIVE_BUS_CCW         = 0x05
 } LibHalDriveBus;
 
 typedef enum {
@@ -239,15 +240,16 @@
 } LibHalVolumeUsage;
 
 typedef enum {
-	LIBHAL_VOLUME_DISC_TYPE_CDROM     = 0x00,
-	LIBHAL_VOLUME_DISC_TYPE_CDR       = 0x01,
-	LIBHAL_VOLUME_DISC_TYPE_CDRW      = 0x02,
-	LIBHAL_VOLUME_DISC_TYPE_DVDROM    = 0x03,
-	LIBHAL_VOLUME_DISC_TYPE_DVDRAM    = 0x04,
-	LIBHAL_VOLUME_DISC_TYPE_DVDR      = 0x05,
-	LIBHAL_VOLUME_DISC_TYPE_DVDRW     = 0x06,
-	LIBHAL_VOLUME_DISC_TYPE_DVDPLUSR  = 0x07,
-	LIBHAL_VOLUME_DISC_TYPE_DVDPLUSRW = 0x08
+	LIBHAL_VOLUME_DISC_TYPE_CDROM       = 0x00,
+	LIBHAL_VOLUME_DISC_TYPE_CDR         = 0x01,
+	LIBHAL_VOLUME_DISC_TYPE_CDRW        = 0x02,
+	LIBHAL_VOLUME_DISC_TYPE_DVDROM      = 0x03,
+	LIBHAL_VOLUME_DISC_TYPE_DVDRAM      = 0x04,
+	LIBHAL_VOLUME_DISC_TYPE_DVDR        = 0x05,
+	LIBHAL_VOLUME_DISC_TYPE_DVDRW       = 0x06,
+	LIBHAL_VOLUME_DISC_TYPE_DVDPLUSR    = 0x07,
+	LIBHAL_VOLUME_DISC_TYPE_DVDPLUSRW   = 0x08,
+	LIBHAL_VOLUME_DISC_TYPE_DVDPLUSR_DL = 0x09
 } LibHalVolumeDiscType;
 
 LibHalVolume     *libhal_volume_from_udi                      (LibHalContext *hal_ctx,