diff options
| author | imp <imp@FreeBSD.org> | 2005-04-18 21:45:34 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2005-04-18 21:45:34 +0000 |
| commit | b1662f9d0ff8d1dca5c34433ff64b70c1f5f0f0a (patch) | |
| tree | 4ea69fe9294e319270ad55cf2646a544d2689e65 /sys/i386/include/bus.h | |
| parent | b7f29c0fc0b1ddd6e927c22526ba675066d88be3 (diff) | |
| download | FreeBSD-src-b1662f9d0ff8d1dca5c34433ff64b70c1f5f0f0a.zip FreeBSD-src-b1662f9d0ff8d1dca5c34433ff64b70c1f5f0f0a.tar.gz | |
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
Diffstat (limited to 'sys/i386/include/bus.h')
| -rw-r--r-- | sys/i386/include/bus.h | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/sys/i386/include/bus.h b/sys/i386/include/bus.h index 29c6d98..4fd13ea 100644 --- a/sys/i386/include/bus.h +++ b/sys/i386/include/bus.h @@ -104,6 +104,7 @@ #ifndef _I386_BUS_H_ #define _I386_BUS_H_ +#include <machine/_bus.h> #include <machine/cpufunc.h> /* @@ -121,16 +122,6 @@ #define I386_BUS_SPACE_IO 0 /* space is i/o space */ #define I386_BUS_SPACE_MEM 1 /* space is mem space */ -/* - * Bus address and size types - */ -#ifdef PAE -typedef uint64_t bus_addr_t; -#else -typedef uint32_t bus_addr_t; -#endif -typedef uint32_t bus_size_t; - #define BUS_SPACE_MAXSIZE_24BIT 0xFFFFFF #define BUS_SPACE_MAXSIZE_32BIT 0xFFFFFFFF #define BUS_SPACE_MAXSIZE 0xFFFFFFFF @@ -145,12 +136,6 @@ typedef uint32_t bus_size_t; #define BUS_SPACE_UNRESTRICTED (~0) /* - * Access methods for bus resources and address space. - */ -typedef int bus_space_tag_t; -typedef u_int bus_space_handle_t; - -/* * Map a region of device bus space into CPU virtual address space. */ |
