diff options
| author | Hannes Reinecke <hare@suse.de> | 2008-05-14 13:42:41 +0200 |
|---|---|---|
| committer | Kay Sievers <kay.sievers@vrfy.org> | 2008-05-14 13:42:41 +0200 |
| commit | 753417db2ba6faafa3aa30f6b15678e1557e20b8 (patch) | |
| tree | 66ff27022db98002388ca3890559ba5cda751c51 /extras/scsi_id/scsi_id.h | |
| parent | 838436fa328345ffb0b355e6921b6d75a9b2992f (diff) | |
scsi_id: remove all sysfs dependencies
Diffstat (limited to 'extras/scsi_id/scsi_id.h')
| -rw-r--r-- | extras/scsi_id/scsi_id.h | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/extras/scsi_id/scsi_id.h b/extras/scsi_id/scsi_id.h index 0e2b297d28..3b3a000dd7 100644 --- a/extras/scsi_id/scsi_id.h +++ b/extras/scsi_id/scsi_id.h @@ -30,13 +30,21 @@ */ #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]; +}; + +extern int scsi_std_inquiry(struct scsi_id_device *dev_scsi, const char *devname); +extern int scsi_get_serial (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 +52,4 @@ enum page_code { PAGE_80 = 0x80, PAGE_83 = 0x83, }; + |