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=0e2b297d28838567fd50f444bd6183b73496a3f5;hp=1c9ed969a7cb0cdba3a25d65f79a09fefd002dbf;hb=838436fa328345ffb0b355e6921b6d75a9b2992f;hpb=50be1401743704419ba52174302b4c1d06b3898b

diff --git a/extras/scsi_id/scsi_id.h b/extras/scsi_id/scsi_id.h
index 1c9ed969a..0e2b297d2 100644
--- a/extras/scsi_id/scsi_id.h
+++ b/extras/scsi_id/scsi_id.h
@@ -5,26 +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 dprintf(format, arg...) \
-	log_message(LOG_DEBUG, "%s: " format, __FUNCTION__ , ## arg)
-
-#define	MAX_NAME_LEN	72
+#define	MAX_PATH_LEN	512
 
 /*
  * MAX_ATTR_LEN: maximum length of the result of reading a sysfs
@@ -44,15 +30,10 @@
  */
 #define MAX_BUFFER_LEN	256
 
-extern int scsi_get_serial (struct sysfs_device *scsi_dev, const char
-			    *devname, int page_code, char *serial, int
-			    len);
-extern void log_message (int level, const char *format, ...)
-	__attribute__ ((format (printf, 2, 3)));
-
-#ifndef u8
-typedef unsigned char u8;
-#endif
+extern int scsi_std_inquiry(struct sysfs_device *dev_scsi, const char *devname,
+			    char *vendor, char *model, char *rev, char *type);
+extern int scsi_get_serial (struct sysfs_device *dev_scsi, const char *devname,
+			    int page_code, char *serial, char *serial_short, int len);
 
 /*
  * Page code values.