diff options
| author |   dlg <dlg@openbsd.org> | 2006-11-28 23:59:45 +0000 |
|---|---|---|
| committer | dlg <dlg@openbsd.org> | 2006-11-28 23:59:45 +0000 |
| commit | 73d09fc56bd87109cdbe2d90369b3c6a93a5e94e (patch) | |
| tree | 489a1b920e2f327a4553184e9dddca9852de0863 /sys/scsi | |
| parent | I just don't know why I decided to set block count to 512 unconditionaly (diff) | |
| download | wireguard-openbsd-73d09fc56bd87109cdbe2d90369b3c6a93a5e94e.tar.xz wireguard-openbsd-73d09fc56bd87109cdbe2d90369b3c6a93a5e94e.zip | |
give scsi controllers a real attach args to fill in when attaching scsibus.
ok miod@ marco@ deraadt@
Diffstat (limited to 'sys/scsi')
| -rw-r--r-- | sys/scsi/scsiconf.c | 5 | ||||
| -rw-r--r-- | sys/scsi/scsiconf.h | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/sys/scsi/scsiconf.c b/sys/scsi/scsiconf.c index af21d61a4ec..1e77ffda3d3 100644 --- a/sys/scsi/scsiconf.c +++ b/sys/scsi/scsiconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: scsiconf.c,v 1.122 2006/11/28 16:56:50 dlg Exp $ */ +/* $OpenBSD: scsiconf.c,v 1.123 2006/11/28 23:59:45 dlg Exp $ */ /* $NetBSD: scsiconf.c,v 1.57 1996/05/02 01:09:01 neil Exp $ */ /* @@ -140,7 +140,8 @@ void scsibusattach(struct device *parent, struct device *self, void *aux) { struct scsibus_softc *sb = (struct scsibus_softc *)self; - struct scsi_link *sc_link_proto = aux; + struct scsibus_attach_args *saa = aux; + struct scsi_link *sc_link_proto = saa->saa_sc_link; int nbytes, i; if (!cold) diff --git a/sys/scsi/scsiconf.h b/sys/scsi/scsiconf.h index 5d0fe1123f0..7995f083931 100644 --- a/sys/scsi/scsiconf.h +++ b/sys/scsi/scsiconf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: scsiconf.h,v 1.80 2006/11/28 16:56:50 dlg Exp $ */ +/* $OpenBSD: scsiconf.h,v 1.81 2006/11/28 23:59:45 dlg Exp $ */ /* $NetBSD: scsiconf.h,v 1.35 1997/04/02 02:29:38 mycroft Exp $ */ /* @@ -190,6 +190,10 @@ struct scsi_inquiry_pattern { char *revision; }; +struct scsibus_attach_args { + struct scsi_link *saa_sc_link; +}; + /* * One of these is allocated and filled in for each scsi bus. * It holds pointers to allow the scsi bus to get to the driver |