scsi_id: Export WWN and Unit Serial Number

[elogind.git] / extras / scsi_id / scsi_id.h

diff --git a/extras/scsi_id/scsi_id.h b/extras/scsi_id/scsi_id.h
index 3b3a000dd78195ad64af8ff862c7a6049c7dfacd..4536cfd4f2596f260aa277296837d68c5f6fa21d 100644 (file)
--- a/extras/scsi_id/scsi_id.h
+++ b/extras/scsi_id/scsi_id.h
@@ -37,11 +37,19 @@ struct scsi_id_device {
        char type[33];
        char kernel[64];
        char serial[MAX_SERIAL_LEN];
+       char serial_short[MAX_SERIAL_LEN];
+       int use_sg;
+
+        /* Always from page 0x80 e.g. 'B3G1P8500RWT' - may not be unique */
+        char unit_serial_number[MAX_SERIAL_LEN];
+
+        /* NULs if not set - otherwise hex encoding using lower-case e.g. '50014ee0016eb572' */
+        char wwn[17];
 };
 
-extern int scsi_std_inquiry(struct scsi_id_device *dev_scsi, const char *devname);
-extern int scsi_get_serial (struct scsi_id_device *dev_scsi, const char *devname,
-                           int page_code, char *serial_short, int len);
+extern int scsi_std_inquiry(struct udev *udev, struct scsi_id_device *dev_scsi, const char *devname);
+extern int scsi_get_serial (struct udev *udev, struct scsi_id_device *dev_scsi, const char *devname,
+                           int page_code, int len);
 
 /*
  * Page code values.