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=758706ba25e036238bc763a911622adfcdac8ae9;hp=9edb39ec49c6c8cefca95aaeba4ff767ca15ccfc;hb=6ecd4d1e364ea8104c83e36b82d1c23835fb104b;hpb=b484e43622c04aaf4a2ca851bc7436b873530b1d

diff --git a/extras/scsi_id/scsi_id.h b/extras/scsi_id/scsi_id.h
index 9edb39ec4..758706ba2 100644
--- a/extras/scsi_id/scsi_id.h
+++ b/extras/scsi_id/scsi_id.h
@@ -21,11 +21,7 @@
  *  USA
  */
 
-#define dprintf(format, arg...) \
-	log_message(LOG_DEBUG, "%s: " format, __FUNCTION__ , ## arg)
-
-#define	MAX_NAME_LEN	72
-#define OFFSET (2 * sizeof(unsigned int))
+#define	MAX_PATH_LEN	512
 
 /*
  * MAX_ATTR_LEN: maximum length of the result of reading a sysfs
@@ -37,7 +33,7 @@
  * MAX_SERIAL_LEN: the maximum length of the serial number, including
  * added prefixes such as vendor and product (model) strings.
  */
-#define	MAX_SERIAL_LEN	128
+#define	MAX_SERIAL_LEN	256
 
 /*
  * MAX_BUFFER_LEN: maximum buffer size and line length used while reading
@@ -45,18 +41,15 @@
  */
 #define MAX_BUFFER_LEN	256
 
-extern int sysfs_get_attr(const char *devpath, const char *attr, char *value,
-			  size_t bufsize);
-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)));
-
-#ifdef __KLIBC__
-#define makedev(major, minor)  ((major) << 8) | (minor)
-#endif
+extern int scsi_get_serial (struct sysfs_device *dev_scsi, const char *devname,
+			    int page_code, char *serial, int len);
 
-#ifndef u8
-typedef unsigned char u8;
-#endif
+/*
+ * Page code values. 
+ */
+enum page_code {
+		PAGE_83_PRE_SPC3 = -0x83,
+		PAGE_UNSPECIFIED = 0x00,
+		PAGE_80		 = 0x80,
+		PAGE_83		 = 0x83,
+};