diff options
Diffstat (limited to 'sys/powerpc/include')
| -rw-r--r-- | sys/powerpc/include/_bus.h | 46 | ||||
| -rw-r--r-- | sys/powerpc/include/bus.h | 13 |
2 files changed, 47 insertions, 12 deletions
diff --git a/sys/powerpc/include/_bus.h b/sys/powerpc/include/_bus.h new file mode 100644 index 0000000..5561ce7 --- /dev/null +++ b/sys/powerpc/include/_bus.h @@ -0,0 +1,46 @@ +/*- + * Copyright (c) 2005 M. Warner Losh. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions, and the following disclaimer, + * without modification, immediately at the beginning of the file. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD$ + */ + +#ifndef POWERPC_INCLUDE__BUS_H +#define POWERPC_INCLUDE__BUS_H + +/* + * Bus address and size types + */ +typedef u_int32_t bus_addr_t; +typedef u_int32_t bus_size_t; + +/* + * Access methods for bus resources and address space. + */ +typedef u_int32_t bus_space_tag_t; +typedef u_int32_t bus_space_handle_t; + +#endif /* POWERPC_INCLUDE__BUS_H */ 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) |
