diff options
author | marius <marius@FreeBSD.org> | 2006-06-13 19:18:09 +0000 |
---|---|---|
committer | marius <marius@FreeBSD.org> | 2006-06-13 19:18:09 +0000 |
commit | 35917647ed66746e3c838add29c86d9153593edb (patch) | |
tree | 71cbc568702fcd83017598c611c47ac877466732 /sys/sparc64/include | |
parent | de5cf4e1bd99fe043e69e10c97b99ee6495116d3 (diff) | |
download | FreeBSD-src-35917647ed66746e3c838add29c86d9153593edb.zip FreeBSD-src-35917647ed66746e3c838add29c86d9153593edb.tar.gz |
- Complete breaking out the definition of bus_space_{tag,handle}_t by
moving the typedef of bus_space_tag_t from sys/sparc64/include/bus.h
to sys/sparc64/include/_bus.h. This brings sparc64 in sync with the
other platforms and fixes the compilation of drivers which include
<sys/rman.h> before <machine/bus.h> after sys/sys/rman.h rev. 1.34.
- Remove the definition of bus_type_t from sys/sparc64/include/_bus.h
as it's unused since sys/sparc64/include/bus.h rev. 1.6 and
sys/sparc64/sparc64/bus_machdep.c rev. 1.3.
- Remove some pointless comments.
Diffstat (limited to 'sys/sparc64/include')
-rw-r--r-- | sys/sparc64/include/_bus.h | 11 | ||||
-rw-r--r-- | sys/sparc64/include/bus.h | 5 |
2 files changed, 4 insertions, 12 deletions
diff --git a/sys/sparc64/include/_bus.h b/sys/sparc64/include/_bus.h index c3db341..b24ed62 100644 --- a/sys/sparc64/include/_bus.h +++ b/sys/sparc64/include/_bus.h @@ -31,12 +31,9 @@ #ifndef SPARC64_INCLUDE__BUS_H #define SPARC64_INCLUDE__BUS_H -/* - * Bus address and size types - */ -typedef u_long bus_space_handle_t; -typedef int bus_type_t; -typedef u_long bus_addr_t; -typedef u_long bus_size_t; +typedef u_long bus_addr_t; +typedef u_long bus_size_t; +typedef u_long bus_space_handle_t; +typedef struct bus_space_tag *bus_space_tag_t; #endif /* SPARC64_INCLUDE__BUS_H */ diff --git a/sys/sparc64/include/bus.h b/sys/sparc64/include/bus.h index 79f6a67..132506b 100644 --- a/sys/sparc64/include/bus.h +++ b/sys/sparc64/include/bus.h @@ -110,11 +110,6 @@ extern int bus_stream_asi[]; #define BUS_SPACE_UNRESTRICTED (~0) -/* - * Access methods for bus resources and address space. - */ -typedef struct bus_space_tag *bus_space_tag_t; - struct bus_space_tag { void *bst_cookie; bus_space_tag_t bst_parent; |