Don't use a single static struct alpha_bus_space since there are machines

that can have more than one system bus attached to mainbus

28 files changed, 345 insertions, 352 deletions

diff --git a/sys/arch/alpha/alpha/api_up1000.c b/sys/arch/alpha/alpha/api_up1000.c
index ebc4775ba9a..6afe874496e 100644
--- a/sys/arch/alpha/alpha/api_up1000.c
+++ b/sys/arch/alpha/alpha/api_up1000.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: api_up1000.c,v 1.3 2001/12/13 19:13:22 nate Exp $	*/
+/*	$OpenBSD: api_up1000.c,v 1.4 2001/12/14 00:44:59 nate Exp $	*/
 /* $NetBSD: api_up1000.c,v 1.4 2000/06/20 03:48:53 matt Exp $ */
 
 /*
@@ -118,7 +118,7 @@ api_up1000_cons_init()
 			 */
 			DELAY(160000000 / comcnrate);
 
-			if (comcnattach(icp->ic_iot, 0x3f8, comcnrate,
+			if (comcnattach(&icp->ic_iot, 0x3f8, comcnrate,
 			    COM_FREQ,
 			    (TTYDEF_CFLAG & ~(CSIZE | PARENB)) | CS8))
 				panic("can't init serial console");
@@ -130,14 +130,14 @@ api_up1000_cons_init()
 #if NPCKBD > 0
 		/* display console ... */
 		/* XXX */
-		(void) pckbc_cnattach(icp->ic_iot, IO_KBD, KBCMDP,
+		(void) pckbc_cnattach(&icp->ic_iot, IO_KBD, KBCMDP,
 		    PCKBC_KBD_SLOT);
 
 		if (CTB_TURBOSLOT_TYPE(ctb->ctb_turboslot) ==
 		    CTB_TURBOSLOT_TYPE_ISA)
-			isa_display_console(icp->ic_iot, icp->ic_memt);
+			isa_display_console(&icp->ic_iot, &icp->ic_memt);
 		else
-			pci_display_console(icp->ic_iot, icp->ic_memt,
+			pci_display_console(&icp->ic_iot, &icp->ic_memt,
 			    &icp->ic_pc, CTB_TURBOSLOT_BUS(ctb->ctb_turboslot),
 			    CTB_TURBOSLOT_SLOT(ctb->ctb_turboslot), 0);
 #else
diff --git a/sys/arch/alpha/alpha/dec_2100_a50.c b/sys/arch/alpha/alpha/dec_2100_a50.c
index 17092292fde..08fbafb4586 100644
--- a/sys/arch/alpha/alpha/dec_2100_a50.c
+++ b/sys/arch/alpha/alpha/dec_2100_a50.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dec_2100_a50.c,v 1.13 2001/12/13 19:13:22 nate Exp $ */
+/* $OpenBSD: dec_2100_a50.c,v 1.14 2001/12/14 00:44:59 nate Exp $ */
 /* $NetBSD: dec_2100_a50.c,v 1.43 2000/05/22 20:13:31 thorpej Exp $ */
 
 /*
@@ -127,7 +127,7 @@ dec_2100_a50_cons_init()
 			 */
 			DELAY(160000000 / comcnrate);
 
-			if(comcnattach(acp->ac_iot, 0x3f8, comcnrate,
+			if(comcnattach(&acp->ac_iot, 0x3f8, comcnrate,
 			    COM_FREQ,
 			    (TTYDEF_CFLAG & ~(CSIZE | PARENB)) | CS8))
 				panic("can't init serial console");
@@ -139,14 +139,14 @@ dec_2100_a50_cons_init()
 #if NPCKBD > 0
 		/* display console ... */
 		/* XXX */
-		(void) pckbc_cnattach(acp->ac_iot, IO_KBD, KBCMDP,
+		(void) pckbc_cnattach(&acp->ac_iot, IO_KBD, KBCMDP,
 		    PCKBC_KBD_SLOT);
 
 		if (CTB_TURBOSLOT_TYPE(ctb->ctb_turboslot) ==
 		    CTB_TURBOSLOT_TYPE_ISA)
-			isa_display_console(acp->ac_iot, acp->ac_memt);
+			isa_display_console(&acp->ac_iot, &acp->ac_memt);
 		else
-			pci_display_console(acp->ac_iot, acp->ac_memt,
+			pci_display_console(&acp->ac_iot, &acp->ac_memt,
 			    &acp->ac_pc, CTB_TURBOSLOT_BUS(ctb->ctb_turboslot),
 			    CTB_TURBOSLOT_SLOT(ctb->ctb_turboslot), 0);
 #else
diff --git a/sys/arch/alpha/alpha/dec_550.c b/sys/arch/alpha/alpha/dec_550.c
index 0835419e16b..5f65ee2e9b7 100644
--- a/sys/arch/alpha/alpha/dec_550.c
+++ b/sys/arch/alpha/alpha/dec_550.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dec_550.c,v 1.5 2001/09/29 03:20:46 millert Exp $ */
+/* $OpenBSD: dec_550.c,v 1.6 2001/12/14 00:44:59 nate Exp $ */
 /* $NetBSD: dec_550.c,v 1.10 2000/06/20 03:48:53 matt Exp $ */
 
 /*
@@ -119,7 +119,7 @@ dec_550_cons_init()
 			 */
 			DELAY(160000000 / comcnrate);
 
-			if(comcnattach(ccp->cc_iot, 0x3f8, comcnrate,
+			if(comcnattach(&ccp->cc_iot, 0x3f8, comcnrate,
 			    COM_FREQ,
 			    (TTYDEF_CFLAG & ~(CSIZE | PARENB)) | CS8))
 				panic("can't init serial console");
@@ -131,14 +131,14 @@ dec_550_cons_init()
 #if NPCKBD > 0
 		/* display console ... */
 		/* XXX */
-		(void) pckbc_cnattach(ccp->cc_iot, IO_KBD, KBCMDP,
+		(void) pckbc_cnattach(&ccp->cc_iot, IO_KBD, KBCMDP,
 		    PCKBC_KBD_SLOT);
 
 		if (CTB_TURBOSLOT_TYPE(ctb->ctb_turboslot) ==
 		    CTB_TURBOSLOT_TYPE_ISA)
-			isa_display_console(ccp->cc_iot, ccp->cc_memt);
+			isa_display_console(&ccp->cc_iot, &ccp->cc_memt);
 		else
-			pci_display_console(ccp->cc_iot, ccp->cc_memt,
+			pci_display_console(&ccp->cc_iot, &ccp->cc_memt,
 			    &ccp->cc_pc, CTB_TURBOSLOT_BUS(ctb->ctb_turboslot),
 			    CTB_TURBOSLOT_SLOT(ctb->ctb_turboslot), 0);
 #else
diff --git a/sys/arch/alpha/alpha/dec_6600.c b/sys/arch/alpha/alpha/dec_6600.c
index a27130e0c86..5f975523b68 100644
--- a/sys/arch/alpha/alpha/dec_6600.c
+++ b/sys/arch/alpha/alpha/dec_6600.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dec_6600.c,v 1.3 2001/12/13 19:13:22 nate Exp $ */
+/* $OpenBSD: dec_6600.c,v 1.4 2001/12/14 00:44:59 nate Exp $ */
 /* $NetBSD: dec_6600.c,v 1.7 2000/06/20 03:48:54 matt Exp $ */
 
 /*
@@ -116,7 +116,7 @@ dec_6600_cons_init()
 			 */
 			DELAY(160000000 / comcnrate);
 
-			if(comcnattach(tsp->pc_iot, 0x3f8, comcnrate,
+			if(comcnattach(&tsp->pc_iot, 0x3f8, comcnrate,
 			    COM_FREQ,
 			    (TTYDEF_CFLAG & ~(CSIZE | PARENB)) | CS8))
 				panic("can't init serial console");
@@ -128,17 +128,17 @@ dec_6600_cons_init()
 #if NPCKBD > 0
 		/* display console ... */
 		/* XXX */
-		(void) pckbc_cnattach(tsp->pc_iot, IO_KBD, KBCMDP,
+		(void) pckbc_cnattach(&tsp->pc_iot, IO_KBD, KBCMDP,
 		    PCKBC_KBD_SLOT);
 
 		if (CTB_TURBOSLOT_TYPE(ctbslot) ==
 		    CTB_TURBOSLOT_TYPE_ISA)
-			isa_display_console(tsp->pc_iot, tsp->pc_memt);
+			isa_display_console(&tsp->pc_iot, &tsp->pc_memt);
 		else {
 			/* The display PCI might be different */
 			tsp_console_hose = CTB_TURBOSLOT_HOSE(ctbslot);
 			tsp = tsp_init(0, tsp_console_hose);
-			pci_display_console(tsp->pc_iot, tsp->pc_memt,
+			pci_display_console(&tsp->pc_iot, &tsp->pc_memt,
 			    &tsp->pc_pc, CTB_TURBOSLOT_BUS(ctbslot),
 			    CTB_TURBOSLOT_SLOT(ctbslot), 0);
 		}
diff --git a/sys/arch/alpha/alpha/dec_axppci_33.c b/sys/arch/alpha/alpha/dec_axppci_33.c
index 381d207bfa3..f9306372f72 100644
--- a/sys/arch/alpha/alpha/dec_axppci_33.c
+++ b/sys/arch/alpha/alpha/dec_axppci_33.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dec_axppci_33.c,v 1.14 2001/12/13 19:13:22 nate Exp $ */
+/* $OpenBSD: dec_axppci_33.c,v 1.15 2001/12/14 00:44:59 nate Exp $ */
 /* $NetBSD: dec_axppci_33.c,v 1.44 2000/05/22 20:13:32 thorpej Exp $ */
 
 /*
@@ -120,7 +120,7 @@ dec_axppci_33_init()
 	platform.device_register = dec_axppci_33_device_register;
 
 	lcp = lca_preinit();
-	iot = lcp->lc_iot;
+	iot = &lcp->lc_iot;
 	if (bus_space_map(iot, NSIO_PORT, NSIO_SIZE, 0, &nsio))
 		return;
 
@@ -161,7 +161,7 @@ dec_axppci_33_cons_init()
 			 */
 			DELAY(160000000 / comcnrate);
 
-			if(comcnattach(lcp->lc_iot, 0x3f8, comcnrate,
+			if(comcnattach(&lcp->lc_iot, 0x3f8, comcnrate,
 			    COM_FREQ,
 			    (TTYDEF_CFLAG & ~(CSIZE | PARENB)) | CS8))
 				panic("can't init serial console");
@@ -173,14 +173,14 @@ dec_axppci_33_cons_init()
 #if NPCKBD > 0
 		/* display console ... */
 		/* XXX */
-		(void) pckbc_cnattach(lcp->lc_iot, IO_KBD, KBCMDP,
+		(void) pckbc_cnattach(&lcp->lc_iot, IO_KBD, KBCMDP,
 		    PCKBC_KBD_SLOT);
 
 		if (CTB_TURBOSLOT_TYPE(ctb->ctb_turboslot) ==
 		    CTB_TURBOSLOT_TYPE_ISA)
-			isa_display_console(lcp->lc_iot, lcp->lc_memt);
+			isa_display_console(&lcp->lc_iot, &lcp->lc_memt);
 		else
-			pci_display_console(lcp->lc_iot, lcp->lc_memt,
+			pci_display_console(&lcp->lc_iot, &lcp->lc_memt,
 			    &lcp->lc_pc, CTB_TURBOSLOT_BUS(ctb->ctb_turboslot),
 			    CTB_TURBOSLOT_SLOT(ctb->ctb_turboslot), 0);
 #else
diff --git a/sys/arch/alpha/alpha/dec_eb164.c b/sys/arch/alpha/alpha/dec_eb164.c
index 833b16f8355..35f2a937967 100644
--- a/sys/arch/alpha/alpha/dec_eb164.c
+++ b/sys/arch/alpha/alpha/dec_eb164.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dec_eb164.c,v 1.8 2001/12/13 19:13:22 nate Exp $ */
+/* $OpenBSD: dec_eb164.c,v 1.9 2001/12/14 00:44:59 nate Exp $ */
 /* $NetBSD: dec_eb164.c,v 1.33 2000/05/22 20:13:32 thorpej Exp $ */
 
 /*
@@ -113,7 +113,7 @@ dec_eb164_cons_init()
 			 */
 			DELAY(160000000 / comcnrate);
 
-			if(comcnattach(ccp->cc_iot, 0x3f8, comcnrate,
+			if(comcnattach(&ccp->cc_iot, 0x3f8, comcnrate,
 			    COM_FREQ,
 			    (TTYDEF_CFLAG & ~(CSIZE | PARENB)) | CS8))
 				panic("can't init serial console");
@@ -125,13 +125,13 @@ dec_eb164_cons_init()
 #if NPCKBD > 0
 		/* display console ... */
 		/* XXX */
-		(void) pckbc_cnattach(ccp->cc_iot, IO_KBD, KBCMDP,
+		(void) pckbc_cnattach(&ccp->cc_iot, IO_KBD, KBCMDP,
 		    PCKBC_KBD_SLOT);
 		if (CTB_TURBOSLOT_TYPE(ctb->ctb_turboslot) ==
 		    CTB_TURBOSLOT_TYPE_ISA)
-			isa_display_console(ccp->cc_iot, ccp->cc_memt);
+			isa_display_console(&ccp->cc_iot, &ccp->cc_memt);
 		else
-			pci_display_console(ccp->cc_iot, ccp->cc_memt,
+			pci_display_console(&ccp->cc_iot, &ccp->cc_memt,
 			    &ccp->cc_pc, CTB_TURBOSLOT_BUS(ctb->ctb_turboslot),
 			    CTB_TURBOSLOT_SLOT(ctb->ctb_turboslot), 0);
 #else
diff --git a/sys/arch/alpha/alpha/dec_kn20aa.c b/sys/arch/alpha/alpha/dec_kn20aa.c
index 182e39db629..f303babcce4 100644
--- a/sys/arch/alpha/alpha/dec_kn20aa.c
+++ b/sys/arch/alpha/alpha/dec_kn20aa.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dec_kn20aa.c,v 1.12 2001/12/13 19:13:22 nate Exp $ */
+/* $OpenBSD: dec_kn20aa.c,v 1.13 2001/12/14 00:44:59 nate Exp $ */
 /* $NetBSD: dec_kn20aa.c,v 1.42 2000/05/22 20:13:32 thorpej Exp $ */
 
 /*
@@ -118,7 +118,7 @@ dec_kn20aa_cons_init()
 			 */
 			DELAY(160000000 / comcnrate);
 
-			if(comcnattach(ccp->cc_iot, 0x3f8, comcnrate,
+			if(comcnattach(&ccp->cc_iot, 0x3f8, comcnrate,
 			    COM_FREQ,
 			    (TTYDEF_CFLAG & ~(CSIZE | PARENB)) | CS8))
 				panic("can't init serial console");
@@ -130,14 +130,14 @@ dec_kn20aa_cons_init()
 #if NPCKBD > 0
 		/* display console ... */
 		/* XXX */
-		(void) pckbc_cnattach(ccp->cc_iot, IO_KBD, KBCMDP,
+		(void) pckbc_cnattach(&ccp->cc_iot, IO_KBD, KBCMDP,
 		    PCKBC_KBD_SLOT);
 
 		if (CTB_TURBOSLOT_TYPE(ctb->ctb_turboslot) ==
 		    CTB_TURBOSLOT_TYPE_ISA)
-			isa_display_console(ccp->cc_iot, ccp->cc_memt);
+			isa_display_console(&ccp->cc_iot, &ccp->cc_memt);
 		else
-			pci_display_console(ccp->cc_iot, ccp->cc_memt,
+			pci_display_console(&ccp->cc_iot, &ccp->cc_memt,
 			    &ccp->cc_pc, CTB_TURBOSLOT_BUS(ctb->ctb_turboslot),
 			    CTB_TURBOSLOT_SLOT(ctb->ctb_turboslot), 0);
 #else
diff --git a/sys/arch/alpha/pci/apecs.c b/sys/arch/alpha/pci/apecs.c
index bd2aa724dfa..5c94e3e01cd 100644
--- a/sys/arch/alpha/pci/apecs.c
+++ b/sys/arch/alpha/pci/apecs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: apecs.c,v 1.15 2001/11/06 19:53:13 miod Exp $	*/
+/*	$OpenBSD: apecs.c,v 1.16 2001/12/14 00:44:59 nate Exp $	*/
 /*	$NetBSD: apecs.c,v 1.16 1996/12/05 01:39:34 cgd Exp $	*/
 
 /*-
@@ -149,8 +149,8 @@ apecs_init(acp, mallocsafe)
 
 	if (!acp->ac_initted) {
 		/* don't do these twice since they set up extents */
-		acp->ac_iot = apecs_bus_io_init(acp);
-		acp->ac_memt = apecs_bus_mem_init(acp);
+		apecs_bus_io_init(&acp->ac_iot, acp);
+		apecs_bus_mem_init(&acp->ac_memt, acp);
 
 #if 0
 		/*
@@ -239,8 +239,8 @@ apecsattach(parent, self, aux)
 	}
 
 	pba.pba_busname = "pci";
-	pba.pba_iot = acp->ac_iot;
-	pba.pba_memt = acp->ac_memt;
+	pba.pba_iot = &acp->ac_iot;
+	pba.pba_memt = &acp->ac_memt;
 	pba.pba_dmat =
 	    alphabus_dma_get_tag(&acp->ac_dmat_direct, ALPHA_BUS_PCI);
 	pba.pba_pc = &acp->ac_pc;
diff --git a/sys/arch/alpha/pci/apecsvar.h b/sys/arch/alpha/pci/apecsvar.h
index ee55b21ec4c..1b37e90d354 100644
--- a/sys/arch/alpha/pci/apecsvar.h
+++ b/sys/arch/alpha/pci/apecsvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: apecsvar.h,v 1.7 2001/02/16 05:17:31 jason Exp $	*/
+/*	$OpenBSD: apecsvar.h,v 1.8 2001/12/14 00:44:59 nate Exp $	*/
 /*	$NetBSD: apecsvar.h,v 1.5 1996/11/25 03:49:36 cgd Exp $	*/
 
 /*
@@ -45,7 +45,7 @@ struct apecs_config {
 	int	ac_epic_pass2;
 	int	ac_memwidth;
 
-	bus_space_tag_t ac_iot, ac_memt;
+	struct alpha_bus_space ac_iot, ac_memt;
 	struct alpha_pci_chipset ac_pc;
 
 	struct alpha_bus_dma_tag ac_dmat_direct;
@@ -69,5 +69,5 @@ void	apecs_init __P((struct apecs_config *, int));
 void	apecs_pci_init __P((pci_chipset_tag_t, void *));
 void	apecs_dma_init __P((struct apecs_config *));
 
-bus_space_tag_t apecs_bus_io_init __P((void *));
-bus_space_tag_t apecs_bus_mem_init __P((void *));
+void apecs_bus_io_init __P((bus_space_tag_t, void *));
+void apecs_bus_mem_init __P((bus_space_tag_t, void *));
diff --git a/sys/arch/alpha/pci/cia.c b/sys/arch/alpha/pci/cia.c
index 49b04da2878..bff533f5d38 100644
--- a/sys/arch/alpha/pci/cia.c
+++ b/sys/arch/alpha/pci/cia.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cia.c,v 1.16 2001/11/06 19:53:13 miod Exp $ */
+/* $OpenBSD: cia.c,v 1.17 2001/12/14 00:44:59 nate Exp $ */
 /* $NetBSD: cia.c,v 1.56 2000/06/29 08:58:45 mrg Exp $ */
 
 /*-
@@ -236,11 +236,11 @@ cia_init(ccp, mallocsafe)
 	if (!ccp->cc_initted) {
 		/* don't do these twice since they set up extents */
 		if (ccp->cc_flags & CCF_BUS_USE_BWX) {
-			ccp->cc_iot = cia_bwx_bus_io_init(ccp);
-			ccp->cc_memt = cia_bwx_bus_mem_init(ccp);
+			cia_bwx_bus_io_init(&ccp->cc_iot, ccp);
+			cia_bwx_bus_mem_init(&ccp->cc_memt, ccp);
 		} else {
-			ccp->cc_iot = cia_bus_io_init(ccp);
-			ccp->cc_memt = cia_bus_mem_init(ccp);
+			cia_bus_io_init(&ccp->cc_iot, ccp);
+			cia_bus_mem_init(&ccp->cc_memt, ccp);
 		}
 	}
 	ccp->cc_mallocsafe = mallocsafe;
@@ -396,8 +396,8 @@ ciaattach(parent, self, aux)
 	}
 
 	pba.pba_busname = "pci";
-	pba.pba_iot = ccp->cc_iot;
-	pba.pba_memt = ccp->cc_memt;
+	pba.pba_iot = &ccp->cc_iot;
+	pba.pba_memt = &ccp->cc_memt;
 	pba.pba_dmat = 
 	    alphabus_dma_get_tag(&ccp->cc_dmat_direct, ALPHA_BUS_PCI);
 	pba.pba_pc = &ccp->cc_pc;
diff --git a/sys/arch/alpha/pci/ciavar.h b/sys/arch/alpha/pci/ciavar.h
index 96f5c67d87d..bc9c2861fba 100644
--- a/sys/arch/alpha/pci/ciavar.h
+++ b/sys/arch/alpha/pci/ciavar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ciavar.h,v 1.10 2000/11/08 20:59:25 ericj Exp $ */
+/* $OpenBSD: ciavar.h,v 1.11 2001/12/14 00:44:59 nate Exp $ */
 /* $NetBSD: ciavar.h,v 1.17 2000/03/19 01:43:25 thorpej Exp $ */
 
 /*
@@ -41,7 +41,7 @@
 struct cia_config {
 	int	cc_initted;
 
-	bus_space_tag_t cc_iot, cc_memt;
+	struct alpha_bus_space cc_iot, cc_memt;
 	struct alpha_pci_chipset cc_pc;
 
 	struct alpha_bus_dma_tag cc_dmat_direct;
@@ -76,10 +76,10 @@ void	cia_init __P((struct cia_config *, int));
 void	cia_pci_init __P((pci_chipset_tag_t, void *));
 void	cia_dma_init __P((struct cia_config *));
 
-bus_space_tag_t	cia_bwx_bus_io_init __P((void *));
-bus_space_tag_t	cia_bwx_bus_mem_init __P((void *));
+void	cia_bwx_bus_io_init __P((bus_space_tag_t, void *));
+void	cia_bwx_bus_mem_init __P((bus_space_tag_t, void *));
 
-bus_space_tag_t	cia_bus_io_init __P((void *));
-bus_space_tag_t	cia_bus_mem_init __P((void *));
+void	cia_bus_io_init __P((bus_space_tag_t, void *));
+void	cia_bus_mem_init __P((bus_space_tag_t, void *));
 
 void	cia_pyxis_intr_enable __P((int, int));
diff --git a/sys/arch/alpha/pci/irongate.c b/sys/arch/alpha/pci/irongate.c
index 7d6d9dec87b..c14e181c3bb 100644
--- a/sys/arch/alpha/pci/irongate.c
+++ b/sys/arch/alpha/pci/irongate.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: irongate.c,v 1.4 2001/06/26 21:13:43 art Exp $	*/
+/*	$OpenBSD: irongate.c,v 1.5 2001/12/14 00:44:59 nate Exp $	*/
 /* $NetBSD: irongate.c,v 1.3 2000/11/29 06:29:10 thorpej Exp $ */
 
 /*-
@@ -109,8 +109,8 @@ irongate_init(struct irongate_config *icp, int mallocsafe)
 
 	if (icp->ic_initted == 0) {
 		/* Don't do these twice, since they set up extents. */
-		icp->ic_iot = irongate_bus_io_init(icp);
-		icp->ic_memt = irongate_bus_mem_init(icp);
+		irongate_bus_io_init(&icp->ic_iot, icp);
+		irongate_bus_mem_init(&icp->ic_memt, icp);
 
 #if 0
 		/* Only one each PCI I/O and MEM window. */
@@ -165,7 +165,7 @@ irongate_attach(struct device *parent, struct device *self, void *aux)
 	 * Do PCI memory initialization that needs to be deferred until
 	 * malloc is safe.
 	 */
-	irongate_bus_mem_init2(icp->ic_memt, icp);
+	irongate_bus_mem_init2(&icp->ic_memt, icp);
 
 	switch (cputype) {
 #ifdef API_UP1000
@@ -179,8 +179,8 @@ irongate_attach(struct device *parent, struct device *self, void *aux)
 	}
 
 	pba.pba_busname = "pci";
-	pba.pba_iot = icp->ic_iot;
-	pba.pba_memt = icp->ic_memt;
+	pba.pba_iot = &icp->ic_iot;
+	pba.pba_memt = &icp->ic_memt;
 	pba.pba_dmat =
 	    alphabus_dma_get_tag(&icp->ic_dmat_pci, ALPHA_BUS_PCI);
 	pba.pba_pc = &icp->ic_pc;
@@ -235,4 +235,4 @@ irongate_bus_get_window(int type, int window,
 
 	return (0);
 }
-#endif
\ No newline at end of file
+#endif
diff --git a/sys/arch/alpha/pci/irongatevar.h b/sys/arch/alpha/pci/irongatevar.h
index ff25ba78ffd..62180eb3433 100644
--- a/sys/arch/alpha/pci/irongatevar.h
+++ b/sys/arch/alpha/pci/irongatevar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: irongatevar.h,v 1.2 2001/04/17 14:53:34 art Exp $	*/
+/*	$OpenBSD: irongatevar.h,v 1.3 2001/12/14 00:44:59 nate Exp $	*/
 /* $NetBSD: irongatevar.h,v 1.3 2000/11/29 06:29:10 thorpej Exp $ */
 
 /*-
@@ -49,7 +49,7 @@
 struct irongate_config {
 	int	ic_initted;
 
-	bus_space_tag_t ic_iot, ic_memt;
+	struct alpha_bus_space ic_iot, ic_memt;
 	struct alpha_pci_chipset ic_pc;
 
 	struct alpha_bus_dma_tag ic_dmat_pci;
@@ -71,8 +71,8 @@ void	irongate_init(struct irongate_config *, int);
 void	irongate_pci_init(pci_chipset_tag_t, void *);
 void	irongate_dma_init(struct irongate_config *);
 
-bus_space_tag_t	irongate_bus_io_init(void *);
-bus_space_tag_t	irongate_bus_mem_init(void *);
+void	irongate_bus_io_init(bus_space_tag_t, void *);
+void	irongate_bus_mem_init(bus_space_tag_t, void *);
 
 void	irongate_bus_mem_init2(bus_space_tag_t, void *);
 
diff --git a/sys/arch/alpha/pci/lca.c b/sys/arch/alpha/pci/lca.c
index 6c7fd858d18..4f4cd66c92a 100644
--- a/sys/arch/alpha/pci/lca.c
+++ b/sys/arch/alpha/pci/lca.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lca.c,v 1.14 2001/11/06 19:53:13 miod Exp $	*/
+/*	$OpenBSD: lca.c,v 1.15 2001/12/14 00:44:59 nate Exp $	*/
 /*	$NetBSD: lca.c,v 1.14 1996/12/05 01:39:35 cgd Exp $	*/
 
 /*-
@@ -151,8 +151,8 @@ lca_init(lcp, mallocsafe)
 
 	if (!lcp->lc_initted) {
 		/* don't do these twice since they set up extents */
-		lcp->lc_iot = lca_bus_io_init(lcp);
-		lcp->lc_memt = lca_bus_mem_init(lcp);
+		lca_bus_io_init(&lcp->lc_iot, lcp);
+		lca_bus_mem_init(&lcp->lc_memt, lcp);
 
 #if 0
 		/*
@@ -250,8 +250,8 @@ lcaattach(parent, self, aux)
 	}
 
 	pba.pba_busname = "pci";
-	pba.pba_iot = lcp->lc_iot;
-	pba.pba_memt = lcp->lc_memt;
+	pba.pba_iot = &lcp->lc_iot;
+	pba.pba_memt = &lcp->lc_memt;
 	pba.pba_dmat =
 	    alphabus_dma_get_tag(&lcp->lc_dmat_direct, ALPHA_BUS_PCI);
 	pba.pba_pc = &lcp->lc_pc;
diff --git a/sys/arch/alpha/pci/lcavar.h b/sys/arch/alpha/pci/lcavar.h
index b6a146c2b2e..001ba6314ae 100644
--- a/sys/arch/alpha/pci/lcavar.h
+++ b/sys/arch/alpha/pci/lcavar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lcavar.h,v 1.8 2001/02/16 16:02:54 jason Exp $	*/
+/*	$OpenBSD: lcavar.h,v 1.9 2001/12/14 00:44:59 nate Exp $	*/
 /* $NetBSD: lcavar.h,v 1.7 1997/06/06 23:54:32 thorpej Exp $ */
 
 /*
@@ -41,7 +41,7 @@
 struct lca_config {
 	int	lc_initted;
 
-	bus_space_tag_t lc_iot, lc_memt;
+	struct alpha_bus_space lc_iot, lc_memt;
 	struct alpha_pci_chipset lc_pc;
 
 	struct alpha_bus_dma_tag lc_dmat_direct;
@@ -65,5 +65,5 @@ void	lca_init __P((struct lca_config *, int));
 void	lca_pci_init __P((pci_chipset_tag_t, void *));
 void	lca_dma_init __P((struct lca_config *));
 
-bus_space_tag_t lca_bus_io_init __P((void *));
-bus_space_tag_t lca_bus_mem_init __P((void *));
+void	lca_bus_io_init __P((bus_space_tag_t, void *));
+void	lca_bus_mem_init __P((bus_space_tag_t, void *));
diff --git a/sys/arch/alpha/pci/pci_2100_a50.c b/sys/arch/alpha/pci/pci_2100_a50.c
index 335c691bdca..78645296abe 100644
--- a/sys/arch/alpha/pci/pci_2100_a50.c
+++ b/sys/arch/alpha/pci/pci_2100_a50.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pci_2100_a50.c,v 1.16 2001/11/06 19:53:13 miod Exp $	*/
+/*	$OpenBSD: pci_2100_a50.c,v 1.17 2001/12/14 00:44:59 nate Exp $	*/
 /*	$NetBSD: pci_2100_a50.c,v 1.12 1996/11/13 21:13:29 cgd Exp $	*/
 
 /*
@@ -66,7 +66,7 @@ void
 pci_2100_a50_pickintr(acp)
 	struct apecs_config *acp;
 {
-	bus_space_tag_t iot = acp->ac_iot;
+	bus_space_tag_t iot = &acp->ac_iot;
 	pci_chipset_tag_t pc = &acp->ac_pc;
 	pcireg_t sioclass;
 	int sioII;
diff --git a/sys/arch/alpha/pci/pci_550.c b/sys/arch/alpha/pci/pci_550.c
index bab6effeca3..c0dd63e23f0 100644
--- a/sys/arch/alpha/pci/pci_550.c
+++ b/sys/arch/alpha/pci/pci_550.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_550.c,v 1.6 2001/11/06 19:53:13 miod Exp $ */
+/* $OpenBSD: pci_550.c,v 1.7 2001/12/14 00:44:59 nate Exp $ */
 /* $NetBSD: pci_550.c,v 1.18 2000/06/29 08:58:48 mrg Exp $ */
 
 /*-
@@ -136,7 +136,7 @@ void
 pci_550_pickintr(ccp)
 	struct cia_config *ccp;
 {
-	bus_space_tag_t iot = ccp->cc_iot;
+	bus_space_tag_t iot = &ccp->cc_iot;
 	pci_chipset_tag_t pc = &ccp->cc_pc;
 #if 0
 	char *cp;
diff --git a/sys/arch/alpha/pci/pci_6600.c b/sys/arch/alpha/pci/pci_6600.c
index 43166875586..ad119bbb63d 100644
--- a/sys/arch/alpha/pci/pci_6600.c
+++ b/sys/arch/alpha/pci/pci_6600.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_6600.c,v 1.6 2001/11/06 19:53:13 miod Exp $ */
+/* $OpenBSD: pci_6600.c,v 1.7 2001/12/14 00:44:59 nate Exp $ */
 /* $NetBSD: pci_6600.c,v 1.5 2000/06/06 00:50:15 thorpej Exp $ */
 
 /*-
@@ -97,7 +97,7 @@ void
 pci_6600_pickintr(pcp)
 	struct tsp_config *pcp;
 {
-	bus_space_tag_t iot = pcp->pc_iot;
+	bus_space_tag_t iot = &pcp->pc_iot;
 	pci_chipset_tag_t pc = &pcp->pc_pc;
 #if 0
 	char *cp;
diff --git a/sys/arch/alpha/pci/pci_axppci_33.c b/sys/arch/alpha/pci/pci_axppci_33.c
index dffba288334..08c12249f27 100644
--- a/sys/arch/alpha/pci/pci_axppci_33.c
+++ b/sys/arch/alpha/pci/pci_axppci_33.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pci_axppci_33.c,v 1.14 2001/11/06 19:53:13 miod Exp $	*/
+/*	$OpenBSD: pci_axppci_33.c,v 1.15 2001/12/14 00:44:59 nate Exp $	*/
 /*	$NetBSD: pci_axppci_33.c,v 1.10 1996/11/13 21:13:29 cgd Exp $	*/
 
 /*
@@ -66,7 +66,7 @@ void
 pci_axppci_33_pickintr(lcp)
 	struct lca_config *lcp;
 {
-	bus_space_tag_t iot = lcp->lc_iot;
+	bus_space_tag_t iot = &lcp->lc_iot;
 	pci_chipset_tag_t pc = &lcp->lc_pc;
 	pcireg_t sioclass;
 	int sioII;
diff --git a/sys/arch/alpha/pci/pci_bwx_bus_io_chipdep.c b/sys/arch/alpha/pci/pci_bwx_bus_io_chipdep.c
index e83687613ed..d9d338d1e10 100644
--- a/sys/arch/alpha/pci/pci_bwx_bus_io_chipdep.c
+++ b/sys/arch/alpha/pci/pci_bwx_bus_io_chipdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_bwx_bus_io_chipdep.c,v 1.2 2000/11/08 20:59:25 ericj Exp $ */
+/* $OpenBSD: pci_bwx_bus_io_chipdep.c,v 1.3 2001/12/14 00:44:59 nate Exp $ */
 /* $NetBSD: pcs_bus_io_common.c,v 1.14 1996/12/02 22:19:35 cgd Exp $ */
 
 /*
@@ -175,103 +175,101 @@ void		__C(CHIP,_io_write_raw_multi_8) __P((void *,
 static long
     __C(CHIP,_io_ex_storage)[EXTENT_FIXED_STORAGE_SIZE(8) / sizeof(long)];
 
-static struct alpha_bus_space __C(CHIP,_io_space) = {
+void
+__C(CHIP,_bus_io_init)(t, v)
+	bus_space_tag_t t;
+	void *v;
+{
+	struct extent *ex;
+
+	/*
+	 * Initialize the bus space tag.
+	 */
+
 	/* cookie */
-	NULL,
+	t->abs_cookie =		v;
 
 	/* mapping/unmapping */
-	__C(CHIP,_io_map),
-	__C(CHIP,_io_unmap),
-	__C(CHIP,_io_subregion),
+	t->abs_map =		__C(CHIP,_io_map);
+	t->abs_unmap =		__C(CHIP,_io_unmap);
+	t->abs_subregion =	__C(CHIP,_io_subregion);
 
 	/* allocation/deallocation */
-	__C(CHIP,_io_alloc),
-	__C(CHIP,_io_free),
+	t->abs_alloc =		__C(CHIP,_io_alloc);
+	t->abs_free = 		__C(CHIP,_io_free);
 
 	/* barrier */
-	__C(CHIP,_io_barrier),
+	t->abs_barrier =	__C(CHIP,_io_barrier);
 	
 	/* read (single) */
-	__C(CHIP,_io_read_1),
-	__C(CHIP,_io_read_2),
-	__C(CHIP,_io_read_4),
-	__C(CHIP,_io_read_8),
+	t->abs_r_1 =		__C(CHIP,_io_read_1);
+	t->abs_r_2 =		__C(CHIP,_io_read_2);
+	t->abs_r_4 =		__C(CHIP,_io_read_4);
+	t->abs_r_8 =		__C(CHIP,_io_read_8);
 	
 	/* read multiple */
-	__C(CHIP,_io_read_multi_1),
-	__C(CHIP,_io_read_multi_2),
-	__C(CHIP,_io_read_multi_4),
-	__C(CHIP,_io_read_multi_8),
+	t->abs_rm_1 =		__C(CHIP,_io_read_multi_1);
+	t->abs_rm_2 =		__C(CHIP,_io_read_multi_2);
+	t->abs_rm_4 =		__C(CHIP,_io_read_multi_4);
+	t->abs_rm_8 =		__C(CHIP,_io_read_multi_8);
 	
 	/* read region */
-	__C(CHIP,_io_read_region_1),
-	__C(CHIP,_io_read_region_2),
-	__C(CHIP,_io_read_region_4),
-	__C(CHIP,_io_read_region_8),
+	t->abs_rr_1 =		__C(CHIP,_io_read_region_1);
+	t->abs_rr_2 =		__C(CHIP,_io_read_region_2);
+	t->abs_rr_4 =		__C(CHIP,_io_read_region_4);
+	t->abs_rr_8 =		__C(CHIP,_io_read_region_8);
 	
 	/* write (single) */
-	__C(CHIP,_io_write_1),
-	__C(CHIP,_io_write_2),
-	__C(CHIP,_io_write_4),
-	__C(CHIP,_io_write_8),
+	t->abs_w_1 =		__C(CHIP,_io_write_1);
+	t->abs_w_2 =		__C(CHIP,_io_write_2);
+	t->abs_w_4 =		__C(CHIP,_io_write_4);
+	t->abs_w_8 =		__C(CHIP,_io_write_8);
 	
 	/* write multiple */
-	__C(CHIP,_io_write_multi_1),
-	__C(CHIP,_io_write_multi_2),
-	__C(CHIP,_io_write_multi_4),
-	__C(CHIP,_io_write_multi_8),
+	t->abs_wm_1 =		__C(CHIP,_io_write_multi_1);
+	t->abs_wm_2 =		__C(CHIP,_io_write_multi_2);
+	t->abs_wm_4 =		__C(CHIP,_io_write_multi_4);
+	t->abs_wm_8 =		__C(CHIP,_io_write_multi_8);
 	
 	/* write region */
-	__C(CHIP,_io_write_region_1),
-	__C(CHIP,_io_write_region_2),
-	__C(CHIP,_io_write_region_4),
-	__C(CHIP,_io_write_region_8),
+	t->abs_wr_1 =		__C(CHIP,_io_write_region_1);
+	t->abs_wr_2 =		__C(CHIP,_io_write_region_2);
+	t->abs_wr_4 =		__C(CHIP,_io_write_region_4);
+	t->abs_wr_8 =		__C(CHIP,_io_write_region_8);
 
 	/* set multiple */
-	__C(CHIP,_io_set_multi_1),
-	__C(CHIP,_io_set_multi_2),
-	__C(CHIP,_io_set_multi_4),
-	__C(CHIP,_io_set_multi_8),
+	t->abs_sm_1 =		__C(CHIP,_io_set_multi_1);
+	t->abs_sm_2 =		__C(CHIP,_io_set_multi_2);
+	t->abs_sm_4 =		__C(CHIP,_io_set_multi_4);
+	t->abs_sm_8 =		__C(CHIP,_io_set_multi_8);
 	
 	/* set region */
-	__C(CHIP,_io_set_region_1),
-	__C(CHIP,_io_set_region_2),
-	__C(CHIP,_io_set_region_4),
-	__C(CHIP,_io_set_region_8),
+	t->abs_sr_1 =		__C(CHIP,_io_set_region_1);
+	t->abs_sr_2 =		__C(CHIP,_io_set_region_2);
+	t->abs_sr_4 =		__C(CHIP,_io_set_region_4);
+	t->abs_sr_8 =		__C(CHIP,_io_set_region_8);
 
 	/* copy */
-	__C(CHIP,_io_copy_1),
-	__C(CHIP,_io_copy_2),
-	__C(CHIP,_io_copy_4),
-	__C(CHIP,_io_copy_8),
+	t->abs_c_1 =		__C(CHIP,_io_copy_1);
+	t->abs_c_2 =		__C(CHIP,_io_copy_2);
+	t->abs_c_4 =		__C(CHIP,_io_copy_4);
+	t->abs_c_8 =		__C(CHIP,_io_copy_8);
 
 	/* read multiple raw */
-	__C(CHIP,_io_read_raw_multi_2),
-	__C(CHIP,_io_read_raw_multi_4),
-	__C(CHIP,_io_read_raw_multi_8),
+	t->abs_rrm_2 =		__C(CHIP,_io_read_raw_multi_2);
+	t->abs_rrm_4 =		__C(CHIP,_io_read_raw_multi_4);
+	t->abs_rrm_8 =		__C(CHIP,_io_read_raw_multi_8);
 	
 	/* write multiple raw*/
-	__C(CHIP,_io_write_raw_multi_2),
-	__C(CHIP,_io_write_raw_multi_4),
-	__C(CHIP,_io_write_raw_multi_8),
-};
-
-bus_space_tag_t
-__C(CHIP,_bus_io_init)(v)
-	void *v;
-{
-        bus_space_tag_t t = &__C(CHIP,_io_space);
-	struct extent *ex;
-
-	t->abs_cookie = v;
+	t->abs_wrm_2 =		__C(CHIP,_io_write_raw_multi_2);
+	t->abs_wrm_4 =		__C(CHIP,_io_write_raw_multi_4);
+	t->abs_wrm_8 =		__C(CHIP,_io_write_raw_multi_8);
 
 	ex = extent_create(__S(__C(CHIP,_bus_io)), 0x0UL, 0xffffffffUL,
 	    M_DEVBUF, (caddr_t)__C(CHIP,_io_ex_storage),
 	    sizeof(__C(CHIP,_io_ex_storage)), EX_NOWAIT|EX_NOCOALESCE);
 
 	CHIP_IO_EXTENT(v) = ex;
-
-	return (t);
 }
 
 int
diff --git a/sys/arch/alpha/pci/pci_bwx_bus_mem_chipdep.c b/sys/arch/alpha/pci/pci_bwx_bus_mem_chipdep.c
index ef4e52593d7..c4b5d2e5675 100644
--- a/sys/arch/alpha/pci/pci_bwx_bus_mem_chipdep.c
+++ b/sys/arch/alpha/pci/pci_bwx_bus_mem_chipdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_bwx_bus_mem_chipdep.c,v 1.3 2001/10/26 01:28:06 nate Exp $ */
+/* $OpenBSD: pci_bwx_bus_mem_chipdep.c,v 1.4 2001/12/14 00:44:59 nate Exp $ */
 /* $NetBSD: pcs_bus_mem_common.c,v 1.15 1996/12/02 22:19:36 cgd Exp $ */
 
 /*
@@ -183,95 +183,95 @@ void		__C(CHIP,_mem_write_raw_multi_8) __P((void *,
 static long
     __C(CHIP,_mem_ex_storage)[EXTENT_FIXED_STORAGE_SIZE(8) / sizeof(long)];
 
-static struct alpha_bus_space __C(CHIP,_mem_space) = {
+void
+__C(CHIP,_bus_mem_init)(t, v)
+	bus_space_tag_t t;
+	void *v;
+{
+	struct extent *ex;
+
+	/*
+	 * Initialize the bus space tag.
+	 */
+
 	/* cookie */
-	NULL,
+	t->abs_cookie =		v;
 
 	/* mapping/unmapping */
-	__C(CHIP,_mem_map),
-	__C(CHIP,_mem_unmap),
-	__C(CHIP,_mem_subregion),
+	t->abs_map =		__C(CHIP,_mem_map);
+	t->abs_unmap =		__C(CHIP,_mem_unmap);
+	t->abs_subregion =	__C(CHIP,_mem_subregion);
 
 	/* allocation/deallocation */
-	__C(CHIP,_mem_alloc),
-	__C(CHIP,_mem_free),
+	t->abs_alloc =		__C(CHIP,_mem_alloc);
+	t->abs_free = 		__C(CHIP,_mem_free);
 
 	/* barrier */
-	__C(CHIP,_mem_barrier),
+	t->abs_barrier =	__C(CHIP,_mem_barrier);
 	
 	/* read (single) */
-	__C(CHIP,_mem_read_1),
-	__C(CHIP,_mem_read_2),
-	__C(CHIP,_mem_read_4),
-	__C(CHIP,_mem_read_8),
+	t->abs_r_1 =		__C(CHIP,_mem_read_1);
+	t->abs_r_2 =		__C(CHIP,_mem_read_2);
+	t->abs_r_4 =		__C(CHIP,_mem_read_4);
+	t->abs_r_8 =		__C(CHIP,_mem_read_8);
 	
 	/* read multiple */
-	__C(CHIP,_mem_read_multi_1),
-	__C(CHIP,_mem_read_multi_2),
-	__C(CHIP,_mem_read_multi_4),
-	__C(CHIP,_mem_read_multi_8),
+	t->abs_rm_1 =		__C(CHIP,_mem_read_multi_1);
+	t->abs_rm_2 =		__C(CHIP,_mem_read_multi_2);
+	t->abs_rm_4 =		__C(CHIP,_mem_read_multi_4);
+	t->abs_rm_8 =		__C(CHIP,_mem_read_multi_8);
 	
 	/* read region */
-	__C(CHIP,_mem_read_region_1),
-	__C(CHIP,_mem_read_region_2),
-	__C(CHIP,_mem_read_region_4),
-	__C(CHIP,_mem_read_region_8),
+	t->abs_rr_1 =		__C(CHIP,_mem_read_region_1);
+	t->abs_rr_2 =		__C(CHIP,_mem_read_region_2);
+	t->abs_rr_4 =		__C(CHIP,_mem_read_region_4);
+	t->abs_rr_8 =		__C(CHIP,_mem_read_region_8);
 	
 	/* write (single) */
-	__C(CHIP,_mem_write_1),
-	__C(CHIP,_mem_write_2),
-	__C(CHIP,_mem_write_4),
-	__C(CHIP,_mem_write_8),
+	t->abs_w_1 =		__C(CHIP,_mem_write_1);
+	t->abs_w_2 =		__C(CHIP,_mem_write_2);
+	t->abs_w_4 =		__C(CHIP,_mem_write_4);
+	t->abs_w_8 =		__C(CHIP,_mem_write_8);
 	
 	/* write multiple */
-	__C(CHIP,_mem_write_multi_1),
-	__C(CHIP,_mem_write_multi_2),
-	__C(CHIP,_mem_write_multi_4),
-	__C(CHIP,_mem_write_multi_8),
+	t->abs_wm_1 =		__C(CHIP,_mem_write_multi_1);
+	t->abs_wm_2 =		__C(CHIP,_mem_write_multi_2);
+	t->abs_wm_4 =		__C(CHIP,_mem_write_multi_4);
+	t->abs_wm_8 =		__C(CHIP,_mem_write_multi_8);
 	
 	/* write region */
-	__C(CHIP,_mem_write_region_1),
-	__C(CHIP,_mem_write_region_2),
-	__C(CHIP,_mem_write_region_4),
-	__C(CHIP,_mem_write_region_8),
+	t->abs_wr_1 =		__C(CHIP,_mem_write_region_1);
+	t->abs_wr_2 =		__C(CHIP,_mem_write_region_2);
+	t->abs_wr_4 =		__C(CHIP,_mem_write_region_4);
+	t->abs_wr_8 =		__C(CHIP,_mem_write_region_8);
 
 	/* set multiple */
-	__C(CHIP,_mem_set_multi_1),
-	__C(CHIP,_mem_set_multi_2),
-	__C(CHIP,_mem_set_multi_4),
-	__C(CHIP,_mem_set_multi_8),
+	t->abs_sm_1 =		__C(CHIP,_mem_set_multi_1);
+	t->abs_sm_2 =		__C(CHIP,_mem_set_multi_2);
+	t->abs_sm_4 =		__C(CHIP,_mem_set_multi_4);
+	t->abs_sm_8 =		__C(CHIP,_mem_set_multi_8);
 	
 	/* set region */
-	__C(CHIP,_mem_set_region_1),
-	__C(CHIP,_mem_set_region_2),
-	__C(CHIP,_mem_set_region_4),
-	__C(CHIP,_mem_set_region_8),
+	t->abs_sr_1 =		__C(CHIP,_mem_set_region_1);
+	t->abs_sr_2 =		__C(CHIP,_mem_set_region_2);
+	t->abs_sr_4 =		__C(CHIP,_mem_set_region_4);
+	t->abs_sr_8 =		__C(CHIP,_mem_set_region_8);
 
 	/* copy */
-	__C(CHIP,_mem_copy_1),
-	__C(CHIP,_mem_copy_2),
-	__C(CHIP,_mem_copy_4),
-	__C(CHIP,_mem_copy_8),
+	t->abs_c_1 =		__C(CHIP,_mem_copy_1);
+	t->abs_c_2 =		__C(CHIP,_mem_copy_2);
+	t->abs_c_4 =		__C(CHIP,_mem_copy_4);
+	t->abs_c_8 =		__C(CHIP,_mem_copy_8);
 
 	/* read multiple raw */
-	__C(CHIP,_mem_read_raw_multi_2),
-	__C(CHIP,_mem_read_raw_multi_4),
-	__C(CHIP,_mem_read_raw_multi_8),
+	t->abs_rrm_2 =		__C(CHIP,_mem_read_raw_multi_2);
+	t->abs_rrm_4 =		__C(CHIP,_mem_read_raw_multi_4);
+	t->abs_rrm_8 =		__C(CHIP,_mem_read_raw_multi_8);
 	
 	/* write multiple raw*/
-	__C(CHIP,_mem_write_raw_multi_2),
-	__C(CHIP,_mem_write_raw_multi_4),
-	__C(CHIP,_mem_write_raw_multi_8),
-};
-
-bus_space_tag_t
-__C(CHIP,_bus_mem_init)(v)
-	void *v;
-{
-        bus_space_tag_t t = &__C(CHIP,_mem_space);
-	struct extent *ex;
-
-	t->abs_cookie = v;
+	t->abs_wrm_2 =		__C(CHIP,_mem_write_raw_multi_2);
+	t->abs_wrm_4 =		__C(CHIP,_mem_write_raw_multi_4);
+	t->abs_wrm_8 =		__C(CHIP,_mem_write_raw_multi_8);
 
 	ex = extent_create(__S(__C(CHIP,_bus_dmem)), 0x0UL,
 	    0xffffffffffffffffUL, M_DEVBUF,
@@ -279,8 +279,6 @@ __C(CHIP,_bus_mem_init)(v)
 	    sizeof(__C(CHIP,_mem_ex_storage)), EX_NOWAIT|EX_NOCOALESCE);
 
         CHIP_MEM_EXTENT(v) = ex;
-
-	return (t);
 }
 
 int
diff --git a/sys/arch/alpha/pci/pci_eb164.c b/sys/arch/alpha/pci/pci_eb164.c
index 2dc12c04b1c..f77641ac0ab 100644
--- a/sys/arch/alpha/pci/pci_eb164.c
+++ b/sys/arch/alpha/pci/pci_eb164.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_eb164.c,v 1.11 2001/11/06 19:53:13 miod Exp $ */
+/* $OpenBSD: pci_eb164.c,v 1.12 2001/12/14 00:44:59 nate Exp $ */
 /* $NetBSD: pci_eb164.c,v 1.27 2000/06/06 00:50:15 thorpej Exp $ */
 
 /*-
@@ -124,7 +124,7 @@ void
 pci_eb164_pickintr(ccp)
 	struct cia_config *ccp;
 {
-	bus_space_tag_t iot = ccp->cc_iot;
+	bus_space_tag_t iot = &ccp->cc_iot;
 	pci_chipset_tag_t pc = &ccp->cc_pc;
 	int i;
 
diff --git a/sys/arch/alpha/pci/pci_kn20aa.c b/sys/arch/alpha/pci/pci_kn20aa.c
index 3601bb381fe..2df7083d2b0 100644
--- a/sys/arch/alpha/pci/pci_kn20aa.c
+++ b/sys/arch/alpha/pci/pci_kn20aa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pci_kn20aa.c,v 1.15 2001/11/06 19:53:13 miod Exp $	*/
+/*	$OpenBSD: pci_kn20aa.c,v 1.16 2001/12/14 00:44:59 nate Exp $	*/
 /*	$NetBSD: pci_kn20aa.c,v 1.21 1996/11/17 02:05:27 cgd Exp $	*/
 
 /*
@@ -84,7 +84,7 @@ pci_kn20aa_pickintr(ccp)
 	struct cia_config *ccp;
 {
 	int i;
-	bus_space_tag_t iot = ccp->cc_iot;
+	bus_space_tag_t iot = &ccp->cc_iot;
 	pci_chipset_tag_t pc = &ccp->cc_pc;
 
         pc->pc_intr_v = ccp;
diff --git a/sys/arch/alpha/pci/pci_swiz_bus_io_chipdep.c b/sys/arch/alpha/pci/pci_swiz_bus_io_chipdep.c
index 2839feb60ab..eb642b303dc 100644
--- a/sys/arch/alpha/pci/pci_swiz_bus_io_chipdep.c
+++ b/sys/arch/alpha/pci/pci_swiz_bus_io_chipdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pci_swiz_bus_io_chipdep.c,v 1.1 2001/02/06 19:26:39 art Exp $	*/
+/*	$OpenBSD: pci_swiz_bus_io_chipdep.c,v 1.2 2001/12/14 00:44:59 nate Exp $	*/
 /*	$NetBSD: pcs_bus_io_common.c,v 1.14 1996/12/02 22:19:35 cgd Exp $	*/
 
 /*
@@ -173,95 +173,96 @@ void		__C(CHIP,_io_write_raw_multi_8) __P((void *,
 static long
     __C(CHIP,_io_ex_storage)[EXTENT_FIXED_STORAGE_SIZE(8) / sizeof(long)];
 
-static struct alpha_bus_space __C(CHIP,_io_space) = {
+void
+__C(CHIP,_bus_io_init)(t, v)
+	bus_space_tag_t t;
+	void *v;
+{
+	struct extent *ex;
+
+	/*
+	 * Initialize the bus space tag.
+	 */
+
 	/* cookie */
-	NULL,
+	t->abs_cookie = v;
 
 	/* mapping/unmapping */
-	__C(CHIP,_io_map),
-	__C(CHIP,_io_unmap),
-	__C(CHIP,_io_subregion),
+	t->abs_map =		__C(CHIP,_io_map);
+	t->abs_unmap =		__C(CHIP,_io_unmap);
+	t->abs_subregion =	__C(CHIP,_io_subregion);
 
 	/* allocation/deallocation */
-	__C(CHIP,_io_alloc),
-	__C(CHIP,_io_free),
+	t->abs_alloc =		__C(CHIP,_io_alloc);
+	t->abs_free =		__C(CHIP,_io_free);
 
 	/* barrier */
-	__C(CHIP,_io_barrier),
+	t->abs_barrier =	__C(CHIP,_io_barrier);
 	
 	/* read (single) */
-	__C(CHIP,_io_read_1),
-	__C(CHIP,_io_read_2),
-	__C(CHIP,_io_read_4),
-	__C(CHIP,_io_read_8),
+	t->abs_r_1 =		__C(CHIP,_io_read_1);
+	t->abs_r_2 =		__C(CHIP,_io_read_2);
+	t->abs_r_4 =		__C(CHIP,_io_read_4);
+	t->abs_r_8 =		__C(CHIP,_io_read_8);
 	
 	/* read multiple */
-	__C(CHIP,_io_read_multi_1),
-	__C(CHIP,_io_read_multi_2),
-	__C(CHIP,_io_read_multi_4),
-	__C(CHIP,_io_read_multi_8),
+	t->abs_rm_1 =		__C(CHIP,_io_read_multi_1);
+	t->abs_rm_2 =		__C(CHIP,_io_read_multi_2);
+	t->abs_rm_4 =		__C(CHIP,_io_read_multi_4);
+	t->abs_rm_8 =		__C(CHIP,_io_read_multi_8);
 	
 	/* read region */
-	__C(CHIP,_io_read_region_1),
-	__C(CHIP,_io_read_region_2),
-	__C(CHIP,_io_read_region_4),
-	__C(CHIP,_io_read_region_8),
+	t->abs_rr_1 =		__C(CHIP,_io_read_region_1);
+	t->abs_rr_2 =		__C(CHIP,_io_read_region_2);
+	t->abs_rr_4 =		__C(CHIP,_io_read_region_4);
+	t->abs_rr_8 =		__C(CHIP,_io_read_region_8);
 	
 	/* write (single) */
-	__C(CHIP,_io_write_1),
-	__C(CHIP,_io_write_2),
-	__C(CHIP,_io_write_4),
-	__C(CHIP,_io_write_8),
+	t->abs_w_1 =		__C(CHIP,_io_write_1);
+	t->abs_w_2 =		__C(CHIP,_io_write_2);
+	t->abs_w_4 =		__C(CHIP,_io_write_4);
+	t->abs_w_8 =		__C(CHIP,_io_write_8);
 	
 	/* write multiple */
-	__C(CHIP,_io_write_multi_1),
-	__C(CHIP,_io_write_multi_2),
-	__C(CHIP,_io_write_multi_4),
-	__C(CHIP,_io_write_multi_8),
+	t->abs_wm_1 =		__C(CHIP,_io_write_multi_1);
+	t->abs_wm_2 =		__C(CHIP,_io_write_multi_2);
+	t->abs_wm_4 =		__C(CHIP,_io_write_multi_4);
+	t->abs_wm_8 =		__C(CHIP,_io_write_multi_8);
 	
 	/* write region */
-	__C(CHIP,_io_write_region_1),
-	__C(CHIP,_io_write_region_2),
-	__C(CHIP,_io_write_region_4),
-	__C(CHIP,_io_write_region_8),
+	t->abs_wr_1 =		__C(CHIP,_io_write_region_1);
+	t->abs_wr_2 =		__C(CHIP,_io_write_region_2);
+	t->abs_wr_4 =		__C(CHIP,_io_write_region_4);
+	t->abs_wr_8 =		__C(CHIP,_io_write_region_8);
 
 	/* set multiple */
-	__C(CHIP,_io_set_multi_1),
-	__C(CHIP,_io_set_multi_2),
-	__C(CHIP,_io_set_multi_4),
-	__C(CHIP,_io_set_multi_8),
+	t->abs_sm_1 =		__C(CHIP,_io_set_multi_1);
+	t->abs_sm_2 =		__C(CHIP,_io_set_multi_2);
+	t->abs_sm_4 =		__C(CHIP,_io_set_multi_4);
+	t->abs_sm_8 =		__C(CHIP,_io_set_multi_8);
 	
 	/* set region */
-	__C(CHIP,_io_set_region_1),
-	__C(CHIP,_io_set_region_2),
-	__C(CHIP,_io_set_region_4),
-	__C(CHIP,_io_set_region_8),
+	t->abs_sr_1 =		__C(CHIP,_io_set_region_1);
+	t->abs_sr_2 =		__C(CHIP,_io_set_region_2);
+	t->abs_sr_4 =		__C(CHIP,_io_set_region_4);
+	t->abs_sr_8 =		__C(CHIP,_io_set_region_8);
 
 	/* copy */
-	__C(CHIP,_io_copy_1),
-	__C(CHIP,_io_copy_2),
-	__C(CHIP,_io_copy_4),
-	__C(CHIP,_io_copy_8),
+	t->abs_c_1 =		__C(CHIP,_io_copy_1);
+	t->abs_c_2 =		__C(CHIP,_io_copy_2);
+	t->abs_c_4 =		__C(CHIP,_io_copy_4);
+	t->abs_c_8 =		__C(CHIP,_io_copy_8);
 
 	/* read multiple raw */
-	__C(CHIP,_io_read_raw_multi_2),
-	__C(CHIP,_io_read_raw_multi_4),
-	__C(CHIP,_io_read_raw_multi_8),
+	t->abs_rrm_2 =		__C(CHIP,_io_read_raw_multi_2);
+	t->abs_rrm_4 =		__C(CHIP,_io_read_raw_multi_4);
+	t->abs_rrm_8 =		__C(CHIP,_io_read_raw_multi_8);
 	
 	/* write multiple raw*/
-	__C(CHIP,_io_write_raw_multi_2),
-	__C(CHIP,_io_write_raw_multi_4),
-	__C(CHIP,_io_write_raw_multi_8),
-};
+	t->abs_wrm_2 =		__C(CHIP,_io_write_raw_multi_2);
+	t->abs_wrm_4 =		__C(CHIP,_io_write_raw_multi_4) ;
+	t->abs_wrm_8 =		__C(CHIP,_io_write_raw_multi_8);
 
-bus_space_tag_t
-__C(CHIP,_bus_io_init)(v)
-	void *v;
-{
-        bus_space_tag_t t = &__C(CHIP,_io_space);
-	struct extent *ex;
-
-	t->abs_cookie = v;
 
 	/* XXX WE WANT EXTENT_NOCOALESCE, BUT WE CAN'T USE IT. XXX */
 	ex = extent_create(__S(__C(CHIP,_bus_io)), 0x0UL, 0xffffffffUL,
@@ -290,8 +291,6 @@ __C(CHIP,_bus_io_init)(v)
 	extent_print(ex);
 #endif
 	CHIP_IO_EXTENT(v) = ex;
-
-	return (t);
 }
 
 int
diff --git a/sys/arch/alpha/pci/pci_swiz_bus_mem_chipdep.c b/sys/arch/alpha/pci/pci_swiz_bus_mem_chipdep.c
index b7cbbe20149..0803038c973 100644
--- a/sys/arch/alpha/pci/pci_swiz_bus_mem_chipdep.c
+++ b/sys/arch/alpha/pci/pci_swiz_bus_mem_chipdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pci_swiz_bus_mem_chipdep.c,v 1.1 2001/02/06 19:26:39 art Exp $	*/
+/*	$OpenBSD: pci_swiz_bus_mem_chipdep.c,v 1.2 2001/12/14 00:44:59 nate Exp $	*/
 /*	$NetBSD: pcs_bus_mem_common.c,v 1.15 1996/12/02 22:19:36 cgd Exp $	*/
 
 /*
@@ -176,95 +176,95 @@ static long
 static long
     __C(CHIP,_smem_ex_storage)[EXTENT_FIXED_STORAGE_SIZE(8) / sizeof(long)];
 
-static struct alpha_bus_space __C(CHIP,_mem_space) = {
+void
+__C(CHIP,_bus_mem_init)(t, v)
+	bus_space_tag_t t;
+	void *v;
+{
+	struct extent *dex, *sex;
+
+	/*
+	 * Initialize the bus space tag.
+	 */
+
 	/* cookie */
-	NULL,
+	t->abs_cookie = v;
 
 	/* mapping/unmapping */
-	__C(CHIP,_mem_map),
-	__C(CHIP,_mem_unmap),
-	__C(CHIP,_mem_subregion),
+	t->abs_map =		__C(CHIP,_mem_map);
+	t->abs_unmap =		__C(CHIP,_mem_unmap);
+	t->abs_subregion =	__C(CHIP,_mem_subregion);
 
 	/* allocation/deallocation */
-	__C(CHIP,_mem_alloc),
-	__C(CHIP,_mem_free),
+	t->abs_alloc =		__C(CHIP,_mem_alloc);
+	t->abs_free = 		__C(CHIP,_mem_free);
 
 	/* barrier */
-	__C(CHIP,_mem_barrier),
+	t->abs_barrier =	__C(CHIP,_mem_barrier);
 	
 	/* read (single) */
-	__C(CHIP,_mem_read_1),
-	__C(CHIP,_mem_read_2),
-	__C(CHIP,_mem_read_4),
-	__C(CHIP,_mem_read_8),
+	t->abs_r_1 =		__C(CHIP,_mem_read_1);
+	t->abs_r_2 =		__C(CHIP,_mem_read_2);
+	t->abs_r_4 =		__C(CHIP,_mem_read_4);
+	t->abs_r_8 =		__C(CHIP,_mem_read_8);
 	
 	/* read multiple */
-	__C(CHIP,_mem_read_multi_1),
-	__C(CHIP,_mem_read_multi_2),
-	__C(CHIP,_mem_read_multi_4),
-	__C(CHIP,_mem_read_multi_8),
+	t->abs_rm_1 =		__C(CHIP,_mem_read_multi_1);
+	t->abs_rm_2 =		__C(CHIP,_mem_read_multi_2);
+	t->abs_rm_4 =		__C(CHIP,_mem_read_multi_4);
+	t->abs_rm_8 =		__C(CHIP,_mem_read_multi_8);
 	
 	/* read region */
-	__C(CHIP,_mem_read_region_1),
-	__C(CHIP,_mem_read_region_2),
-	__C(CHIP,_mem_read_region_4),
-	__C(CHIP,_mem_read_region_8),
+	t->abs_rr_1 =		__C(CHIP,_mem_read_region_1);
+	t->abs_rr_2 =		__C(CHIP,_mem_read_region_2);
+	t->abs_rr_4 =		__C(CHIP,_mem_read_region_4);
+	t->abs_rr_8 =		__C(CHIP,_mem_read_region_8);
 	
 	/* write (single) */
-	__C(CHIP,_mem_write_1),
-	__C(CHIP,_mem_write_2),
-	__C(CHIP,_mem_write_4),
-	__C(CHIP,_mem_write_8),
+	t->abs_w_1 =		__C(CHIP,_mem_write_1);
+	t->abs_w_2 =		__C(CHIP,_mem_write_2);
+	t->abs_w_4 =		__C(CHIP,_mem_write_4);
+	t->abs_w_8 =		__C(CHIP,_mem_write_8);
 	
 	/* write multiple */
-	__C(CHIP,_mem_write_multi_1),
-	__C(CHIP,_mem_write_multi_2),
-	__C(CHIP,_mem_write_multi_4),
-	__C(CHIP,_mem_write_multi_8),
+	t->abs_wm_1 =		__C(CHIP,_mem_write_multi_1);
+	t->abs_wm_2 =		__C(CHIP,_mem_write_multi_2);
+	t->abs_wm_4 =		__C(CHIP,_mem_write_multi_4);
+	t->abs_wm_8 =		__C(CHIP,_mem_write_multi_8);
 	
 	/* write region */
-	__C(CHIP,_mem_write_region_1),
-	__C(CHIP,_mem_write_region_2),
-	__C(CHIP,_mem_write_region_4),
-	__C(CHIP,_mem_write_region_8),
+	t->abs_wr_1 =		__C(CHIP,_mem_write_region_1);
+	t->abs_wr_2 =		__C(CHIP,_mem_write_region_2);
+	t->abs_wr_4 =		__C(CHIP,_mem_write_region_4);
+	t->abs_wr_8 =		__C(CHIP,_mem_write_region_8);
 
 	/* set multiple */
-	__C(CHIP,_mem_set_multi_1),
-	__C(CHIP,_mem_set_multi_2),
-	__C(CHIP,_mem_set_multi_4),
-	__C(CHIP,_mem_set_multi_8),
+	t->abs_sm_1 =		__C(CHIP,_mem_set_multi_1);
+	t->abs_sm_2 =		__C(CHIP,_mem_set_multi_2);
+	t->abs_sm_4 =		__C(CHIP,_mem_set_multi_4);
+	t->abs_sm_8 =		__C(CHIP,_mem_set_multi_8);
 	
 	/* set region */
-	__C(CHIP,_mem_set_region_1),
-	__C(CHIP,_mem_set_region_2),
-	__C(CHIP,_mem_set_region_4),
-	__C(CHIP,_mem_set_region_8),
+	t->abs_sr_1 =		__C(CHIP,_mem_set_region_1);
+	t->abs_sr_2 =		__C(CHIP,_mem_set_region_2);
+	t->abs_sr_4 =		__C(CHIP,_mem_set_region_4);
+	t->abs_sr_8 =		__C(CHIP,_mem_set_region_8);
 
 	/* copy */
-	__C(CHIP,_mem_copy_1),
-	__C(CHIP,_mem_copy_2),
-	__C(CHIP,_mem_copy_4),
-	__C(CHIP,_mem_copy_8),
+	t->abs_c_1 =		__C(CHIP,_mem_copy_1);
+	t->abs_c_2 =		__C(CHIP,_mem_copy_2);
+	t->abs_c_4 =		__C(CHIP,_mem_copy_4);
+	t->abs_c_8 =		__C(CHIP,_mem_copy_8);
 
 	/* read multiple raw */
-	__C(CHIP,_mem_read_raw_multi_2),
-	__C(CHIP,_mem_read_raw_multi_4),
-	__C(CHIP,_mem_read_raw_multi_8),
+	t->abs_rrm_2 =		__C(CHIP,_mem_read_raw_multi_2);
+	t->abs_rrm_4 =		__C(CHIP,_mem_read_raw_multi_4);
+	t->abs_rrm_8 =		__C(CHIP,_mem_read_raw_multi_8);
 	
 	/* write multiple raw*/
-	__C(CHIP,_mem_write_raw_multi_2),
-	__C(CHIP,_mem_write_raw_multi_4),
-	__C(CHIP,_mem_write_raw_multi_8),
-};
-
-bus_space_tag_t
-__C(CHIP,_bus_mem_init)(v)
-	void *v;
-{
-        bus_space_tag_t t = &__C(CHIP,_mem_space);
-	struct extent *dex, *sex;
-
-	t->abs_cookie = v;
+	t->abs_wrm_2 =		__C(CHIP,_mem_write_raw_multi_2);
+	t->abs_wrm_4 =		__C(CHIP,_mem_write_raw_multi_4);
+	t->abs_wrm_8 =		__C(CHIP,_mem_write_raw_multi_8);
 
 	/* XXX WE WANT EXTENT_NOCOALESCE, BUT WE CAN'T USE IT. XXX */
 	dex = extent_create(__S(__C(CHIP,_bus_dmem)), 0x0UL,
@@ -342,8 +342,6 @@ __C(CHIP,_bus_mem_init)(v)
         extent_print(sex);
 #endif
         CHIP_S_MEM_EXTENT(v) = sex;
-
-	return (t);
 }
 
 static int	__C(CHIP,_xlate_addr_to_dense_handle) __P((void *,
diff --git a/sys/arch/alpha/pci/pci_up1000.c b/sys/arch/alpha/pci/pci_up1000.c
index 153281ebd2a..d615581988d 100644
--- a/sys/arch/alpha/pci/pci_up1000.c
+++ b/sys/arch/alpha/pci/pci_up1000.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pci_up1000.c,v 1.6 2001/11/06 19:53:13 miod Exp $	*/
+/*	$OpenBSD: pci_up1000.c,v 1.7 2001/12/14 00:44:59 nate Exp $	*/
 /* $NetBSD: pci_up1000.c,v 1.6 2000/12/28 22:59:07 sommerfeld Exp $ */
 
 /*-
@@ -80,7 +80,7 @@ void    api_up1000_pciide_compat_intr_disestablish(void *, void *);
 void
 pci_up1000_pickintr(struct irongate_config *icp)
 {
-	bus_space_tag_t iot = icp->ic_iot;
+	bus_space_tag_t iot = &icp->ic_iot;
 	pci_chipset_tag_t pc = &icp->ic_pc;
 
 	pc->pc_intr_v = icp;
diff --git a/sys/arch/alpha/pci/tsc.c b/sys/arch/alpha/pci/tsc.c
index 8467aa1349f..f2f9dd14335 100644
--- a/sys/arch/alpha/pci/tsc.c
+++ b/sys/arch/alpha/pci/tsc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tsc.c,v 1.5 2001/11/04 23:12:46 art Exp $ */
+/* $OpenBSD: tsc.c,v 1.6 2001/12/14 00:44:59 nate Exp $ */
 /* $NetBSD: tsc.c,v 1.3 2000/06/25 19:17:40 thorpej Exp $ */
 
 /*-
@@ -194,8 +194,8 @@ tspattach(parent, self, aux)
 	pci_6600_pickintr(pcp);
 
 	pba.pba_busname = "pci";
-	pba.pba_iot = pcp->pc_iot;
-	pba.pba_memt = pcp->pc_memt;
+	pba.pba_iot = &pcp->pc_iot;
+	pba.pba_memt = &pcp->pc_memt;
 	pba.pba_dmat =
 	    alphabus_dma_get_tag(&pcp->pc_dmat_direct, ALPHA_BUS_PCI);
 	pba.pba_pc = &pcp->pc_pc;
@@ -220,8 +220,8 @@ tsp_init(mallocsafe, n)
 	pcp->pc_iobase = TS_Pn(n, 0);
 	pcp->pc_csr = S_PAGE(TS_Pn(n, P_CSRBASE));
 	if (!pcp->pc_initted) {
-		pcp->pc_iot = tsp_bus_io_init(pcp);
-		pcp->pc_memt = tsp_bus_mem_init(pcp);
+		tsp_bus_io_init(&pcp->pc_iot, pcp);
+		tsp_bus_mem_init(&pcp->pc_memt, pcp);
 #if 0
 		alpha_bus_window_count[ALPHA_BUS_TYPE_PCI_IO] = 1;
 		alpha_bus_window_count[ALPHA_BUS_TYPE_PCI_MEM] = 1;
diff --git a/sys/arch/alpha/pci/tsvar.h b/sys/arch/alpha/pci/tsvar.h
index c874c1a0088..30046cc6720 100644
--- a/sys/arch/alpha/pci/tsvar.h
+++ b/sys/arch/alpha/pci/tsvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: tsvar.h,v 1.2 2001/04/15 01:33:00 mjacob Exp $ */
+/* $OpenBSD: tsvar.h,v 1.3 2001/12/14 00:44:59 nate Exp $ */
 /* $NetBSD: tsvar.h,v 1.1 1999/06/29 06:46:47 ross Exp $ */
 
 /*-
@@ -48,7 +48,7 @@ struct tsp_config {
 	u_int64_t pc_iobase;		/* All Pchip space starts here */
 	struct	ts_pchip *pc_csr;	/* Pchip CSR space starts here */
 
-	bus_space_tag_t pc_iot, pc_memt;
+	struct	alpha_bus_space pc_iot, pc_memt;
 	struct	alpha_pci_chipset pc_pc;
 
 	struct	alpha_bus_dma_tag pc_dmat_direct;
@@ -79,7 +79,7 @@ struct	tsp_config *tsp_init __P((int, int));
 void	tsp_pci_init __P((pci_chipset_tag_t, void *));
 void	tsp_dma_init __P((struct tsp_config *));
 
-bus_space_tag_t tsp_bus_io_init __P((void *));
-bus_space_tag_t tsp_bus_mem_init __P((void *));
+void	tsp_bus_io_init __P((bus_space_tag_t, void *));
+void	tsp_bus_mem_init __P((bus_space_tag_t, void *));
 
 void tsp_bus_mem_init2 __P((void *));