Merge branch 'master' from gregkh@master.kernel.org:/pub/scm/linux/hotplug/udev

[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 eb9498ab71f0fb35a9b5eaac491c605f1d9a38a0..1c9ed969a7cb0cdba3a25d65f79a09fefd002dbf 100644 (file)
--- a/extras/scsi_id/scsi_id.h
+++ b/extras/scsi_id/scsi_id.h
@@ -25,13 +25,18 @@
        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
+ * attribute.
+ */
+#define        MAX_ATTR_LEN    256
 
 /*
  * 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
@@ -39,23 +44,22 @@
  */
 #define MAX_BUFFER_LEN 256
 
-static inline char *sysfs_get_attr(struct sysfs_class_device *dev,
-                                   const char *attr)
-{
-       return sysfs_get_value_from_attributes(dev->directory->attributes,
-                                              attr);
-}
-
-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
+
+/*
+ * Page code values. 
+ */
+enum page_code {
+               PAGE_83_PRE_SPC3 = -0x83,
+               PAGE_UNSPECIFIED = 0x00,
+               PAGE_80          = 0x80,
+               PAGE_83          = 0x83,
+};