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@

4 files changed, 9 insertions, 9 deletions

diff --git a/sys/arch/mvme68k/dev/vsbic.c b/sys/arch/mvme68k/dev/vsbic.c
index a20fbff178b..f1387d69e8d 100644
--- a/sys/arch/mvme68k/dev/vsbic.c
+++ b/sys/arch/mvme68k/dev/vsbic.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vsbic.c,v 1.6 2010/06/28 18:31:01 krw Exp $	*/
+/*	$OpenBSD: vsbic.c,v 1.7 2011/07/08 22:09:26 matthew Exp $	*/
 
 /*
  * Copyright (c) 2008, 2009  Miodrag Vallat.
@@ -537,13 +537,13 @@ vsbic_attach(struct device *parent, struct device *self, void *args)
 	vmeintr_establish(sc->sc_vec, &sc->sc_ih, DEVNAME(sc));
 
 	sc->sc_link.adapter = &vsbic_swtch;
-	sc->sc_link.adapter_buswidth = 8;
 	sc->sc_link.adapter_softc = sc;
 	sc->sc_link.adapter_target = sc->sc_id;
 	sc->sc_link.openings = VSBIC_NUMOPENINGS;
 
 	bzero(&saa, sizeof saa);
 	saa.saa_sc_link = &sc->sc_link;
+	saa.saa_targets = 8;
 
 	tmp = bootpart;
 	if (ca->ca_paddr != bootaddr)
diff --git a/sys/arch/mvme88k/dev/vsbic.c b/sys/arch/mvme88k/dev/vsbic.c
index d90d2702e9f..985ca0ff60a 100644
--- a/sys/arch/mvme88k/dev/vsbic.c
+++ b/sys/arch/mvme88k/dev/vsbic.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vsbic.c,v 1.7 2010/06/28 18:31:01 krw Exp $	*/
+/*	$OpenBSD: vsbic.c,v 1.8 2011/07/08 22:09:27 matthew Exp $	*/
 
 /*
  * Copyright (c) 2008, 2009  Miodrag Vallat.
@@ -537,13 +537,13 @@ vsbic_attach(struct device *parent, struct device *self, void *args)
 	vmeintr_establish(sc->sc_vec, &sc->sc_ih, DEVNAME(sc));
 
 	sc->sc_link.adapter = &vsbic_swtch;
-	sc->sc_link.adapter_buswidth = 8;
 	sc->sc_link.adapter_softc = sc;
 	sc->sc_link.adapter_target = sc->sc_id;
 	sc->sc_link.openings = VSBIC_NUMOPENINGS;
 
 	bzero(&saa, sizeof saa);
 	saa.saa_sc_link = &sc->sc_link;
+	saa.saa_targets = 8;
 
 	tmp = bootpart;
 	if (ca->ca_paddr != bootaddr)
diff --git a/sys/arch/sparc64/dev/vdsk.c b/sys/arch/sparc64/dev/vdsk.c
index 406e37c85d3..d3adc1e0faf 100644
--- a/sys/arch/sparc64/dev/vdsk.c
+++ b/sys/arch/sparc64/dev/vdsk.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vdsk.c,v 1.27 2011/01/01 20:49:53 kettenis Exp $	*/
+/*	$OpenBSD: vdsk.c,v 1.28 2011/07/08 22:09:27 matthew Exp $	*/
 /*
  * Copyright (c) 2009, 2011 Mark Kettenis
  *
@@ -342,13 +342,13 @@ vdsk_attach(struct device *parent, struct device *self, void *aux)
 
 	sc->sc_link.adapter = &sc->sc_switch;
 	sc->sc_link.adapter_softc = self;
-	sc->sc_link.adapter_buswidth = 2;
-	sc->sc_link.luns = 1; /* XXX slices should be presented as luns? */
 	sc->sc_link.adapter_target = 2;
 	sc->sc_link.openings = sc->sc_vd->vd_nentries - 1;
 
 	bzero(&saa, sizeof(saa));
 	saa.saa_sc_link = &sc->sc_link;
+	saa.saa_targets = 2;
+	saa.saa_luns = 1; /* XXX slices should be presented as luns? */
 	config_found(self, &saa, scsiprint);
 
 	return;
diff --git a/sys/arch/vax/dec/sii.c b/sys/arch/vax/dec/sii.c
index d86ab79874c..1a7a801d547 100644
--- a/sys/arch/vax/dec/sii.c
+++ b/sys/arch/vax/dec/sii.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sii.c,v 1.11 2010/06/28 18:31:01 krw Exp $	*/
+/*	$OpenBSD: sii.c,v 1.12 2011/07/08 22:09:27 matthew Exp $	*/
 /*	$NetBSD: sii.c,v 1.42 2000/06/02 20:20:29 mhitch Exp $	*/
 /*
  * Copyright (c) 2008 Miodrag Vallat.
@@ -198,7 +198,6 @@ sii_attach(sc)
 	 * fill in the prototype scsi_link.
 	 */
 	sc->sc_link.adapter = &sii_scsiswitch;
-	sc->sc_link.adapter_buswidth = 8;
 	sc->sc_link.adapter_softc = sc;
 	sc->sc_link.adapter_target = sc->sc_regs->id & SII_IDMSK;
 	sc->sc_link.openings = 1;	/* driver can't queue requests yet */
@@ -208,6 +207,7 @@ sii_attach(sc)
 	 */
 	bzero(&saa, sizeof(saa));
 	saa.saa_sc_link = &sc->sc_link;
+	saa.saa_targets = 8;
 	config_found(&sc->sc_dev, &saa, scsiprint);
 }