hal/libhal-storage libhal-storage.c, 1.8.2.1, 1.8.2.2 libhal-storage.h, 1.6.2.1, 1.6.2.2

[David Zeuthen]

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

Modified Files:
      Tag: hal-0_4-stable-branch
	libhal-storage.c libhal-storage.h 
Log Message:
2004-11-30  David Zeuthen  <davidz at redhat.com>

	* fdi/20freedesktop/ide-drives.fdi: Add blacklist for certain slave
	IDE drives on Dell Laptops - stopgap solution for now (RH Bug #138148)

	* fdi/20freedesktop/usb-zip-drives.fdi: Fix a syntax error

	* hald/linux/osspec.c (compute_coldplug_visit_device): Don't spew
	too much debug now that we ascent into the tree down to the leafs

	* libhal-storage/libhal-storage.c (hal_drive_from_udi): Comment out
	types for ZIP and JAZ drives since that will require ABI changes

	* libhal-storage/libhal-storage.h: -do-



Index: libhal-storage.c
===================================================================
RCS file: /cvs/hal/hal/libhal-storage/libhal-storage.c,v
retrieving revision 1.8.2.1
retrieving revision 1.8.2.2
diff -u -d -r1.8.2.1 -r1.8.2.2
--- libhal-storage.c	22 Nov 2004 21:53:50 -0000	1.8.2.1
+++ libhal-storage.c	1 Dec 2004 04:28:58 -0000	1.8.2.2
@@ -870,10 +870,12 @@
 			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; 
 		}

Index: libhal-storage.h
===================================================================
RCS file: /cvs/hal/hal/libhal-storage/libhal-storage.h,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -u -d -r1.6.2.1 -r1.6.2.2
--- libhal-storage.h	22 Nov 2004 21:53:50 -0000	1.6.2.1
+++ libhal-storage.h	1 Dec 2004 04:28:58 -0000	1.6.2.2
@@ -78,8 +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_DRIVE_ZIP                      = 0x10b00,
+        HAL_STORAGE_ICON_DRIVE_JAZ                      = 0x10c00,*/
 
 	HAL_STORAGE_ICON_VOLUME_REMOVABLE_DISK          = 0x20000,
 	HAL_STORAGE_ICON_VOLUME_REMOVABLE_DISK_IDE      = 0x20001,
@@ -108,8 +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_VOLUME_ZIP                     = 0x10b00,
+        HAL_STORAGE_ICON_VOLUME_JAZ                     = 0x10c00,*/
 
 	HAL_STORAGE_ICON_DISC_CDROM                     = 0x30000,
 	HAL_STORAGE_ICON_DISC_CDR                       = 0x30001,
@@ -154,9 +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
+	HAL_DRIVE_TYPE_JAZ                   = 0x0c*/
 } HalDriveType;
 
 typedef enum {