Use SDEV_NO_ADAPTER_TARGET instead of the value that is being

aassigned to adapter_buswidth to indicate the adapter is not a target
on the bus.

ok dlg@ as part of a larger diff.

5 files changed, 11 insertions, 11 deletions

diff --git a/sys/dev/ic/aac.c b/sys/dev/ic/aac.c
index 8cceb1e81ce..529b1c70dac 100644
--- a/sys/dev/ic/aac.c
+++ b/sys/dev/ic/aac.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aac.c,v 1.76 2020/02/18 16:05:56 krw Exp $	*/
+/*	$OpenBSD: aac.c,v 1.77 2020/06/24 18:59:30 krw Exp $	*/
 
 /*-
  * Copyright (c) 2000 Michael Smith
@@ -272,7 +272,7 @@ aac_attach(struct aac_softc *sc)
 	sc->aac_link.openings = (sc->total_fibs - 8) /
 	    (sc->aac_container_count ? sc->aac_container_count : 1);
 	sc->aac_link.adapter_buswidth = AAC_MAX_CONTAINERS;
-	sc->aac_link.adapter_target = AAC_MAX_CONTAINERS;
+	sc->aac_link.adapter_target = SDEV_NO_ADAPTER_TARGET;
 	sc->aac_link.pool = &sc->aac_iopool;
 
 	bzero(&saa, sizeof(saa));
diff --git a/sys/dev/ic/ami.c b/sys/dev/ic/ami.c
index 6e655074757..4430e2afbf7 100644
--- a/sys/dev/ic/ami.c
+++ b/sys/dev/ic/ami.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ami.c,v 1.241 2020/02/15 18:02:00 krw Exp $	*/
+/*	$OpenBSD: ami.c,v 1.242 2020/06/24 18:59:30 krw Exp $	*/
 
 /*
  * Copyright (c) 2001 Michael Shalayeff
@@ -519,7 +519,7 @@ ami_attach(struct ami_softc *sc)
 
 	sc->sc_link.adapter_softc = sc;
 	sc->sc_link.adapter = &ami_switch;
-	sc->sc_link.adapter_target = sc->sc_maxunits;
+	sc->sc_link.adapter_target = SDEV_NO_ADAPTER_TARGET;
 	sc->sc_link.adapter_buswidth = sc->sc_maxunits;
 	sc->sc_link.pool = &sc->sc_iopool;
 
@@ -586,7 +586,7 @@ ami_attach(struct ami_softc *sc)
 		rsc->sc_link.adapter = &ami_raw_switch;
 		rsc->sc_proctarget = -1;
 		/* TODO fetch it from the controller */
-		rsc->sc_link.adapter_target = 16;
+		rsc->sc_link.adapter_target = SDEV_NO_ADAPTER_TARGET;
 		rsc->sc_link.adapter_buswidth = 16;
 		rsc->sc_link.pool = &sc->sc_iopool;
 
diff --git a/sys/dev/ic/cac.c b/sys/dev/ic/cac.c
index 51d6a21701f..0fd85c90076 100644
--- a/sys/dev/ic/cac.c
+++ b/sys/dev/ic/cac.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cac.c,v 1.59 2020/02/15 18:02:00 krw Exp $	*/
+/*	$OpenBSD: cac.c,v 1.60 2020/06/24 18:59:30 krw Exp $	*/
 /*	$NetBSD: cac.c,v 1.15 2000/11/08 19:20:35 ad Exp $	*/
 
 /*
@@ -238,7 +238,7 @@ cac_init(struct cac_softc *sc, int startfw)
 
 	sc->sc_link.adapter_softc = sc;
 	sc->sc_link.adapter = &cac_switch;
-	sc->sc_link.adapter_target = cinfo.num_drvs;
+	sc->sc_link.adapter_target = SDEV_NO_ADAPTER_TARGET;
 	sc->sc_link.adapter_buswidth = cinfo.num_drvs;
 	sc->sc_link.openings = CAC_MAX_CCBS / sc->sc_nunits;
 	if (sc->sc_link.openings < 4 )
diff --git a/sys/dev/ic/ciss.c b/sys/dev/ic/ciss.c
index 522ea1a4aaa..529f8bd6dba 100644
--- a/sys/dev/ic/ciss.c
+++ b/sys/dev/ic/ciss.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ciss.c,v 1.81 2020/02/13 15:11:32 krw Exp $	*/
+/*	$OpenBSD: ciss.c,v 1.82 2020/06/24 18:59:30 krw Exp $	*/
 
 /*
  * Copyright (c) 2005,2006 Michael Shalayeff
@@ -357,7 +357,7 @@ ciss_attach(struct ciss_softc *sc)
 	sc->sc_link.openings = sc->maxcmd;
 	sc->sc_link.adapter = &ciss_switch;
 	sc->sc_link.luns = 1;
-	sc->sc_link.adapter_target = sc->maxunits;
+	sc->sc_link.adapter_target = SDEV_NO_ADAPTER_TARGET;
 	sc->sc_link.adapter_buswidth = sc->maxunits;
 	sc->sc_link.pool = &sc->sc_iopool;
 	bzero(&saa, sizeof(saa));
diff --git a/sys/dev/ic/twe.c b/sys/dev/ic/twe.c
index 6b6a8a6f30a..ad17f0b33d3 100644
--- a/sys/dev/ic/twe.c
+++ b/sys/dev/ic/twe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: twe.c,v 1.51 2020/02/15 18:02:00 krw Exp $	*/
+/*	$OpenBSD: twe.c,v 1.52 2020/06/24 18:59:30 krw Exp $	*/
 
 /*
  * Copyright (c) 2000-2002 Michael Shalayeff.  All rights reserved.
@@ -396,7 +396,7 @@ twe_attach(sc)
 
 	sc->sc_link.adapter_softc = sc;
 	sc->sc_link.adapter = &twe_switch;
-	sc->sc_link.adapter_target = TWE_MAX_UNITS;
+	sc->sc_link.adapter_target = SDEV_NO_ADAPTER_TARGET;
 	sc->sc_link.openings = TWE_MAXCMDS / nunits;
 	sc->sc_link.adapter_buswidth = TWE_MAX_UNITS;
 	sc->sc_link.pool = &sc->sc_iopool;