diff options
Diffstat (limited to 'sys/dev/ic/mfi.c')
| -rw-r--r-- | sys/dev/ic/mfi.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/sys/dev/ic/mfi.c b/sys/dev/ic/mfi.c index 80d58c7f0b2..6a492fa3417 100644 --- a/sys/dev/ic/mfi.c +++ b/sys/dev/ic/mfi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mfi.c,v 1.182 2020/07/16 21:18:30 krw Exp $ */ +/* $OpenBSD: mfi.c,v 1.183 2020/07/19 18:57:57 krw Exp $ */ /* * Copyright (c) 2006 Marco Peereboom <marco@peereboom.us> * @@ -771,15 +771,15 @@ mfi_attach(struct mfi_softc *sc, enum mfi_iop iop) for (i = 0; i < sc->sc_ld_cnt; i++) sc->sc_ld[i].ld_present = 1; - sc->sc_link.adapter = &mfi_switch; - sc->sc_link.adapter_softc = sc; - sc->sc_link.adapter_buswidth = sc->sc_info.mci_max_lds; - sc->sc_link.adapter_target = SDEV_NO_ADAPTER_TARGET; - sc->sc_link.luns = 1; sc->sc_link.openings = sc->sc_max_cmds - 1; sc->sc_link.pool = &sc->sc_iopool; saa.saa_sc_link = &sc->sc_link; + saa.saa_adapter = &mfi_switch; + saa.saa_adapter_softc = sc; + saa.saa_adapter_buswidth = sc->sc_info.mci_max_lds; + saa.saa_adapter_target = SDEV_NO_ADAPTER_TARGET; + saa.saa_luns = 1; sc->sc_scsibus = (struct scsibus_softc *) config_found(&sc->sc_dev, &saa, scsiprint); @@ -847,14 +847,15 @@ mfi_syspd(struct mfi_softc *sc) free(pd, M_TEMP, sizeof *pd); link = &sc->sc_pd->pd_link; - link->adapter = &mfi_pd_switch; - link->adapter_softc = sc; - link->adapter_buswidth = MFI_MAX_PD; - link->adapter_target = SDEV_NO_ADAPTER_TARGET; link->openings = sc->sc_max_cmds - 1; link->pool = &sc->sc_iopool; saa.saa_sc_link = link; + saa.saa_adapter = &mfi_pd_switch; + saa.saa_adapter_softc = sc; + saa.saa_adapter_buswidth = MFI_MAX_PD; + saa.saa_adapter_target = SDEV_NO_ADAPTER_TARGET; + saa.saa_luns = 8; sc->sc_pd->pd_scsibus = (struct scsibus_softc *) config_found(&sc->sc_dev, &saa, scsiprint); |