scsi_id, usb_id: request device parent by subsystem

[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 74b449e984f022a127f02f8588112b01e2a1faab..758706ba25e036238bc763a911622adfcdac8ae9 100644 (file)
--- a/extras/scsi_id/scsi_id.h
+++ b/extras/scsi_id/scsi_id.h
@@ -21,10 +21,7 @@
  *  USA
  */
 
  *  USA
  */
 

-#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
 
 /*
  * MAX_ATTR_LEN: maximum length of the result of reading a sysfs


@@ -44,12 +41,15 @@
  */
 #define MAX_BUFFER_LEN 256
 
  */
 #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)));
+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,
+};