diff options
| author | Matthew Dempsky <matthew@cvs.openbsd.org> | 2011-07-17 22:46:49 +0000 |
|---|---|---|
| committer | Matthew Dempsky <matthew@cvs.openbsd.org> | 2011-07-17 22:46:49 +0000 |
| commit | 45908bcfad1d066ecbb07b0eeadb930912bd0696 (patch) | |
| tree | 47024f3c9b6743f3e1c411175046dcd9f8e21030 /sys/dev/ic/gdt_common.c | |
| parent | d923b4b88f795933bd6165856e848abc5bbcd161 (diff) | |
Backout a bunch of my SCSI commits from c2k11. At least one of these
is causing problems when trying to boot sparc64 from an isp(4).
Verified to fix the sparc64/isp(4) regression by krw@; ok deraadt@
Diffstat (limited to 'sys/dev/ic/gdt_common.c')
| -rw-r--r-- | sys/dev/ic/gdt_common.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/dev/ic/gdt_common.c b/sys/dev/ic/gdt_common.c index 77233069b0f..4c168be0c6b 100644 --- a/sys/dev/ic/gdt_common.c +++ b/sys/dev/ic/gdt_common.c @@ -1,4 +1,4 @@ -/* $OpenBSD: gdt_common.c,v 1.59 2011/07/09 01:50:41 matthew Exp $ */ +/* $OpenBSD: gdt_common.c,v 1.60 2011/07/17 22:46:48 matthew Exp $ */ /* * Copyright (c) 1999, 2000, 2003 Niklas Hallqvist. All rights reserved. @@ -156,7 +156,9 @@ gdt_attach(struct gdt_softc *sc) sc->sc_link.adapter_softc = sc; sc->sc_link.adapter = &gdt_switch; /* openings will be filled in later. */ - sc->sc_link.adapter_target = SCSI_NO_ADAPTER_TARGET; + sc->sc_link.adapter_buswidth = + (sc->sc_class & GDT_FC) ? GDT_MAXID : GDT_MAX_HDRIVES; + sc->sc_link.adapter_target = sc->sc_link.adapter_buswidth; sc->sc_link.pool = &sc->sc_iopool; if (!gdt_internal_cmd(sc, GDT_SCREENSERVICE, GDT_INIT, 0, 0, 0)) { @@ -478,7 +480,6 @@ gdt_attach(struct gdt_softc *sc) bzero(&saa, sizeof(saa)); saa.saa_sc_link = &sc->sc_link; - saa.saa_targets = (sc->sc_class & GDT_FC) ? GDT_MAXID : GDT_MAX_HDRIVES; config_found(&sc->sc_dev, &saa, scsiprint); |