diff options
| author | Matthew Dempsky <matthew@cvs.openbsd.org> | 2011-07-08 22:09:28 +0000 |
|---|---|---|
| committer | Matthew Dempsky <matthew@cvs.openbsd.org> | 2011-07-08 22:09:28 +0000 |
| commit | 5f812b489da947a1e9ee4db1f2150a5376ae40f8 (patch) | |
| tree | c0fb5195bc2167b8616c28c256db90a8f00ff991 /sys/dev/pci | |
| parent | b5ce742f51f1ca4111dcbb133e602d1ecd8adf30 (diff) | |
First batch of converting SCSI HBAs from setting saa_targets and
saa_luns instead of adapter_buswidth and luns in the prototype link.
ok dlg@, miod@
Diffstat (limited to 'sys/dev/pci')
| -rw-r--r-- | sys/dev/pci/arc.c | 4 | ||||
| -rw-r--r-- | sys/dev/pci/ips.c | 4 | ||||
| -rw-r--r-- | sys/dev/pci/mpii.c | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/sys/dev/pci/arc.c b/sys/dev/pci/arc.c index 6ec16a8fcc5..0c4752483a2 100644 --- a/sys/dev/pci/arc.c +++ b/sys/dev/pci/arc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: arc.c,v 1.93 2011/04/20 07:13:51 claudio Exp $ */ +/* $OpenBSD: arc.c,v 1.94 2011/07/08 22:09:27 matthew Exp $ */ /* * Copyright (c) 2006 David Gwynne <dlg@openbsd.org> @@ -597,12 +597,12 @@ arc_attach(struct device *parent, struct device *self, void *aux) sc->sc_link.adapter = &arc_switch; sc->sc_link.adapter_softc = sc; sc->sc_link.adapter_target = ARC_MAX_TARGET; - sc->sc_link.adapter_buswidth = ARC_MAX_TARGET; sc->sc_link.openings = sc->sc_req_count; sc->sc_link.pool = &sc->sc_iopool; bzero(&saa, sizeof(saa)); saa.saa_sc_link = &sc->sc_link; + saa.saa_targets = ARC_MAX_TARGET; child = config_found(self, &saa, scsiprint); sc->sc_scsibus = (struct scsibus_softc *)child; diff --git a/sys/dev/pci/ips.c b/sys/dev/pci/ips.c index 46026c7a197..fec6b481191 100644 --- a/sys/dev/pci/ips.c +++ b/sys/dev/pci/ips.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ips.c,v 1.106 2011/07/05 22:40:57 matthew Exp $ */ +/* $OpenBSD: ips.c,v 1.107 2011/07/08 22:09:27 matthew Exp $ */ /* * Copyright (c) 2006, 2007, 2009 Alexander Yurchenko <grange@openbsd.org> @@ -732,13 +732,13 @@ ips_attach(struct device *parent, struct device *self, void *aux) if (sc->sc_nunits > 0) sc->sc_scsi_link.openings = sc->sc_nccbs / sc->sc_nunits; sc->sc_scsi_link.adapter_target = sc->sc_nunits; - sc->sc_scsi_link.adapter_buswidth = sc->sc_nunits; sc->sc_scsi_link.adapter = &ips_scsi_adapter; sc->sc_scsi_link.adapter_softc = sc; sc->sc_scsi_link.pool = &sc->sc_iopool; bzero(&saa, sizeof(saa)); saa.saa_sc_link = &sc->sc_scsi_link; + saa.saa_targets = sc->sc_nunits; sc->sc_scsibus = (struct scsibus_softc *)config_found(self, &saa, scsiprint); diff --git a/sys/dev/pci/mpii.c b/sys/dev/pci/mpii.c index d1be9cbe1f1..1e227a6ae65 100644 --- a/sys/dev/pci/mpii.c +++ b/sys/dev/pci/mpii.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mpii.c,v 1.43 2011/06/17 07:06:47 mk Exp $ */ +/* $OpenBSD: mpii.c,v 1.44 2011/07/08 22:09:27 matthew Exp $ */ /* * Copyright (c) 2010 Mike Belopuhov <mkb@crypt.org.ru> * Copyright (c) 2009 James Giannoules @@ -2246,13 +2246,13 @@ mpii_attach(struct device *parent, struct device *self, void *aux) sc->sc_link.adapter = &mpii_switch; sc->sc_link.adapter_softc = sc; sc->sc_link.adapter_target = -1; - sc->sc_link.adapter_buswidth = sc->sc_max_devices; - sc->sc_link.luns = 1; sc->sc_link.openings = sc->sc_request_depth - 1; sc->sc_link.pool = &sc->sc_iopool; bzero(&saa, sizeof(saa)); saa.saa_sc_link = &sc->sc_link; + saa.saa_targets = sc->sc_max_devices; + saa.saa_luns = 1; /* config_found() returns the scsibus attached to us */ sc->sc_scsibus = (struct scsibus_softc *) config_found(&sc->sc_dev, |