hal/hald/linux/drive_id drive_id.c,1.1,1.2 drive_id.h,1.1,1.2

[David Zeuthen]

Update of /cvs/hal/hal/hald/linux/drive_id
In directory pdx:/tmp/cvs-serv10122/hald/linux/drive_id

Modified Files:
	drive_id.c drive_id.h 
Log Message:
2004-08-02  David Zeuthen  <david at fubar.dk>

	Patch from Kay Sievers <kay.sievers at vrfy.org>
	
	* hald/linux/block_class_device.c: (detect_fs),
	(block_class_pre_process):
	* hald/linux/drive_id/drive_id.c: (drive_id_probe):
	* hald/linux/drive_id/drive_id.h:
	* hald/linux/volume_id/volume_id.c: (probe_ext), (probe_reiser),
	(probe_xfs), (probe_jfs), (probe_vfat), (probe_msdos), (probe_udf),
	(probe_iso9660), (probe_ufs), (probe_hfs_hfsplus), (probe_ntfs),
	(probe_swap), (volume_id_probe), (volume_id_open_node):
	* hald/linux/volume_id/volume_id.h:	
	Attached is a trivial cleanup of the enum names, cause 'ALL' is
	not a very good name in a global namespace. I've prepended the
	libname to all names.



Index: drive_id.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux/drive_id/drive_id.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- drive_id.c	1 Aug 2004 19:13:56 -0000	1.1
+++ drive_id.c	1 Aug 2004 23:17:02 -0000	1.2
@@ -7,8 +7,8 @@
  *	of ATA or SCSI devices.
  *	
  *	Note:	Native interface access is needed. There is no way to get
- *		these kind from a device behind e.g. a USB adapter. A good
- *		bridge reads these values from the disk and provides them
+ *		these kind from a device behind a USB adapter. A good
+ *		bridge reads these values from the device and provides them
  *		as USB config strings.
  *
  *	This library is free software; you can redistribute it and/or
@@ -199,13 +199,13 @@
 		return -1;
 
 	switch(type) {
-	case DID_ATA:
+	case DRIVE_ID_ATA:
 		rc = probe_ata(id);
 		break;
-	case DID_SCSI:
+	case DRIVE_ID_SCSI:
 		rc = probe_scsi(id);
 		break;
-	case DID_ALL:
+	case DRIVE_ID_ALL:
 	default:
 		rc = probe_ata(id);
 		if (rc == 0)

Index: drive_id.h
===================================================================
RCS file: /cvs/hal/hal/hald/linux/drive_id/drive_id.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- drive_id.h	1 Aug 2004 19:13:56 -0000	1.1
+++ drive_id.h	1 Aug 2004 23:17:02 -0000	1.2
@@ -21,6 +21,8 @@
 #ifndef _DRIVE_ID_H_
 #define _DRIVE_ID_H_
 
+#define DRIVE_ID_VERSION		002
+
 #define DRIVE_ID_VENDOR_SIZE		8
 #define DRIVE_ID_MODEL_SIZE		40
 #define DRIVE_ID_SERIAL_SIZE		20
@@ -30,9 +32,9 @@
 
 
 enum drive_type {
-	DID_ALL,
-	DID_SCSI,
-	DID_ATA
+	DRIVE_ID_ALL,
+	DRIVE_ID_SCSI,
+	DRIVE_ID_ATA
 };
 
 struct drive_id {