Break out the definition of bus_space_{tag,handle}_t and a few other types

into _bus.h to help with name space polution from including all of bus.h.
In a few days, I'll commit changes to the MI code to take advantage of thse
sepration (after I've made sure that these changes don't break anything in
the main tree, I've tested in my trees, but you never know...).

Suggested by: bde (in 2002 or 2003 I think)
Reviewed in principle by: jhb

1 files changed, 1 insertions, 12 deletions

diff --git a/sys/powerpc/include/bus.h b/sys/powerpc/include/bus.h
index 5892eef..c7bbf16 100644
--- a/sys/powerpc/include/bus.h
+++ b/sys/powerpc/include/bus.h
@@ -72,6 +72,7 @@
 #ifndef	_MACPPC_BUS_H_
 #define	_MACPPC_BUS_H_
 
+#include <machine/_bus.h>
 #include <machine/pio.h>
 
 #define BUS_SPACE_MAXSIZE_24BIT 0xFFFFFF
@@ -90,23 +91,11 @@
 #define	__BUS_SPACE_HAS_STREAM_METHODS 1
 
 /*
- * Bus address and size types
- */
-typedef u_int32_t bus_addr_t;
-typedef u_int32_t bus_size_t;
-
-/*
  * Define the PPC tag values
  */
 #define PPC_BUS_SPACE_MEM	1	/* space is mem space */
 #define PPC_BUS_SPACE_IO	2	/* space is io space */
 
-/*
- * Access methods for bus resources and address space.
- */
-typedef u_int32_t bus_space_tag_t;
-typedef u_int32_t bus_space_handle_t;
-
 static __inline void *
 __ppc_ba(bus_space_tag_t tag __unused, bus_space_handle_t handle, 
     bus_size_t offset)