X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=extras%2Fscsi_id%2Fscsi_id.h;h=48e4a582311706741ac210b0a162748b5a0c05aa;hp=b5312b89888d02ef78fbff275b056f45da23bdbb;hb=c3f0b654fc18b5f98bc65074e2118177e0f37ae9;hpb=1aa1e24848903d11780db1ade355be73ad61a937

diff --git a/extras/scsi_id/scsi_id.h b/extras/scsi_id/scsi_id.h
index b5312b898..48e4a5823 100644
--- a/extras/scsi_id/scsi_id.h
+++ b/extras/scsi_id/scsi_id.h
@@ -5,23 +5,12 @@
  *
  * Copyright (C) IBM Corp. 2003
  *
- *  This library is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU Lesser General Public License as
- *  published by the Free Software Foundation; either version 2.1 of the
- *  License, or (at your option) any later version.
- *
- *  This library is distributed in the hope that it will be useful, but
- *  WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- *  USA
+ *	This program is free software; you can redistribute it and/or modify it
+ *	under the terms of the GNU General Public License as published by the
+ *	Free Software Foundation version 2 of the License.
  */
 
-#define	MAX_NAME_LEN	72
+#define	MAX_PATH_LEN	512
 
 /*
  * MAX_ATTR_LEN: maximum length of the result of reading a sysfs
@@ -41,11 +30,22 @@
  */
 #define MAX_BUFFER_LEN	256
 
-extern int scsi_get_serial (struct sysfs_device *dev_scsi, const char *devname,
-			    int page_code, char *serial, int len);
+struct scsi_id_device {
+	char vendor[9];
+	char model[17];
+	char revision[5];
+	char type[33];
+	char kernel[64];
+	char serial[MAX_SERIAL_LEN];
+	int use_sg;
+};
+
+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, char *serial_short, int len);
 
 /*
- * Page code values. 
+ * Page code values.
  */
 enum page_code {
 		PAGE_83_PRE_SPC3 = -0x83,
@@ -53,3 +53,4 @@ enum page_code {
 		PAGE_80		 = 0x80,
 		PAGE_83		 = 0x83,
 };
+