diff options
| author |   krw <krw@openbsd.org> | 2020-07-19 18:57:57 +0000 |
|---|---|---|
| committer | krw <krw@openbsd.org> | 2020-07-19 18:57:57 +0000 |
| commit | ead808c42040dde55a8ea2938802849f628f2859 (patch) | |
| tree | eaa6027c39fae179c81fd6469d744349804e203a /sys/dev/ic/aic79xx_openbsd.c | |
| parent | Should use ufs_args here after all. (diff) | |
| download | wireguard-openbsd-ead808c42040dde55a8ea2938802849f628f2859.tar.xz wireguard-openbsd-ead808c42040dde55a8ea2938802849f628f2859.zip | |
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/ic/aic79xx_openbsd.c')
| -rw-r--r-- | sys/dev/ic/aic79xx_openbsd.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/dev/ic/aic79xx_openbsd.c b/sys/dev/ic/aic79xx_openbsd.c index e7a87416bad..de796ddab85 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.55 2020/07/16 21:18:30 krw Exp $ */ +/* $OpenBSD: aic79xx_openbsd.c,v 1.56 2020/07/19 18:57:57 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.adapter_target = ahd->our_id; - if (ahd->features & AHD_WIDE) - ahd->sc_channel.adapter_buswidth = 16; - ahd->sc_channel.adapter_softc = ahd; - ahd->sc_channel.adapter = &ahd_switch; 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; ahd->sc_child = config_found((void *)&ahd->sc_dev, &saa, scsiprint); |