vol_id: fix logging glue

[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 0e2b297d28838567fd50f444bd6183b73496a3f5..48e4a582311706741ac210b0a162748b5a0c05aa 100644 (file)
--- a/extras/scsi_id/scsi_id.h
+++ b/extras/scsi_id/scsi_id.h
@@ -30,13 +30,22 @@
  */
 #define MAX_BUFFER_LEN 256
 
-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);
+struct scsi_id_device {
+       char vendor[9];
+       char model[17];
+       char revision[5];
+       char type[33];
+       char kernel[64];
+       char serial[MAX_SERIAL_LEN];
+       int use_sg;
+};
+
+extern int scsi_std_inquiry(struct udev *udev, struct scsi_id_device *dev_scsi, const char *devname);
+extern int scsi_get_serial (struct udev *udev, struct scsi_id_device *dev_scsi, const char *devname,
+                           int page_code, char *serial_short, int len);
 
 /*
- * Page code values. 
+ * Page code values.
  */
 enum page_code {
                PAGE_83_PRE_SPC3 = -0x83,
@@ -44,3 +53,4 @@ enum page_code {
                PAGE_80          = 0x80,
                PAGE_83          = 0x83,
 };
+