These don't need linear mappings either.

8 files changed, 42 insertions, 69 deletions

diff --git a/sys/dev/sbus/be.c b/sys/dev/sbus/be.c
index c4019da229f..b8dc96aa2a6 100644
--- a/sys/dev/sbus/be.c
+++ b/sys/dev/sbus/be.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: be.c,v 1.12 2003/06/24 21:54:38 henric Exp $	*/
+/*	$OpenBSD: be.c,v 1.13 2003/06/27 01:36:53 jason Exp $	*/
 /*	$NetBSD: be.c,v 1.26 2001/03/20 15:39:20 pk Exp $	*/
 
 /*-
@@ -249,29 +249,23 @@ beattach(parent, self, aux)
 		return;
 	}
 
-	if (sbus_bus_map(sa->sa_bustag,
-	    sa->sa_reg[0].sbr_slot,
+	if (sbus_bus_map(sa->sa_bustag, sa->sa_reg[0].sbr_slot,
 	    (bus_addr_t)sa->sa_reg[0].sbr_offset,
-	    (bus_size_t)sa->sa_reg[0].sbr_size,
-	    BUS_SPACE_MAP_LINEAR, 0, &sc->sc_cr) != 0) {
+	    (bus_size_t)sa->sa_reg[0].sbr_size, 0, 0, &sc->sc_cr) != 0) {
 		printf("beattach: cannot map registers\n");
 		return;
 	}
 
-	if (sbus_bus_map(sa->sa_bustag,
-	    sa->sa_reg[1].sbr_slot,
+	if (sbus_bus_map(sa->sa_bustag, sa->sa_reg[1].sbr_slot,
 	    (bus_addr_t)sa->sa_reg[1].sbr_offset,
-	    (bus_size_t)sa->sa_reg[1].sbr_size,
-	    BUS_SPACE_MAP_LINEAR, 0, &sc->sc_br) != 0) {
+	    (bus_size_t)sa->sa_reg[1].sbr_size, 0, 0, &sc->sc_br) != 0) {
 		printf("beattach: cannot map registers\n");
 		return;
 	}
 
-	if (sbus_bus_map(sa->sa_bustag,
-	    sa->sa_reg[2].sbr_slot,
+	if (sbus_bus_map(sa->sa_bustag, sa->sa_reg[2].sbr_slot,
 	    (bus_addr_t)sa->sa_reg[2].sbr_offset,
-	    (bus_size_t)sa->sa_reg[2].sbr_size,
-	    BUS_SPACE_MAP_LINEAR, 0, &sc->sc_tr) != 0) {
+	    (bus_size_t)sa->sa_reg[2].sbr_size, 0, 0, &sc->sc_tr) != 0) {
 		printf("beattach: cannot map registers\n");
 		return;
 	}
diff --git a/sys/dev/sbus/bwtwo.c b/sys/dev/sbus/bwtwo.c
index cd9fee69d8d..0c7e30d35c7 100644
--- a/sys/dev/sbus/bwtwo.c
+++ b/sys/dev/sbus/bwtwo.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bwtwo.c,v 1.9 2003/06/18 17:35:30 miod Exp $	*/
+/*	$OpenBSD: bwtwo.c,v 1.10 2003/06/27 01:36:53 jason Exp $	*/
 
 /*
  * Copyright (c) 2002 Jason L. Wright (jason@thought.net)
@@ -188,8 +188,7 @@ bwtwoattach(parent, self, aux)
 	 */
 	if (sbus_bus_map(sa->sa_bustag, sa->sa_reg[0].sbr_slot,
 	    sa->sa_reg[0].sbr_offset + BWTWO_CTRL_OFFSET,
-	    BWTWO_CTRL_SIZE, BUS_SPACE_MAP_LINEAR,
-	    0, &sc->sc_ctrl_regs) != 0) {
+	    BWTWO_CTRL_SIZE, 0, 0, &sc->sc_ctrl_regs) != 0) {
 		printf(": cannot map ctrl registers\n");
 		goto fail_ctrl;
 	}
diff --git a/sys/dev/sbus/cgthree.c b/sys/dev/sbus/cgthree.c
index 862ce4008af..0a02d44b3a8 100644
--- a/sys/dev/sbus/cgthree.c
+++ b/sys/dev/sbus/cgthree.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cgthree.c,v 1.32 2003/06/18 17:35:30 miod Exp $	*/
+/*	$OpenBSD: cgthree.c,v 1.33 2003/06/27 01:36:53 jason Exp $	*/
 
 /*
  * Copyright (c) 2001 Jason L. Wright (jason@thought.net)
@@ -246,8 +246,7 @@ cgthreeattach(parent, self, aux)
 	 */
 	if (sbus_bus_map(sa->sa_bustag, sa->sa_reg[0].sbr_slot,
 	    sa->sa_reg[0].sbr_offset + CGTHREE_CTRL_OFFSET,
-	    CGTHREE_CTRL_SIZE, BUS_SPACE_MAP_LINEAR,
-	    0, &sc->sc_ctrl_regs) != 0) {
+	    CGTHREE_CTRL_SIZE, 0, 0, &sc->sc_ctrl_regs) != 0) {
 		printf(": cannot map ctrl registers\n");
 		goto fail_ctrl;
 	}
diff --git a/sys/dev/sbus/esp_sbus.c b/sys/dev/sbus/esp_sbus.c
index 92df84fa857..768316411a1 100644
--- a/sys/dev/sbus/esp_sbus.c
+++ b/sys/dev/sbus/esp_sbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: esp_sbus.c,v 1.13 2003/06/24 21:54:38 henric Exp $	*/
+/*	$OpenBSD: esp_sbus.c,v 1.14 2003/06/27 01:36:53 jason Exp $	*/
 /*	$NetBSD: esp_sbus.c,v 1.14 2001/04/25 17:53:37 bouyer Exp $	*/
 
 /*-
@@ -401,7 +401,7 @@ espattach_dma(parent, self, aux)
 		}
 	} else {
 		if (sbus_bus_map(sa->sa_bustag, sa->sa_slot, sa->sa_offset,
-		    sa->sa_size, BUS_SPACE_MAP_LINEAR, 0, &esc->sc_reg) != 0) {
+		    sa->sa_size, 0, 0, &esc->sc_reg) != 0) {
 			printf("%s @ dma: cannot map registers\n",
 				self->dv_xname);
 			return;
diff --git a/sys/dev/sbus/if_hme_sbus.c b/sys/dev/sbus/if_hme_sbus.c
index a262f0a2307..e3c035db6b4 100644
--- a/sys/dev/sbus/if_hme_sbus.c
+++ b/sys/dev/sbus/if_hme_sbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_hme_sbus.c,v 1.5 2003/06/24 21:54:38 henric Exp $	*/
+/*	$OpenBSD: if_hme_sbus.c,v 1.6 2003/06/27 01:36:53 jason Exp $	*/
 /*	$NetBSD: if_hme_sbus.c,v 1.6 2001/02/28 14:52:48 mrg Exp $	*/
 
 /*-
@@ -133,43 +133,33 @@ hmeattach_sbus(parent, self, aux)
 	 *	bank 4: HME MIF registers
 	 *
 	 */
-	if (sbus_bus_map(sa->sa_bustag,
-			 sa->sa_reg[0].sbr_slot,
-			 (bus_addr_t)sa->sa_reg[0].sbr_offset,
-			 (bus_size_t)sa->sa_reg[0].sbr_size,
-			 BUS_SPACE_MAP_LINEAR, 0, &sc->sc_seb) != 0) {
+	if (sbus_bus_map(sa->sa_bustag, sa->sa_reg[0].sbr_slot,
+	    (bus_addr_t)sa->sa_reg[0].sbr_offset,
+	    (bus_size_t)sa->sa_reg[0].sbr_size, 0, 0, &sc->sc_seb) != 0) {
 		printf("%s @ sbus: cannot map registers\n", self->dv_xname);
 		return;
 	}
-	if (sbus_bus_map(sa->sa_bustag,
-			 sa->sa_reg[1].sbr_slot,
-			 (bus_addr_t)sa->sa_reg[1].sbr_offset,
-			 (bus_size_t)sa->sa_reg[1].sbr_size,
-			 BUS_SPACE_MAP_LINEAR, 0, &sc->sc_etx) != 0) {
+	if (sbus_bus_map(sa->sa_bustag, sa->sa_reg[1].sbr_slot,
+	    (bus_addr_t)sa->sa_reg[1].sbr_offset,
+	    (bus_size_t)sa->sa_reg[1].sbr_size, 0, 0, &sc->sc_etx) != 0) {
 		printf("%s @ sbus: cannot map registers\n", self->dv_xname);
 		return;
 	}
-	if (sbus_bus_map(sa->sa_bustag,
-			 sa->sa_reg[2].sbr_slot,
-			 (bus_addr_t)sa->sa_reg[2].sbr_offset,
-			 (bus_size_t)sa->sa_reg[2].sbr_size,
-			 BUS_SPACE_MAP_LINEAR, 0, &sc->sc_erx) != 0) {
+	if (sbus_bus_map(sa->sa_bustag, sa->sa_reg[2].sbr_slot,
+	    (bus_addr_t)sa->sa_reg[2].sbr_offset,
+	    (bus_size_t)sa->sa_reg[2].sbr_size, 0, 0, &sc->sc_erx) != 0) {
 		printf("%s @ sbus: cannot map registers\n", self->dv_xname);
 		return;
 	}
-	if (sbus_bus_map(sa->sa_bustag,
-			 sa->sa_reg[3].sbr_slot,
-			 (bus_addr_t)sa->sa_reg[3].sbr_offset,
-			 (bus_size_t)sa->sa_reg[3].sbr_size,
-			 BUS_SPACE_MAP_LINEAR, 0, &sc->sc_mac) != 0) {
+	if (sbus_bus_map(sa->sa_bustag, sa->sa_reg[3].sbr_slot,
+	    (bus_addr_t)sa->sa_reg[3].sbr_offset,
+	    (bus_size_t)sa->sa_reg[3].sbr_size, 0, 0, &sc->sc_mac) != 0) {
 		printf("%s @ sbus: cannot map registers\n", self->dv_xname);
 		return;
 	}
-	if (sbus_bus_map(sa->sa_bustag,
-			 sa->sa_reg[4].sbr_slot,
-			 (bus_addr_t)sa->sa_reg[4].sbr_offset,
-			 (bus_size_t)sa->sa_reg[4].sbr_size,
-			 BUS_SPACE_MAP_LINEAR, 0, &sc->sc_mif) != 0) {
+	if (sbus_bus_map(sa->sa_bustag, sa->sa_reg[4].sbr_slot,
+	    (bus_addr_t)sa->sa_reg[4].sbr_offset,
+	    (bus_size_t)sa->sa_reg[4].sbr_size, 0, 0, &sc->sc_mif) != 0) {
 		printf("%s @ sbus: cannot map registers\n", self->dv_xname);
 		return;
 	}
diff --git a/sys/dev/sbus/magma.c b/sys/dev/sbus/magma.c
index 6ca73ea9deb..86882909565 100644
--- a/sys/dev/sbus/magma.c
+++ b/sys/dev/sbus/magma.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: magma.c,v 1.8 2003/06/24 21:54:38 henric Exp $	*/
+/*	$OpenBSD: magma.c,v 1.9 2003/06/27 01:36:53 jason Exp $	*/
 /*
  * magma.c
  *
@@ -356,7 +356,7 @@ magma_attach(parent, dev, aux)
 
 	if (sbus_bus_map(sa->sa_bustag, sa->sa_reg[0].sbr_slot,
 	    sa->sa_reg[0].sbr_offset, sa->sa_reg[0].sbr_size,
-	    BUS_SPACE_MAP_LINEAR, 0, &sc->sc_iohandle) != 0) {
+	    0, 0, &sc->sc_iohandle) != 0) {
 		printf(": can't map registers\n");
 		return;
 	}
diff --git a/sys/dev/sbus/qe.c b/sys/dev/sbus/qe.c
index 2dc9a75177e..3318083c5e8 100644
--- a/sys/dev/sbus/qe.c
+++ b/sys/dev/sbus/qe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: qe.c,v 1.13 2003/06/24 21:54:38 henric Exp $	*/
+/*	$OpenBSD: qe.c,v 1.14 2003/06/27 01:36:53 jason Exp $	*/
 /*	$NetBSD: qe.c,v 1.16 2001/03/30 17:30:18 christos Exp $	*/
 
 /*-
@@ -216,20 +216,16 @@ qeattach(parent, self, aux)
 		return;
 	}
 
-	if (sbus_bus_map(sa->sa_bustag,
-	    sa->sa_reg[0].sbr_slot,
+	if (sbus_bus_map(sa->sa_bustag, sa->sa_reg[0].sbr_slot,
 	    (bus_addr_t)sa->sa_reg[0].sbr_offset,
-	    (bus_size_t)sa->sa_reg[0].sbr_size,
-	    BUS_SPACE_MAP_LINEAR, 0, &sc->sc_cr) != 0) {
+	    (bus_size_t)sa->sa_reg[0].sbr_size, 0, 0, &sc->sc_cr) != 0) {
 		printf("%s: cannot map registers\n", self->dv_xname);
 		return;
 	}
 
-	if (sbus_bus_map(sa->sa_bustag,
-	    sa->sa_reg[1].sbr_slot,
+	if (sbus_bus_map(sa->sa_bustag, sa->sa_reg[1].sbr_slot,
 	    (bus_addr_t)sa->sa_reg[1].sbr_offset,
-	    (bus_size_t)sa->sa_reg[1].sbr_size,
-	    BUS_SPACE_MAP_LINEAR, 0, &sc->sc_mr) != 0) {
+	    (bus_size_t)sa->sa_reg[1].sbr_size, 0, 0, &sc->sc_mr) != 0) {
 		printf("%s: cannot map registers\n", self->dv_xname);
 		return;
 	}
diff --git a/sys/dev/sbus/qec.c b/sys/dev/sbus/qec.c
index 69da81a219b..ec2c920ac84 100644
--- a/sys/dev/sbus/qec.c
+++ b/sys/dev/sbus/qec.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: qec.c,v 1.7 2003/06/24 21:54:38 henric Exp $	*/
+/*	$OpenBSD: qec.c,v 1.8 2003/06/27 01:36:53 jason Exp $	*/
 /*	$NetBSD: qec.c,v 1.12 2000/12/04 20:12:55 fvdl Exp $ */
 
 /*-
@@ -136,11 +136,9 @@ qecattach(parent, self, aux)
 		return;
 	}
 
-	if (sbus_bus_map(sa->sa_bustag,
-			 sa->sa_reg[0].sbr_slot,
-			 sa->sa_reg[0].sbr_offset,
-			 sa->sa_reg[0].sbr_size,
-			 BUS_SPACE_MAP_LINEAR, 0, &sc->sc_regs) != 0) {
+	if (sbus_bus_map(sa->sa_bustag, sa->sa_reg[0].sbr_slot,
+	    sa->sa_reg[0].sbr_offset, sa->sa_reg[0].sbr_size,
+	    0, 0, &sc->sc_regs) != 0) {
 		printf("%s: attach: cannot map registers\n", self->dv_xname);
 		return;
 	}
@@ -150,11 +148,8 @@ qecattach(parent, self, aux)
 	 * Lance ring-buffers can be stored. Note the buffer's location
 	 * and size, so the child driver can pick them up.
 	 */
-	if (sbus_bus_map(sa->sa_bustag,
-			 sa->sa_reg[1].sbr_slot,
-			 sa->sa_reg[1].sbr_offset,
-			 sa->sa_reg[1].sbr_size,
-			 BUS_SPACE_MAP_LINEAR, 0, &bh) != 0) {
+	if (sbus_bus_map(sa->sa_bustag, sa->sa_reg[1].sbr_slot,
+	    sa->sa_reg[1].sbr_offset, sa->sa_reg[1].sbr_size, 0, 0, &bh) != 0) {
 		printf("%s: attach: cannot map registers\n", self->dv_xname);
 		return;
 	}