Improve compatibility with other systems by changing the default

behavior slightly.

If machine/bus.h is included, but neither bus_memio.h nor bus_pio.h
are included, then behave as if both were included.

This won't change existing drivers, all of which include one or more
of bus_{p,mem}io.h, but will allow drivers from other systems to come
over with fewer changes.  I freely admit that this might not be
optimal for some drivers, but those drivers can be optimized for
FreeBSD after the initial bringup happens.

Without the change, there is a bug that preclude drivers from
compiling with strange warning/errors.

I've been running this here for a while now w/o ill effects.

Reviewed by: gibbs
Not objected to by: bde, arch@ list.

10 files changed, 100 insertions, 10 deletions

diff --git a/sys/alpha/include/bus.h b/sys/alpha/include/bus.h
index 86f80ea..52a7c69 100644
--- a/sys/alpha/include/bus.h
+++ b/sys/alpha/include/bus.h
@@ -67,7 +67,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/* $Id: bus.h,v 1.2 1998/09/16 08:22:57 dfr Exp $ */
+/* $Id: bus.h,v 1.3 1999/06/05 13:30:01 dfr Exp $ */
 
 #ifndef _ALPHA_BUS_H_
 #define _ALPHA_BUS_H_
@@ -75,6 +75,15 @@
 #include <machine/cpufunc.h>
 
 /*
+ * To remain compatible with NetBSD's interface, default to both memio and
+ * pio when neither of them is defined.
+ */ 
+#if !defined(_ALPHA_BUS_PIO_H_) && !defined(_ALPHA_BUS_MEMIO_H_)
+#define _ALPHA_BUS_PIO_H_
+#define _ALPHA_BUS_MEMIO_H_
+#endif
+
+/*
  * Values for the alpha bus space tag, not to be used directly by MI code.
  */
 #define	ALPHA_BUS_SPACE_IO	0	/* space is i/o space */
diff --git a/sys/amd64/include/bus.h b/sys/amd64/include/bus.h
index 75b2b73..28e80ba 100644
--- a/sys/amd64/include/bus.h
+++ b/sys/amd64/include/bus.h
@@ -67,7 +67,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/* $Id: bus.h,v 1.3 1998/05/06 01:45:47 gibbs Exp $ */
+/* $Id: bus.h,v 1.4 1998/09/29 09:06:00 bde Exp $ */
 
 #ifndef _I386_BUS_H_
 #define _I386_BUS_H_
@@ -75,6 +75,15 @@
 #include <machine/cpufunc.h>
 
 /*
+ * To remain compatible with NetBSD's interface, default to both memio and
+ * pio when neither of them is defined.
+ */ 
+#if !defined(_I386_BUS_PIO_H_) && !defined(_I386_BUS_MEMIO_H_)
+#define _I386_BUS_PIO_H_
+#define _I386_BUS_MEMIO_H_
+#endif
+
+/*
  * Values for the i386 bus space tag, not to be used directly by MI code.
  */
 #define	I386_BUS_SPACE_IO	0	/* space is i/o space */
diff --git a/sys/amd64/include/bus_amd64.h b/sys/amd64/include/bus_amd64.h
index 75b2b73..28e80ba 100644
--- a/sys/amd64/include/bus_amd64.h
+++ b/sys/amd64/include/bus_amd64.h
@@ -67,7 +67,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/* $Id: bus.h,v 1.3 1998/05/06 01:45:47 gibbs Exp $ */
+/* $Id: bus.h,v 1.4 1998/09/29 09:06:00 bde Exp $ */
 
 #ifndef _I386_BUS_H_
 #define _I386_BUS_H_
@@ -75,6 +75,15 @@
 #include <machine/cpufunc.h>
 
 /*
+ * To remain compatible with NetBSD's interface, default to both memio and
+ * pio when neither of them is defined.
+ */ 
+#if !defined(_I386_BUS_PIO_H_) && !defined(_I386_BUS_MEMIO_H_)
+#define _I386_BUS_PIO_H_
+#define _I386_BUS_MEMIO_H_
+#endif
+
+/*
  * Values for the i386 bus space tag, not to be used directly by MI code.
  */
 #define	I386_BUS_SPACE_IO	0	/* space is i/o space */
diff --git a/sys/amd64/include/bus_at386.h b/sys/amd64/include/bus_at386.h
index 75b2b73..28e80ba 100644
--- a/sys/amd64/include/bus_at386.h
+++ b/sys/amd64/include/bus_at386.h
@@ -67,7 +67,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/* $Id: bus.h,v 1.3 1998/05/06 01:45:47 gibbs Exp $ */
+/* $Id: bus.h,v 1.4 1998/09/29 09:06:00 bde Exp $ */
 
 #ifndef _I386_BUS_H_
 #define _I386_BUS_H_
@@ -75,6 +75,15 @@
 #include <machine/cpufunc.h>
 
 /*
+ * To remain compatible with NetBSD's interface, default to both memio and
+ * pio when neither of them is defined.
+ */ 
+#if !defined(_I386_BUS_PIO_H_) && !defined(_I386_BUS_MEMIO_H_)
+#define _I386_BUS_PIO_H_
+#define _I386_BUS_MEMIO_H_
+#endif
+
+/*
  * Values for the i386 bus space tag, not to be used directly by MI code.
  */
 #define	I386_BUS_SPACE_IO	0	/* space is i/o space */
diff --git a/sys/amd64/include/bus_dma.h b/sys/amd64/include/bus_dma.h
index 75b2b73..28e80ba 100644
--- a/sys/amd64/include/bus_dma.h
+++ b/sys/amd64/include/bus_dma.h
@@ -67,7 +67,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/* $Id: bus.h,v 1.3 1998/05/06 01:45:47 gibbs Exp $ */
+/* $Id: bus.h,v 1.4 1998/09/29 09:06:00 bde Exp $ */
 
 #ifndef _I386_BUS_H_
 #define _I386_BUS_H_
@@ -75,6 +75,15 @@
 #include <machine/cpufunc.h>
 
 /*
+ * To remain compatible with NetBSD's interface, default to both memio and
+ * pio when neither of them is defined.
+ */ 
+#if !defined(_I386_BUS_PIO_H_) && !defined(_I386_BUS_MEMIO_H_)
+#define _I386_BUS_PIO_H_
+#define _I386_BUS_MEMIO_H_
+#endif
+
+/*
  * Values for the i386 bus space tag, not to be used directly by MI code.
  */
 #define	I386_BUS_SPACE_IO	0	/* space is i/o space */
diff --git a/sys/i386/include/bus.h b/sys/i386/include/bus.h
index 75b2b73..28e80ba 100644
--- a/sys/i386/include/bus.h
+++ b/sys/i386/include/bus.h
@@ -67,7 +67,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/* $Id: bus.h,v 1.3 1998/05/06 01:45:47 gibbs Exp $ */
+/* $Id: bus.h,v 1.4 1998/09/29 09:06:00 bde Exp $ */
 
 #ifndef _I386_BUS_H_
 #define _I386_BUS_H_
@@ -75,6 +75,15 @@
 #include <machine/cpufunc.h>
 
 /*
+ * To remain compatible with NetBSD's interface, default to both memio and
+ * pio when neither of them is defined.
+ */ 
+#if !defined(_I386_BUS_PIO_H_) && !defined(_I386_BUS_MEMIO_H_)
+#define _I386_BUS_PIO_H_
+#define _I386_BUS_MEMIO_H_
+#endif
+
+/*
  * Values for the i386 bus space tag, not to be used directly by MI code.
  */
 #define	I386_BUS_SPACE_IO	0	/* space is i/o space */
diff --git a/sys/i386/include/bus_at386.h b/sys/i386/include/bus_at386.h
index 75b2b73..28e80ba 100644
--- a/sys/i386/include/bus_at386.h
+++ b/sys/i386/include/bus_at386.h
@@ -67,7 +67,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/* $Id: bus.h,v 1.3 1998/05/06 01:45:47 gibbs Exp $ */
+/* $Id: bus.h,v 1.4 1998/09/29 09:06:00 bde Exp $ */
 
 #ifndef _I386_BUS_H_
 #define _I386_BUS_H_
@@ -75,6 +75,15 @@
 #include <machine/cpufunc.h>
 
 /*
+ * To remain compatible with NetBSD's interface, default to both memio and
+ * pio when neither of them is defined.
+ */ 
+#if !defined(_I386_BUS_PIO_H_) && !defined(_I386_BUS_MEMIO_H_)
+#define _I386_BUS_PIO_H_
+#define _I386_BUS_MEMIO_H_
+#endif
+
+/*
  * Values for the i386 bus space tag, not to be used directly by MI code.
  */
 #define	I386_BUS_SPACE_IO	0	/* space is i/o space */
diff --git a/sys/i386/include/bus_dma.h b/sys/i386/include/bus_dma.h
index 75b2b73..28e80ba 100644
--- a/sys/i386/include/bus_dma.h
+++ b/sys/i386/include/bus_dma.h
@@ -67,7 +67,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/* $Id: bus.h,v 1.3 1998/05/06 01:45:47 gibbs Exp $ */
+/* $Id: bus.h,v 1.4 1998/09/29 09:06:00 bde Exp $ */
 
 #ifndef _I386_BUS_H_
 #define _I386_BUS_H_
@@ -75,6 +75,15 @@
 #include <machine/cpufunc.h>
 
 /*
+ * To remain compatible with NetBSD's interface, default to both memio and
+ * pio when neither of them is defined.
+ */ 
+#if !defined(_I386_BUS_PIO_H_) && !defined(_I386_BUS_MEMIO_H_)
+#define _I386_BUS_PIO_H_
+#define _I386_BUS_MEMIO_H_
+#endif
+
+/*
  * Values for the i386 bus space tag, not to be used directly by MI code.
  */
 #define	I386_BUS_SPACE_IO	0	/* space is i/o space */
diff --git a/sys/i386/include/bus_pc98.h b/sys/i386/include/bus_pc98.h
index 75b2b73..28e80ba 100644
--- a/sys/i386/include/bus_pc98.h
+++ b/sys/i386/include/bus_pc98.h
@@ -67,7 +67,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/* $Id: bus.h,v 1.3 1998/05/06 01:45:47 gibbs Exp $ */
+/* $Id: bus.h,v 1.4 1998/09/29 09:06:00 bde Exp $ */
 
 #ifndef _I386_BUS_H_
 #define _I386_BUS_H_
@@ -75,6 +75,15 @@
 #include <machine/cpufunc.h>
 
 /*
+ * To remain compatible with NetBSD's interface, default to both memio and
+ * pio when neither of them is defined.
+ */ 
+#if !defined(_I386_BUS_PIO_H_) && !defined(_I386_BUS_MEMIO_H_)
+#define _I386_BUS_PIO_H_
+#define _I386_BUS_MEMIO_H_
+#endif
+
+/*
  * Values for the i386 bus space tag, not to be used directly by MI code.
  */
 #define	I386_BUS_SPACE_IO	0	/* space is i/o space */
diff --git a/sys/sys/bus_dma.h b/sys/sys/bus_dma.h
index 75b2b73..28e80ba 100644
--- a/sys/sys/bus_dma.h
+++ b/sys/sys/bus_dma.h
@@ -67,7 +67,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/* $Id: bus.h,v 1.3 1998/05/06 01:45:47 gibbs Exp $ */
+/* $Id: bus.h,v 1.4 1998/09/29 09:06:00 bde Exp $ */
 
 #ifndef _I386_BUS_H_
 #define _I386_BUS_H_
@@ -75,6 +75,15 @@
 #include <machine/cpufunc.h>
 
 /*
+ * To remain compatible with NetBSD's interface, default to both memio and
+ * pio when neither of them is defined.
+ */ 
+#if !defined(_I386_BUS_PIO_H_) && !defined(_I386_BUS_MEMIO_H_)
+#define _I386_BUS_PIO_H_
+#define _I386_BUS_MEMIO_H_
+#endif
+
+/*
  * Values for the i386 bus space tag, not to be used directly by MI code.
  */
 #define	I386_BUS_SPACE_IO	0	/* space is i/o space */