diff options
| author |   krw <krw@openbsd.org> | 2020-07-20 14:41:12 +0000 |
|---|---|---|
| committer | krw <krw@openbsd.org> | 2020-07-20 14:41:12 +0000 |
| commit | e5eae15db860eeb4c34d7bbe32da7a39dae6ff2a (patch) | |
| tree | 498cfd25bdc5ba0d876f4e5371f5798b6a749227 /sys/dev/ic/aic79xx_openbsd.c | |
| parent | Sigh. Only the ptyc case should tsleep in ttyretype, since others can (diff) | |
| download | wireguard-openbsd-e5eae15db860eeb4c34d7bbe32da7a39dae6ff2a.tar.xz wireguard-openbsd-e5eae15db860eeb4c34d7bbe32da7a39dae6ff2a.zip | |
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/dev/ic/aic79xx_openbsd.c')
| -rw-r--r-- | sys/dev/ic/aic79xx_openbsd.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/ic/aic79xx_openbsd.c b/sys/dev/ic/aic79xx_openbsd.c index de796ddab85..af09cace499 100644 --- a/sys/dev/ic/aic79xx_openbsd.c +++ b/sys/dev/ic/aic79xx_openbsd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aic79xx_openbsd.c,v 1.56 2020/07/19 18:57:57 krw Exp $ */ +/* $OpenBSD: aic79xx_openbsd.c,v 1.57 2020/07/20 14:41:13 krw Exp $ */ /* * Copyright (c) 2004 Milos Urbanek, Kenneth R. Westerback & Marco Peereboom @@ -109,15 +109,15 @@ ahd_attach(struct ahd_softc *ahd) if (ahd->flags & AHD_RESET_BUS_A) ahd_reset_channel(ahd, 'A', TRUE); - ahd->sc_channel.openings = 16; /* Must ALWAYS be < 256!! */ - ahd->sc_channel.pool = &ahd->sc_iopool; - - saa.saa_sc_link = &ahd->sc_channel; saa.saa_adapter_target = ahd->our_id; saa.saa_adapter_buswidth = (ahd->features & AHD_WIDE) ? 16 : 8; saa.saa_adapter_softc = ahd; saa.saa_adapter = &ahd_switch; saa.saa_luns = 8; + saa.saa_openings = 16; /* Must ALWAYS be < 256!! */ + saa.saa_pool = &ahd->sc_iopool; + saa.saa_quirks = saa.saa_flags = 0; + saa.saa_wwpn = saa.saa_wwnn = 0; ahd->sc_child = config_found((void *)&ahd->sc_dev, &saa, scsiprint); |