X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=extras%2Fscsi_id%2Fscsi_id.h;h=3b8b236368e50c9461681c73e5ed1529e3af3e98;hb=7f4954d04026f28b0ebe65a514f06fefad8efaca;hp=9fcadec173536407b6b10d6a22a776484e9c96f2;hpb=caf4c97a2c443eeb8eebe7d42806eaca500db223;p=elogind.git

diff --git a/extras/scsi_id/scsi_id.h b/extras/scsi_id/scsi_id.h
index 9fcadec17..3b8b23636 100644
--- a/extras/scsi_id/scsi_id.h
+++ b/extras/scsi_id/scsi_id.h
@@ -1,4 +1,5 @@
-/*
+/*  -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+ *
  * scsi_id.h
  *
  * General defines and such for scsi_id
@@ -39,6 +40,15 @@ struct scsi_id_device {
 	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];
+
+        /* NULs if not set - otherwise hex encoding using lower-case e.g. '0xe00000d80000' */
+        char wwn_vendor_extension[17];
 };
 
 extern int scsi_std_inquiry(struct udev *udev, struct scsi_id_device *dev_scsi, const char *devname);