[src/trunk]: src/sys/arch Make these build with recent tweaks to powerpc's bu...

[scw <scw%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/924ffcd28401
branches:  trunk
changeset: 550027:924ffcd28401
user:      scw <scw%NetBSD.org@localhost>
date:      Mon Jul 28 07:58:49 2003 +0000

description:
Make these build with recent tweaks to powerpc's bus_space(9) by moving
the inclusion of <powerpc/bus.h> to *after* the definitions of
PHYS_TO_BUS_MEM() and BUS_MEM_TO_PHYS().

diffstat:

 sys/arch/bebox/include/bus.h     |  6 +++---
 sys/arch/mvmeppc/include/bus.h   |  9 ++++-----
 sys/arch/pmppc/include/bus.h     |  6 +++---
 sys/arch/prep/include/bus.h      |  6 +++---
 sys/arch/sandpoint/include/bus.h |  6 +++---
 5 files changed, 16 insertions(+), 17 deletions(-)

diffs (127 lines):

diff -r fa209df51b23 -r 924ffcd28401 sys/arch/bebox/include/bus.h
--- a/sys/arch/bebox/include/bus.h      Mon Jul 28 07:05:56 2003 +0000
+++ b/sys/arch/bebox/include/bus.h      Mon Jul 28 07:58:49 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bus.h,v 1.27 2003/03/18 16:40:19 matt Exp $    */
+/*     $NetBSD: bus.h,v 1.28 2003/07/28 07:58:49 scw Exp $     */
 /*     $OpenBSD: bus.h,v 1.1 1997/10/13 10:53:42 pefo Exp $    */
 
 /*-
@@ -104,8 +104,6 @@
 #ifndef _BEBOX_BUS_H_
 #define _BEBOX_BUS_H_
 
-#include <powerpc/bus.h>
-
 /*
  * Values for the Be bus space tag, not to be used directly by MI code.
  */
@@ -127,4 +125,6 @@
 extern struct powerpc_bus_space bebox_isa_mem_bs_tag;
 #endif
 
+#include <powerpc/bus.h>
+
 #endif /* _BEBOX_BUS_H_ */
diff -r fa209df51b23 -r 924ffcd28401 sys/arch/mvmeppc/include/bus.h
--- a/sys/arch/mvmeppc/include/bus.h    Mon Jul 28 07:05:56 2003 +0000
+++ b/sys/arch/mvmeppc/include/bus.h    Mon Jul 28 07:58:49 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bus.h,v 1.2 2003/03/18 16:40:20 matt Exp $     */
+/*     $NetBSD: bus.h,v 1.3 2003/07/28 07:58:50 scw Exp $      */
 
 /*-
  * Copyright (c) 200e The NetBSD Foundation, Inc.
@@ -39,9 +39,11 @@
 #ifndef _MVMEPPC_BUS_H_
 #define _MVMEPPC_BUS_H_
 
+#define PHYS_TO_BUS_MEM(t,x)   ((x) | 0x80000000)
+#define BUS_MEM_TO_PHYS(t,x)   ((x) & ~0x80000000)
+
 #include <powerpc/bus.h>
 
-
 #define        MVMEPPC_PHYS_BASE_IO            0x80000000
 #define        MVMEPPC_PHYS_SIZE_IO            0x3f800000
 #define        MVMEPPC_PHYS_RESVD_START_IO     0x00010000
@@ -58,9 +60,6 @@
 #define        MVMEPPC_BUS_SPACE_MEM           1
 #define        MVMEPPC_BUS_SPACE_NUM_REGIONS   2
 
-#define PHYS_TO_BUS_MEM(t,x)   ((x) | 0x80000000)
-#define BUS_MEM_TO_PHYS(t,x)   ((x) & ~0x80000000)
-
 #ifdef _KERNEL
 extern struct powerpc_bus_space mvmeppc_isa_io_bs_tag;
 extern struct powerpc_bus_space mvmeppc_isa_mem_bs_tag;
diff -r fa209df51b23 -r 924ffcd28401 sys/arch/pmppc/include/bus.h
--- a/sys/arch/pmppc/include/bus.h      Mon Jul 28 07:05:56 2003 +0000
+++ b/sys/arch/pmppc/include/bus.h      Mon Jul 28 07:58:49 2003 +0000
@@ -1,10 +1,8 @@
-/*     $NetBSD: bus.h,v 1.2 2003/03/06 00:20:42 matt Exp $     */
+/*     $NetBSD: bus.h,v 1.3 2003/07/28 07:58:51 scw Exp $      */
 
 #ifndef _PMPPC_BUS_H_
 #define _PMPPC_BUS_H_
 
-#include <powerpc/bus.h>
-
 /*
  * Address conversion as seen from a PCI master.
  */
@@ -17,4 +15,6 @@
 void   pmppc_bus_space_init(void);
 void   pmppc_bus_space_mallocok(void);
 
+#include <powerpc/bus.h>
+
 #endif /* _PMPPC_BUS_H_ */
diff -r fa209df51b23 -r 924ffcd28401 sys/arch/prep/include/bus.h
--- a/sys/arch/prep/include/bus.h       Mon Jul 28 07:05:56 2003 +0000
+++ b/sys/arch/prep/include/bus.h       Mon Jul 28 07:58:49 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bus.h,v 1.9 2003/03/18 16:40:22 matt Exp $     */
+/*     $NetBSD: bus.h,v 1.10 2003/07/28 07:58:51 scw Exp $     */
 /*     $OpenBSD: bus.h,v 1.1 1997/10/13 10:53:42 pefo Exp $    */
 
 /*-
@@ -104,8 +104,6 @@
 #ifndef _PREP_BUS_H_
 #define _PREP_BUS_H_
 
-#include <powerpc/bus.h>
-
 /*
  * Values for the Be bus space tag, not to be used directly by MI code.
  */
@@ -126,4 +124,6 @@
 extern struct powerpc_bus_space prep_isa_mem_space_tag;
 #endif
 
+#include <powerpc/bus.h>
+
 #endif /* _PREP_BUS_H_ */
diff -r fa209df51b23 -r 924ffcd28401 sys/arch/sandpoint/include/bus.h
--- a/sys/arch/sandpoint/include/bus.h  Mon Jul 28 07:05:56 2003 +0000
+++ b/sys/arch/sandpoint/include/bus.h  Mon Jul 28 07:58:49 2003 +0000
@@ -1,11 +1,9 @@
-/*     $NetBSD: bus.h,v 1.5 2003/03/18 16:40:24 matt Exp $     */
+/*     $NetBSD: bus.h,v 1.6 2003/07/28 07:58:52 scw Exp $      */
 /*     $OpenBSD: bus.h,v 1.1 1997/10/13 10:53:42 pefo Exp $    */
 
 #ifndef _SANDPOINT_BUS_H_
 #define _SANDPOINT_BUS_H_
 
-#include <powerpc/bus.h>
-
 /*
  * Values for the SandPoint bus space tag, not to be used directly by MI code.
  */
@@ -25,4 +23,6 @@
 extern struct powerpc_bus_space sandpoint_isa_io_bs_tag;
 extern struct powerpc_bus_space sandpoint_mem_bs_tag;
 
+#include <powerpc/bus.h>
+
 #endif /* _SANDPOINT_BUS_H_ */