summaryrefslogtreecommitdiff
path: root/sys/scsi
diff options
context:
space:
mode:
authorDavid Gwynne <dlg@cvs.openbsd.org>2011-04-06 15:16:55 +0000
committerDavid Gwynne <dlg@cvs.openbsd.org>2011-04-06 15:16:55 +0000
commitd36ed539461139f3eb1c2ca2905f8954a250265f (patch)
treef9f3d1338115b83223afd422b3225246a049e554 /sys/scsi
parenta5e0218e967719742d76ea571cbcafb03fffa027 (diff)
add a new "serial" devid type for scsi devices. add code to usb that fakes
it up by using the usb devices iSerial thing. ok deraadt@
Diffstat (limited to 'sys/scsi')
-rw-r--r--sys/scsi/scsiconf.c5
-rw-r--r--sys/scsi/scsiconf.h3
2 files changed, 6 insertions, 2 deletions
diff --git a/sys/scsi/scsiconf.c b/sys/scsi/scsiconf.c
index 3718c0e331c..04df4b3d411 100644
--- a/sys/scsi/scsiconf.c
+++ b/sys/scsi/scsiconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: scsiconf.c,v 1.172 2011/04/06 13:33:46 dlg Exp $ */
+/* $OpenBSD: scsiconf.c,v 1.173 2011/04/06 15:16:54 dlg Exp $ */
/* $NetBSD: scsiconf.c,v 1.57 1996/05/02 01:09:01 neil Exp $ */
/*
@@ -782,6 +782,9 @@ scsibus_printlink(struct scsi_link *link)
case DEVID_T10:
printf(" t10.");
break;
+ case DEVID_SERIAL:
+ printf(" serial.");
+ break;
}
if (ISSET(link->id->d_flags, DEVID_F_PRINT)) {
diff --git a/sys/scsi/scsiconf.h b/sys/scsi/scsiconf.h
index e9a5f80e8b5..aebaffa35db 100644
--- a/sys/scsi/scsiconf.h
+++ b/sys/scsi/scsiconf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: scsiconf.h,v 1.143 2011/04/05 14:25:42 dlg Exp $ */
+/* $OpenBSD: scsiconf.h,v 1.144 2011/04/06 15:16:54 dlg Exp $ */
/* $NetBSD: scsiconf.h,v 1.35 1997/04/02 02:29:38 mycroft Exp $ */
/*
@@ -233,6 +233,7 @@ _4ltol(u_int8_t *bytes)
#define DEVID_NAA 1
#define DEVID_EUI 2
#define DEVID_T10 3
+#define DEVID_SERIAL 4
struct devid {
u_int8_t d_type;