[PATCH] pass SYSFS setting down for extras builds

[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 573a2b60d78ee5fd25bb0c41db833cbf538eeacc..0ca7cd420696b1dd6cbcef23bd26e01869d660e6 100644 (file)
--- a/extras/scsi_id/scsi_id.h
+++ b/extras/scsi_id/scsi_id.h
@@ -25,7 +25,6 @@
        log_message(LOG_DEBUG, "%s: " format, __FUNCTION__ , ## arg)
 
 #define        MAX_NAME_LEN    72
-#define OFFSET (2 * sizeof(unsigned int))
 
 /*
  * MAX_ATTR_LEN: maximum length of the result of reading a sysfs
@@ -37,7 +36,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
@@ -47,16 +46,12 @@
 
 extern int sysfs_get_attr(const char *devpath, const char *attr, char *value,
                          size_t bufsize);
-extern int scsi_get_serial (struct sysfs_class_device *scsi_dev,
-                           const char *devname, int page_code, char *serial,
-                           int len);
+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
-
 #ifndef u8
 typedef unsigned char u8;
 #endif