summaryrefslogtreecommitdiff
path: root/sys/scsi/scsiconf.h
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2020-07-20 14:41:15 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2020-07-20 14:41:15 +0000
commitad566d2094b0373bebd00ab85e0010d5811c4249 (patch)
tree46059b2470122630651df70bd0636206b91194c5 /sys/scsi/scsiconf.h
parenta746810173b252aec797706a98c4166c8c58aa2d (diff)
Move remaining scsi bus initialization info from "prototype scsi link"
fields to struct scsibus_attach_args. Nuke the struct scsi_link * (saa_sc_link) in scaibus_attach_args. Explicitly initialize each field in scsibus_attach_args variables.
Diffstat (limited to 'sys/scsi/scsiconf.h')
-rw-r--r--sys/scsi/scsiconf.h9
1 files changed, 7 insertions, 2 deletions
diff --git a/sys/scsi/scsiconf.h b/sys/scsi/scsiconf.h
index 73c3169e000..a9c3b902339 100644
--- a/sys/scsi/scsiconf.h
+++ b/sys/scsi/scsiconf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: scsiconf.h,v 1.192 2020/07/19 18:57:58 krw Exp $ */
+/* $OpenBSD: scsiconf.h,v 1.193 2020/07/20 14:41:14 krw Exp $ */
/* $NetBSD: scsiconf.h,v 1.35 1997/04/02 02:29:38 mycroft Exp $ */
/*
@@ -339,9 +339,14 @@ struct scsi_inquiry_pattern {
};
struct scsibus_attach_args {
- struct scsi_link *saa_sc_link;
struct scsi_adapter *saa_adapter;
void *saa_adapter_softc;
+ struct scsi_iopool *saa_pool;
+ u_int64_t saa_wwpn;
+ u_int64_t saa_wwnn;
+ u_int16_t saa_quirks;
+ u_int16_t saa_flags;
+ u_int16_t saa_openings;
u_int16_t saa_adapter_target;
#define SDEV_NO_ADAPTER_TARGET 0xffff
u_int16_t saa_adapter_buswidth;