hal/libhal-storage libhal-storage.c, 1.8, 1.8.2.1 libhal-storage.h, 1.6, 1.6.2.1

[David Zeuthen]

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

Modified Files:
      Tag: hal-0_4-stable-branch
	libhal-storage.c libhal-storage.h 
Log Message:
2004-11-22  David Zeuthen  <david at fubar.dk>

	* hald/linux/volume_id/volume_id.c (volume_id_probe): Add some
	logging of what size we call volume_id_probe with

	* hald/linux/block_class_device.c (force_unmount): Only attempt to
	'umount -l' if some hal policy piece are performing policy on the
	device

2004-11-22  David Zeuthen  <davidz at redhat.com>

	* libhal-storage/libhal-storage.c (hal_drive_from_udi): Detect Zip
	and Jaz drives
	(hal_drive_policy_compute_display_name): Fix an ugly bug where
	CD-ROM drives were being named "CD-R" instead of "CD-ROM"

	* libhal-storage/libhal-storage.h: Add enums for Zip and Jaz drives

	* hald/linux/platform_bus_device.c (platform_device_in_gdl): New
	function. Actually check the /etc/mtab for whether the floppy is
	mounted

	* hald/linux/common.h: Add prototype for 
	etc_mtab_process_all_block_devices

	* hald/linux/block_class_device.c (block_class_visit): Never add
	child real childs (e.g. /dev/hdd4) if storage.no_partitions_hint is
	set (for IDE Zip Drives)
	(detect_media): Actually set child to what we find in the TDL
	(mtab_handle_storage): Match on device file before attempting to
	match on major/minor
	(mtab_handle_volume): -do-

	* hald/device_info.c (handle_match): Add the contains and 
	contains_ncase matching operators.

	* fdi/90defaultpolicy/storage-policy.fdi: Add some policy pieces for
	IDE Zip, Jaz and USB Zip drives

	* fdi/20freedesktop/usb-zip-drives.fdi: New file to identify USB
	Zip Drives

	* fdi/20freedesktop/ide-drives.fdi: New file to identify strange IDE
	drives such as Zip and Jaz drives; note that rewriting the device
	file from e.g. /dev/hdd to /dev/hdd4  is actually sane enough to
	do given the abstraction that hal exports :-)

2004-11-16  David Zeuthen  <davidz at redhat.com>

	* fdi/90defaultpolicy/storage-policy.fdi: Remove the "ro" option for
	optical drives as it prevents mounting rw DVD-RAM media (RH bug #139600)

	* hald/linux/volume_id/volume_id.h (VOLUME_ID_PARTITIONS_MAX): Increase
	to 256 (RH bug #139227)

	* hald/linux/volume_id/volume_id.c (probe_msdos_part_table): Fix a
	typo ("to many partitions" -> "too many partitions"
	(volume_id_probe): Do not probe for msdos_part_table since that doesn't
	make sense (../block_class_device.c does that instead)



Index: libhal-storage.c
===================================================================
RCS file: /cvs/hal/hal/libhal-storage/libhal-storage.c,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -u -d -r1.8 -r1.8.2.1
--- libhal-storage.c	18 Oct 2004 23:49:57 -0000	1.8
+++ libhal-storage.c	22 Nov 2004 21:53:50 -0000	1.8.2.1
@@ -258,7 +258,7 @@
 
 
 		first = "CD-ROM";
-		if (drive_cdrom_caps & HAL_DRIVE_CDROM_CAPS_CDROM)
+		if (drive_cdrom_caps & HAL_DRIVE_CDROM_CAPS_CDR)
 			first = "CD-R";
 		if (drive_cdrom_caps & HAL_DRIVE_CDROM_CAPS_CDRW)
 			first = "CD-RW";
@@ -870,7 +870,14 @@
 			drive->type = HAL_DRIVE_TYPE_SMART_MEDIA;
 		} else if (strcmp (drive->type_textual, "sd_mmc") == 0) {
 			drive->type = HAL_DRIVE_TYPE_SD_MMC;
+		} else if (strcmp (drive->type_textual, "zip") == 0) {
+			drive->type = HAL_DRIVE_TYPE_ZIP;
+		} else if (strcmp (drive->type_textual, "jaz") == 0) {
+			drive->type = HAL_DRIVE_TYPE_JAZ;
+		} else {
+		        drive->type = HAL_DRIVE_TYPE_DISK; 
 		}
+
 	}
 
 	/* check if physical device is a camera or mp3 player */

Index: libhal-storage.h
===================================================================
RCS file: /cvs/hal/hal/libhal-storage/libhal-storage.h,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -d -r1.6 -r1.6.2.1
--- libhal-storage.h	13 Oct 2004 18:50:45 -0000	1.6
+++ libhal-storage.h	22 Nov 2004 21:53:50 -0000	1.6.2.1
@@ -78,6 +78,8 @@
 	HAL_STORAGE_ICON_DRIVE_SD_MMC                   = 0x10800,
 	HAL_STORAGE_ICON_DRIVE_CAMERA                   = 0x10900,
 	HAL_STORAGE_ICON_DRIVE_PORTABLE_AUDIO_PLAYER    = 0x10a00,
+	HAL_STORAGE_ICON_DRIVE_ZIP                      = 0x10b00,
+	HAL_STORAGE_ICON_DRIVE_JAZ                      = 0x10c00,
 
 	HAL_STORAGE_ICON_VOLUME_REMOVABLE_DISK          = 0x20000,
 	HAL_STORAGE_ICON_VOLUME_REMOVABLE_DISK_IDE      = 0x20001,
@@ -106,6 +108,8 @@
 	HAL_STORAGE_ICON_VOLUME_SD_MMC                  = 0x20800,
 	HAL_STORAGE_ICON_VOLUME_CAMERA                  = 0x20900,
 	HAL_STORAGE_ICON_VOLUME_PORTABLE_AUDIO_PLAYER   = 0x20a00,
+	HAL_STORAGE_ICON_VOLUME_ZIP                     = 0x10b00,
+	HAL_STORAGE_ICON_VOLUME_JAZ                     = 0x10c00,
 
 	HAL_STORAGE_ICON_DISC_CDROM                     = 0x30000,
 	HAL_STORAGE_ICON_DISC_CDR                       = 0x30001,
@@ -150,7 +154,9 @@
 	HAL_DRIVE_TYPE_SMART_MEDIA           = 0x07,
 	HAL_DRIVE_TYPE_SD_MMC                = 0x08,
 	HAL_DRIVE_TYPE_CAMERA                = 0x09,
-	HAL_DRIVE_TYPE_PORTABLE_AUDIO_PLAYER = 0x0a
+	HAL_DRIVE_TYPE_PORTABLE_AUDIO_PLAYER = 0x0a,
+	HAL_DRIVE_TYPE_ZIP                   = 0x0b,
+	HAL_DRIVE_TYPE_JAZ                   = 0x0c
 } HalDriveType;
 
 typedef enum {