diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2020-07-19 18:57:59 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2020-07-19 18:57:59 +0000 |
| commit | d32d980880593ffd2ea498c8788daec161fed944 (patch) | |
| tree | 9258e56adc4011b03c9f27b48cb72f6a9e3dfe2b /sys/dev/vscsi.c | |
| parent | 1f57964aae4a2bef3fc9b6048f221e513aff3870 (diff) | |
Move the adapter related items (luns, adapter, adapter_target,
adapter_buswidth, adapter_softc) from struct scsi_link to struct
scsibus_attach_args.
Additional compile tests by jmatthew@ (sparc64) and aoyam@ (luna88k).
Diffstat (limited to 'sys/dev/vscsi.c')
| -rw-r--r-- | sys/dev/vscsi.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sys/dev/vscsi.c b/sys/dev/vscsi.c index 525ebc5d4d0..6ed16e46550 100644 --- a/sys/dev/vscsi.c +++ b/sys/dev/vscsi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vscsi.c,v 1.53 2020/07/16 21:18:29 krw Exp $ */ +/* $OpenBSD: vscsi.c,v 1.54 2020/07/19 18:57:57 krw Exp $ */ /* * Copyright (c) 2008 David Gwynne <dlg@openbsd.org> @@ -145,14 +145,15 @@ vscsi_attach(struct device *parent, struct device *self, void *aux) rw_init(&sc->sc_ioc_lock, "vscsiioc"); scsi_iopool_init(&sc->sc_iopool, sc, vscsi_ccb_get, vscsi_ccb_put); - sc->sc_link.adapter = &vscsi_switch; - sc->sc_link.adapter_softc = sc; - sc->sc_link.adapter_target = SDEV_NO_ADAPTER_TARGET; - sc->sc_link.adapter_buswidth = 256; sc->sc_link.openings = 16; sc->sc_link.pool = &sc->sc_iopool; saa.saa_sc_link = &sc->sc_link; + saa.saa_adapter = &vscsi_switch; + saa.saa_adapter_softc = sc; + saa.saa_adapter_target = SDEV_NO_ADAPTER_TARGET; + saa.saa_adapter_buswidth = 256; + saa.saa_luns = 8; sc->sc_scsibus = (struct scsibus_softc *)config_found(&sc->sc_dev, &saa, scsiprint); |