Get rid of bus_space_tag_t now unused bus_extent and bus_reverse fields.

4 files changed, 6 insertions, 23 deletions

diff --git a/sys/arch/sgi/include/bus.h b/sys/arch/sgi/include/bus.h
index adf15bf0b6f..a69072f33ec 100644
--- a/sys/arch/sgi/include/bus.h
+++ b/sys/arch/sgi/include/bus.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bus.h,v 1.17 2009/07/22 20:06:20 miod Exp $	*/
+/*	$OpenBSD: bus.h,v 1.18 2009/07/22 21:28:41 miod Exp $	*/
 
 /*
  * Copyright (c) 2003-2004 Opsycon AB Sweden.  All rights reserved.
@@ -46,10 +46,8 @@ typedef struct mips_bus_space *bus_space_tag_t;
 typedef struct mips_bus_space bus_space_t;
 
 struct mips_bus_space {
-	struct extent	*bus_extent;
 	bus_addr_t	bus_base;
 	void		*bus_private;
-	int32_t		bus_reverse;
 	u_int8_t	(*_space_read_1)(bus_space_tag_t , bus_space_handle_t,
 			  bus_size_t);
 	void		(*_space_write_1)(bus_space_tag_t , bus_space_handle_t,
diff --git a/sys/arch/sgi/localbus/macebus.c b/sys/arch/sgi/localbus/macebus.c
index 8d72a53d944..6b6136cf6a0 100644
--- a/sys/arch/sgi/localbus/macebus.c
+++ b/sys/arch/sgi/localbus/macebus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: macebus.c,v 1.41 2009/07/22 21:28:08 miod Exp $ */
+/*	$OpenBSD: macebus.c,v 1.42 2009/07/22 21:28:42 miod Exp $ */
 
 /*
  * Copyright (c) 2000-2004 Opsycon AB  (www.opsycon.se)
@@ -105,10 +105,8 @@ struct cfdriver macebus_cd = {
 };
 
 bus_space_t macebus_tag = {
-	NULL,
 	PHYS_TO_XKPHYS(MACEBUS_BASE, CCA_NC),
 	NULL,
-	0,
 	mace_read_1, mace_write_1,
 	mace_read_2, mace_write_2,
 	mace_read_4, mace_write_4,
@@ -121,10 +119,8 @@ bus_space_t macebus_tag = {
 };
 
 bus_space_t crimebus_tag = {
-	NULL,
 	PHYS_TO_XKPHYS(CRIMEBUS_BASE, CCA_NC),
 	NULL,
-	0,
 	mace_read_1, mace_write_1,
 	mace_read_2, mace_write_2,
 	mace_read_4, mace_write_4,
diff --git a/sys/arch/sgi/pci/macepcibridge.c b/sys/arch/sgi/pci/macepcibridge.c
index 9b214821e23..9de3c526ee1 100644
--- a/sys/arch/sgi/pci/macepcibridge.c
+++ b/sys/arch/sgi/pci/macepcibridge.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: macepcibridge.c,v 1.27 2009/07/22 20:28:21 miod Exp $ */
+/*	$OpenBSD: macepcibridge.c,v 1.28 2009/07/22 21:28:44 miod Exp $ */
 
 /*
  * Copyright (c) 2009 Miodrag Vallat.
@@ -117,10 +117,8 @@ struct cfdriver macepcibr_cd = {
 };
 
 bus_space_t mace_pcibbus_mem_tag = {
+	PHYS_TO_XKPHYS(MACE_PCI_MEM_BASE, CCA_NC),
 	NULL,
-	0ULL,
-	NULL,
-	0,
 	mace_pcib_read_1, mace_pcib_write_1,
 	mace_pcib_read_2, mace_pcib_write_2,
 	mace_pcib_read_4, mace_pcib_write_4,
@@ -132,10 +130,8 @@ bus_space_t mace_pcibbus_mem_tag = {
 };
 
 bus_space_t mace_pcibbus_io_tag = {
+	PHYS_TO_XKPHYS(MACE_PCI_IO_BASE, CCA_NC),
 	NULL,
-	0ULL,
-	NULL,
-	0,
 	mace_pcib_read_1, mace_pcib_write_1,
 	mace_pcib_read_2, mace_pcib_write_2,
 	mace_pcib_read_4, mace_pcib_write_4,
@@ -214,11 +210,6 @@ mace_pcibrattach(struct device *parent, struct device *self, void *aux)
 	struct confargs *ca = aux;
 	pcireg_t pcireg;
 
-	mace_pcibbus_io_tag.bus_base =
-	    PHYS_TO_XKPHYS(MACE_PCI_IO_BASE, CCA_NC);
-	mace_pcibbus_mem_tag.bus_base =
-	    PHYS_TO_XKPHYS(MACE_PCI_MEM_BASE, CCA_NC);
-
 	sc->sc_mem_bus_space = &mace_pcibbus_mem_tag;
 	sc->sc_io_bus_space = &mace_pcibbus_io_tag;
 
diff --git a/sys/arch/sgi/xbow/xbow.c b/sys/arch/sgi/xbow/xbow.c
index 90954b50e3b..b77bc88675b 100644
--- a/sys/arch/sgi/xbow/xbow.c
+++ b/sys/arch/sgi/xbow/xbow.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: xbow.c,v 1.14 2009/07/06 22:46:43 miod Exp $	*/
+/*	$OpenBSD: xbow.c,v 1.15 2009/07/22 21:28:44 miod Exp $	*/
 
 /*
  * Copyright (c) 2008, 2009 Miodrag Vallat.
@@ -117,10 +117,8 @@ struct cfdriver xbow_cd = {
 };
 
 static const bus_space_t xbowbus_tag = {
-	NULL,
 	(bus_addr_t)0,		/* will be modified in widgets bus_space_t */
 	NULL,
-	0,
 	xbow_read_1,
 	xbow_write_1,
 	xbow_read_2,