diff options
173 files changed, 84 insertions, 1269 deletions
diff --git a/sys/alpha/include/bus_memio.h b/sys/alpha/include/bus_memio.h deleted file mode 100644 index d0b0ba3..0000000 --- a/sys/alpha/include/bus_memio.h +++ /dev/null @@ -1,31 +0,0 @@ -/*- - * Copyright (c) 1997 Justin Gibbs. - * 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. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * 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 _ALPHA_BUS_MEMIO_H_ -#define _ALPHA_BUS_MEMIO_H_ -#endif /* _ALPHA_BUS_MEMIO_H_ */ diff --git a/sys/alpha/include/bus_pio.h b/sys/alpha/include/bus_pio.h deleted file mode 100644 index f51bf43..0000000 --- a/sys/alpha/include/bus_pio.h +++ /dev/null @@ -1,31 +0,0 @@ -/*- - * Copyright (c) 1997 Justin Gibbs. - * 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. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * 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 _ALPHA_BUS_PIO_H_ -#define _ALPHA_BUS_PIO_H_ -#endif /* _ALPHA_BUS_PIO_H_ */ diff --git a/sys/alpha/isa/mcclock_isa.c b/sys/alpha/isa/mcclock_isa.c index 3cddfa5..de13690 100644 --- a/sys/alpha/isa/mcclock_isa.c +++ b/sys/alpha/isa/mcclock_isa.c @@ -37,7 +37,6 @@ __FBSDID("$FreeBSD$"); #include <sys/systm.h> #include <sys/module.h> #include <sys/bus.h> -#include <machine/bus_pio.h> #include <machine/bus.h> #include <machine/resource.h> #include <sys/rman.h> diff --git a/sys/amd64/include/bus.h b/sys/amd64/include/bus.h index 4143173..b1a91a2 100644 --- a/sys/amd64/include/bus.h +++ b/sys/amd64/include/bus.h @@ -108,15 +108,6 @@ #include <machine/cpufunc.h> /* - * To remain compatible with NetBSD's interface, default to both memio and - * pio when neither of them is defined. - */ -#if !defined(_AMD64_BUS_PIO_H_) && !defined(_AMD64_BUS_MEMIO_H_) -#define _AMD64_BUS_PIO_H_ -#define _AMD64_BUS_MEMIO_H_ -#endif - -/* * Values for the amd64 bus space tag, not to be used directly by MI code. */ #define AMD64_BUS_SPACE_IO 0 /* space is i/o space */ @@ -204,8 +195,6 @@ bus_space_free(bus_space_tag_t t __unused, bus_space_handle_t bsh __unused, } -#if defined(_AMD64_BUS_PIO_H_) || defined(_AMD64_BUS_MEMIO_H_) - /* * Read a 1, 2, 4, or 8 byte quantity from bus space * described by tag/handle/offset. @@ -226,45 +215,30 @@ static __inline u_int8_t bus_space_read_1(bus_space_tag_t tag, bus_space_handle_t handle, bus_size_t offset) { -#if defined (_AMD64_BUS_PIO_H_) -#if defined (_AMD64_BUS_MEMIO_H_) + if (tag == AMD64_BUS_SPACE_IO) -#endif return (inb(handle + offset)); -#endif -#if defined (_AMD64_BUS_MEMIO_H_) return (*(volatile u_int8_t *)(handle + offset)); -#endif } static __inline u_int16_t bus_space_read_2(bus_space_tag_t tag, bus_space_handle_t handle, bus_size_t offset) { -#if defined(_AMD64_BUS_PIO_H_) -#if defined(_AMD64_BUS_MEMIO_H_) + if (tag == AMD64_BUS_SPACE_IO) -#endif return (inw(handle + offset)); -#endif -#if defined(_AMD64_BUS_MEMIO_H_) return (*(volatile u_int16_t *)(handle + offset)); -#endif } static __inline u_int32_t bus_space_read_4(bus_space_tag_t tag, bus_space_handle_t handle, bus_size_t offset) { -#if defined(_AMD64_BUS_PIO_H_) -#if defined(_AMD64_BUS_MEMIO_H_) + if (tag == AMD64_BUS_SPACE_IO) -#endif return (inl(handle + offset)); -#endif -#if defined(_AMD64_BUS_MEMIO_H_) return (*(volatile u_int32_t *)(handle + offset)); -#endif } #if 0 /* Cause a link error for bus_space_read_8 */ @@ -294,17 +268,10 @@ static __inline void bus_space_read_multi_1(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t offset, u_int8_t *addr, size_t count) { -#if defined(_AMD64_BUS_PIO_H_) -#if defined(_AMD64_BUS_MEMIO_H_) + if (tag == AMD64_BUS_SPACE_IO) -#endif insb(bsh + offset, addr, count); -#endif -#if defined(_AMD64_BUS_MEMIO_H_) -#if defined(_AMD64_BUS_PIO_H_) - else -#endif - { + else { #ifdef __GNUCLIKE_ASM __asm __volatile(" \n\ cld \n\ @@ -316,24 +283,16 @@ bus_space_read_multi_1(bus_space_tag_t tag, bus_space_handle_t bsh, "%eax", "memory"); #endif } -#endif } static __inline void bus_space_read_multi_2(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t offset, u_int16_t *addr, size_t count) { -#if defined(_AMD64_BUS_PIO_H_) -#if defined(_AMD64_BUS_MEMIO_H_) + if (tag == AMD64_BUS_SPACE_IO) -#endif insw(bsh + offset, addr, count); -#endif -#if defined(_AMD64_BUS_MEMIO_H_) -#if defined(_AMD64_BUS_PIO_H_) - else -#endif - { + else { #ifdef __GNUCLIKE_ASM __asm __volatile(" \n\ cld \n\ @@ -345,24 +304,16 @@ bus_space_read_multi_2(bus_space_tag_t tag, bus_space_handle_t bsh, "%eax", "memory"); #endif } -#endif } static __inline void bus_space_read_multi_4(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t offset, u_int32_t *addr, size_t count) { -#if defined(_AMD64_BUS_PIO_H_) -#if defined(_AMD64_BUS_MEMIO_H_) + if (tag == AMD64_BUS_SPACE_IO) -#endif insl(bsh + offset, addr, count); -#endif -#if defined(_AMD64_BUS_MEMIO_H_) -#if defined(_AMD64_BUS_PIO_H_) - else -#endif - { + else { #ifdef __GNUCLIKE_ASM __asm __volatile(" \n\ cld \n\ @@ -374,7 +325,6 @@ bus_space_read_multi_4(bus_space_tag_t tag, bus_space_handle_t bsh, "%eax", "memory"); #endif } -#endif } #if 0 /* Cause a link error for bus_space_read_multi_8 */ @@ -406,11 +356,8 @@ static __inline void bus_space_read_region_1(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t offset, u_int8_t *addr, size_t count) { -#if defined(_AMD64_BUS_PIO_H_) -#if defined(_AMD64_BUS_MEMIO_H_) - if (tag == AMD64_BUS_SPACE_IO) -#endif - { + + if (tag == AMD64_BUS_SPACE_IO) { int _port_ = bsh + offset; #ifdef __GNUCLIKE_ASM __asm __volatile(" \n\ @@ -423,13 +370,7 @@ bus_space_read_region_1(bus_space_tag_t tag, bus_space_handle_t bsh, "0" (addr), "1" (count), "2" (_port_) : "%eax", "memory", "cc"); #endif - } -#endif -#if defined(_AMD64_BUS_MEMIO_H_) -#if defined(_AMD64_BUS_PIO_H_) - else -#endif - { + } else { bus_space_handle_t _port_ = bsh + offset; #ifdef __GNUCLIKE_ASM __asm __volatile(" \n\ @@ -441,18 +382,14 @@ bus_space_read_region_1(bus_space_tag_t tag, bus_space_handle_t bsh, "memory", "cc"); #endif } -#endif } static __inline void bus_space_read_region_2(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t offset, u_int16_t *addr, size_t count) { -#if defined(_AMD64_BUS_PIO_H_) -#if defined(_AMD64_BUS_MEMIO_H_) - if (tag == AMD64_BUS_SPACE_IO) -#endif - { + + if (tag == AMD64_BUS_SPACE_IO) { int _port_ = bsh + offset; #ifdef __GNUCLIKE_ASM __asm __volatile(" \n\ @@ -465,13 +402,7 @@ bus_space_read_region_2(bus_space_tag_t tag, bus_space_handle_t bsh, "0" (addr), "1" (count), "2" (_port_) : "%eax", "memory", "cc"); #endif - } -#endif -#if defined(_AMD64_BUS_MEMIO_H_) -#if defined(_AMD64_BUS_PIO_H_) - else -#endif - { + } else { bus_space_handle_t _port_ = bsh + offset; #ifdef __GNUCLIKE_ASM __asm __volatile(" \n\ @@ -483,18 +414,14 @@ bus_space_read_region_2(bus_space_tag_t tag, bus_space_handle_t bsh, "memory", "cc"); #endif } -#endif } static __inline void bus_space_read_region_4(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t offset, u_int32_t *addr, size_t count) { -#if defined(_AMD64_BUS_PIO_H_) -#if defined(_AMD64_BUS_MEMIO_H_) - if (tag == AMD64_BUS_SPACE_IO) -#endif - { + + if (tag == AMD64_BUS_SPACE_IO) { int _port_ = bsh + offset; #ifdef __GNUCLIKE_ASM __asm __volatile(" \n\ @@ -507,13 +434,7 @@ bus_space_read_region_4(bus_space_tag_t tag, bus_space_handle_t bsh, "0" (addr), "1" (count), "2" (_port_) : "%eax", "memory", "cc"); #endif - } -#endif -#if defined(_AMD64_BUS_MEMIO_H_) -#if defined(_AMD64_BUS_PIO_H_) - else -#endif - { + } else { bus_space_handle_t _port_ = bsh + offset; #ifdef __GNUCLIKE_ASM __asm __volatile(" \n\ @@ -525,7 +446,6 @@ bus_space_read_region_4(bus_space_tag_t tag, bus_space_handle_t bsh, "memory", "cc"); #endif } -#endif } #if 0 /* Cause a link error for bus_space_read_region_8 */ @@ -553,54 +473,33 @@ static __inline void bus_space_write_1(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t offset, u_int8_t value) { -#if defined(_AMD64_BUS_PIO_H_) -#if defined(_AMD64_BUS_MEMIO_H_) + if (tag == AMD64_BUS_SPACE_IO) -#endif outb(bsh + offset, value); -#endif -#if defined(_AMD64_BUS_MEMIO_H_) -#if defined(_AMD64_BUS_PIO_H_) else -#endif *(volatile u_int8_t *)(bsh + offset) = value; -#endif } static __inline void bus_space_write_2(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t offset, u_int16_t value) { -#if defined(_AMD64_BUS_PIO_H_) -#if defined(_AMD64_BUS_MEMIO_H_) + if (tag == AMD64_BUS_SPACE_IO) -#endif outw(bsh + offset, value); -#endif -#if defined(_AMD64_BUS_MEMIO_H_) -#if defined(_AMD64_BUS_PIO_H_) else -#endif *(volatile u_int16_t *)(bsh + offset) = value; -#endif } static __inline void bus_space_write_4(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t offset, u_int32_t value) { -#if defined(_AMD64_BUS_PIO_H_) -#if defined(_AMD64_BUS_MEMIO_H_) + if (tag == AMD64_BUS_SPACE_IO) -#endif outl(bsh + offset, value); -#endif -#if defined(_AMD64_BUS_MEMIO_H_) -#if defined(_AMD64_BUS_PIO_H_) else -#endif *(volatile u_int32_t *)(bsh + offset) = value; -#endif } #if 0 /* Cause a link error for bus_space_write_8 */ @@ -633,17 +532,10 @@ static __inline void bus_space_write_multi_1(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t offset, const u_int8_t *addr, size_t count) { -#if defined(_AMD64_BUS_PIO_H_) -#if defined(_AMD64_BUS_MEMIO_H_) + if (tag == AMD64_BUS_SPACE_IO) -#endif outsb(bsh + offset, addr, count); -#endif -#if defined(_AMD64_BUS_MEMIO_H_) -#if defined(_AMD64_BUS_PIO_H_) - else -#endif - { + else { #ifdef __GNUCLIKE_ASM __asm __volatile(" \n\ cld \n\ @@ -655,24 +547,16 @@ bus_space_write_multi_1(bus_space_tag_t tag, bus_space_handle_t bsh, "%eax", "memory", "cc"); #endif } -#endif } static __inline void bus_space_write_multi_2(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t offset, const u_int16_t *addr, size_t count) { -#if defined(_AMD64_BUS_PIO_H_) -#if defined(_AMD64_BUS_MEMIO_H_) + if (tag == AMD64_BUS_SPACE_IO) -#endif outsw(bsh + offset, addr, count); -#endif -#if defined(_AMD64_BUS_MEMIO_H_) -#if defined(_AMD64_BUS_PIO_H_) - else -#endif - { + else { #ifdef __GNUCLIKE_ASM __asm __volatile(" \n\ cld \n\ @@ -684,24 +568,16 @@ bus_space_write_multi_2(bus_space_tag_t tag, bus_space_handle_t bsh, "%eax", "memory", "cc"); #endif } -#endif } static __inline void bus_space_write_multi_4(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t offset, const u_int32_t *addr, size_t count) { -#if defined(_AMD64_BUS_PIO_H_) -#if defined(_AMD64_BUS_MEMIO_H_) + if (tag == AMD64_BUS_SPACE_IO) -#endif outsl(bsh + offset, addr, count); -#endif -#if defined(_AMD64_BUS_MEMIO_H_) -#if defined(_AMD64_BUS_PIO_H_) - else -#endif - { + else { #ifdef __GNUCLIKE_ASM __asm __volatile(" \n\ cld \n\ @@ -713,7 +589,6 @@ bus_space_write_multi_4(bus_space_tag_t tag, bus_space_handle_t bsh, "%eax", "memory", "cc"); #endif } -#endif } #if 0 /* Cause a link error for bus_space_write_multi_8 */ @@ -746,11 +621,8 @@ static __inline void bus_space_write_region_1(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t offset, const u_int8_t *addr, size_t count) { -#if defined(_AMD64_BUS_PIO_H_) -#if defined(_AMD64_BUS_MEMIO_H_) - if (tag == AMD64_BUS_SPACE_IO) -#endif - { + + if (tag == AMD64_BUS_SPACE_IO) { int _port_ = bsh + offset; #ifdef __GNUCLIKE_ASM __asm __volatile(" \n\ @@ -763,13 +635,7 @@ bus_space_write_region_1(bus_space_tag_t tag, bus_space_handle_t bsh, "0" (_port_), "1" (addr), "2" (count) : "%eax", "memory", "cc"); #endif - } -#endif -#if defined(_AMD64_BUS_MEMIO_H_) -#if defined(_AMD64_BUS_PIO_H_) - else -#endif - { + } else { bus_space_handle_t _port_ = bsh + offset; #ifdef __GNUCLIKE_ASM __asm __volatile(" \n\ @@ -781,18 +647,14 @@ bus_space_write_region_1(bus_space_tag_t tag, bus_space_handle_t bsh, "memory", "cc"); #endif } -#endif } static __inline void bus_space_write_region_2(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t offset, const u_int16_t *addr, size_t count) { -#if defined(_AMD64_BUS_PIO_H_) -#if defined(_AMD64_BUS_MEMIO_H_) - if (tag == AMD64_BUS_SPACE_IO) -#endif - { + + if (tag == AMD64_BUS_SPACE_IO) { int _port_ = bsh + offset; #ifdef __GNUCLIKE_ASM __asm __volatile(" \n\ @@ -805,13 +667,7 @@ bus_space_write_region_2(bus_space_tag_t tag, bus_space_handle_t bsh, "0" (_port_), "1" (addr), "2" (count) : "%eax", "memory", "cc"); #endif - } -#endif -#if defined(_AMD64_BUS_MEMIO_H_) -#if defined(_AMD64_BUS_PIO_H_) - else -#endif - { + } else { bus_space_handle_t _port_ = bsh + offset; #ifdef __GNUCLIKE_ASM __asm __volatile(" \n\ @@ -823,18 +679,14 @@ bus_space_write_region_2(bus_space_tag_t tag, bus_space_handle_t bsh, "memory", "cc"); #endif } -#endif } static __inline void bus_space_write_region_4(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t offset, const u_int32_t *addr, size_t count) { -#if defined(_AMD64_BUS_PIO_H_) -#if defined(_AMD64_BUS_MEMIO_H_) - if (tag == AMD64_BUS_SPACE_IO) -#endif - { + + if (tag == AMD64_BUS_SPACE_IO) { int _port_ = bsh + offset; #ifdef __GNUCLIKE_ASM __asm __volatile(" \n\ @@ -847,13 +699,7 @@ bus_space_write_region_4(bus_space_tag_t tag, bus_space_handle_t bsh, "0" (_port_), "1" (addr), "2" (count) : "%eax", "memory", "cc"); #endif - } -#endif -#if defined(_AMD64_BUS_MEMIO_H_) -#if defined(_AMD64_BUS_PIO_H_) - else -#endif - { + } else { bus_space_handle_t _port_ = bsh + offset; #ifdef __GNUCLIKE_ASM __asm __volatile(" \n\ @@ -865,7 +711,6 @@ bus_space_write_region_4(bus_space_tag_t tag, bus_space_handle_t bsh, "memory", "cc"); #endif } -#endif } #if 0 /* Cause a link error for bus_space_write_region_8 */ @@ -897,20 +742,12 @@ bus_space_set_multi_1(bus_space_tag_t tag, bus_space_handle_t bsh, { bus_space_handle_t addr = bsh + offset; -#if defined(_AMD64_BUS_PIO_H_) -#if defined(_AMD64_BUS_MEMIO_H_) if (tag == AMD64_BUS_SPACE_IO) -#endif while (count--) outb(addr, value); -#endif -#if defined(_AMD64_BUS_MEMIO_H_) -#if defined(_AMD64_BUS_PIO_H_) else -#endif while (count--) *(volatile u_int8_t *)(addr) = value; -#endif } static __inline void @@ -919,20 +756,12 @@ bus_space_set_multi_2(bus_space_tag_t tag, bus_space_handle_t bsh, { bus_space_handle_t addr = bsh + offset; -#if defined(_AMD64_BUS_PIO_H_) -#if defined(_AMD64_BUS_MEMIO_H_) if (tag == AMD64_BUS_SPACE_IO) -#endif while (count--) outw(addr, value); -#endif -#if defined(_AMD64_BUS_MEMIO_H_) -#if defined(_AMD64_BUS_PIO_H_) else -#endif while (count--) *(volatile u_int16_t *)(addr) = value; -#endif } static __inline void @@ -941,20 +770,12 @@ bus_space_set_multi_4(bus_space_tag_t tag, bus_space_handle_t bsh, { bus_space_handle_t addr = bsh + offset; -#if defined(_AMD64_BUS_PIO_H_) -#if defined(_AMD64_BUS_MEMIO_H_) if (tag == AMD64_BUS_SPACE_IO) -#endif while (count--) outl(addr, value); -#endif -#if defined(_AMD64_BUS_MEMIO_H_) -#if defined(_AMD64_BUS_PIO_H_) else -#endif while (count--) *(volatile u_int32_t *)(addr) = value; -#endif } #if 0 /* Cause a link error for bus_space_set_multi_8 */ @@ -985,20 +806,12 @@ bus_space_set_region_1(bus_space_tag_t tag, bus_space_handle_t bsh, { bus_space_handle_t addr = bsh + offset; -#if defined(_AMD64_BUS_PIO_H_) -#if defined(_AMD64_BUS_MEMIO_H_) if (tag == AMD64_BUS_SPACE_IO) -#endif for (; count != 0; count--, addr++) outb(addr, value); -#endif -#if defined(_AMD64_BUS_MEMIO_H_) -#if defined(_AMD64_BUS_PIO_H_) else -#endif for (; count != 0; count--, addr++) *(volatile u_int8_t *)(addr) = value; -#endif } static __inline void @@ -1007,20 +820,12 @@ bus_space_set_region_2(bus_space_tag_t tag, bus_space_handle_t bsh, { bus_space_handle_t addr = bsh + offset; -#if defined(_AMD64_BUS_PIO_H_) -#if defined(_AMD64_BUS_MEMIO_H_) if (tag == AMD64_BUS_SPACE_IO) -#endif for (; count != 0; count--, addr += 2) outw(addr, value); -#endif -#if defined(_AMD64_BUS_MEMIO_H_) -#if defined(_AMD64_BUS_PIO_H_) else -#endif for (; count != 0; count--, addr += 2) *(volatile u_int16_t *)(addr) = value; -#endif } static __inline void @@ -1029,20 +834,12 @@ bus_space_set_region_4(bus_space_tag_t tag, bus_space_handle_t bsh, { bus_space_handle_t addr = bsh + offset; -#if defined(_AMD64_BUS_PIO_H_) -#if defined(_AMD64_BUS_MEMIO_H_) if (tag == AMD64_BUS_SPACE_IO) -#endif for (; count != 0; count--, addr += 4) outl(addr, value); -#endif -#if defined(_AMD64_BUS_MEMIO_H_) -#if defined(_AMD64_BUS_PIO_H_) else -#endif for (; count != 0; count--, addr += 4) *(volatile u_int32_t *)(addr) = value; -#endif } #if 0 /* Cause a link error for bus_space_set_region_8 */ @@ -1080,11 +877,7 @@ bus_space_copy_region_1(bus_space_tag_t tag, bus_space_handle_t bsh1, bus_space_handle_t addr1 = bsh1 + off1; bus_space_handle_t addr2 = bsh2 + off2; -#if defined(_AMD64_BUS_PIO_H_) -#if defined(_AMD64_BUS_MEMIO_H_) - if (tag == AMD64_BUS_SPACE_IO) -#endif - { + if (tag == AMD64_BUS_SPACE_IO) { if (addr1 >= addr2) { /* src after dest: copy forward */ for (; count != 0; count--, addr1++, addr2++) @@ -1095,13 +888,7 @@ bus_space_copy_region_1(bus_space_tag_t tag, bus_space_handle_t bsh1, count != 0; count--, addr1--, addr2--) outb(addr2, inb(addr1)); } - } -#endif -#if defined(_AMD64_BUS_MEMIO_H_) -#if defined(_AMD64_BUS_PIO_H_) - else -#endif - { + } else { if (addr1 >= addr2) { /* src after dest: copy forward */ for (; count != 0; count--, addr1++, addr2++) @@ -1115,7 +902,6 @@ bus_space_copy_region_1(bus_space_tag_t tag, bus_space_handle_t bsh1, *(volatile u_int8_t *)(addr1); } } -#endif } static __inline void @@ -1126,11 +912,7 @@ bus_space_copy_region_2(bus_space_tag_t tag, bus_space_handle_t bsh1, bus_space_handle_t addr1 = bsh1 + off1; bus_space_handle_t addr2 = bsh2 + off2; -#if defined(_AMD64_BUS_PIO_H_) -#if defined(_AMD64_BUS_MEMIO_H_) - if (tag == AMD64_BUS_SPACE_IO) -#endif - { + if (tag == AMD64_BUS_SPACE_IO) { if (addr1 >= addr2) { /* src after dest: copy forward */ for (; count != 0; count--, addr1 += 2, addr2 += 2) @@ -1141,13 +923,7 @@ bus_space_copy_region_2(bus_space_tag_t tag, bus_space_handle_t bsh1, count != 0; count--, addr1 -= 2, addr2 -= 2) outw(addr2, inw(addr1)); } - } -#endif -#if defined(_AMD64_BUS_MEMIO_H_) -#if defined(_AMD64_BUS_PIO_H_) - else -#endif - { + } else { if (addr1 >= addr2) { /* src after dest: copy forward */ for (; count != 0; count--, addr1 += 2, addr2 += 2) @@ -1161,7 +937,6 @@ bus_space_copy_region_2(bus_space_tag_t tag, bus_space_handle_t bsh1, *(volatile u_int16_t *)(addr1); } } -#endif } static __inline void @@ -1172,11 +947,7 @@ bus_space_copy_region_4(bus_space_tag_t tag, bus_space_handle_t bsh1, bus_space_handle_t addr1 = bsh1 + off1; bus_space_handle_t addr2 = bsh2 + off2; -#if defined(_AMD64_BUS_PIO_H_) -#if defined(_AMD64_BUS_MEMIO_H_) - if (tag == AMD64_BUS_SPACE_IO) -#endif - { + if (tag == AMD64_BUS_SPACE_IO) { if (addr1 >= addr2) { /* src after dest: copy forward */ for (; count != 0; count--, addr1 += 4, addr2 += 4) @@ -1187,13 +958,7 @@ bus_space_copy_region_4(bus_space_tag_t tag, bus_space_handle_t bsh1, count != 0; count--, addr1 -= 4, addr2 -= 4) outl(addr2, inl(addr1)); } - } -#endif -#if defined(_AMD64_BUS_MEMIO_H_) -#if defined(_AMD64_BUS_PIO_H_) - else -#endif - { + } else { if (addr1 >= addr2) { /* src after dest: copy forward */ for (; count != 0; count--, addr1 += 4, addr2 += 4) @@ -1207,11 +972,8 @@ bus_space_copy_region_4(bus_space_tag_t tag, bus_space_handle_t bsh1, *(volatile u_int32_t *)(addr1); } } -#endif } -#endif /* defined(_AMD64_BUS_PIO_H_) || defined(_AMD64_MEM_IO_H_) */ - #if 0 /* Cause a link error for bus_space_copy_8 */ #define bus_space_copy_region_8 !!! bus_space_copy_region_8 unimplemented !!! #endif diff --git a/sys/amd64/include/bus_memio.h b/sys/amd64/include/bus_memio.h deleted file mode 100644 index 6a0d4f8..0000000 --- a/sys/amd64/include/bus_memio.h +++ /dev/null @@ -1,31 +0,0 @@ -/*- - * Copyright (c) 1997 Justin Gibbs. - * 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. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * 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 _AMD64_BUS_MEMIO_H_ -#define _AMD64_BUS_MEMIO_H_ -#endif /* _AMD64_BUS_MEMIO_H_ */ diff --git a/sys/amd64/include/bus_pio.h b/sys/amd64/include/bus_pio.h deleted file mode 100644 index 2044adf..0000000 --- a/sys/amd64/include/bus_pio.h +++ /dev/null @@ -1,31 +0,0 @@ -/*- - * Copyright (c) 1997 Justin Gibbs. - * 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. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * 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 _AMD64_BUS_PIO_H_ -#define _AMD64_BUS_PIO_H_ -#endif /* _AMD64_BUS_PIO_H_ */ diff --git a/sys/arm/include/bus_memio.h b/sys/arm/include/bus_memio.h deleted file mode 100644 index 2441000..0000000 --- a/sys/arm/include/bus_memio.h +++ /dev/null @@ -1,33 +0,0 @@ -/*- - * Copyright (c) 1997 Justin Gibbs. - * 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. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * 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. - * - * from: FreeBSD: src/sys/i386/include/bus_memio.h,v 1.2 1999/08/28 - * - * $FreeBSD$ - */ - -#ifndef _MACHINE_BUS_MEMIO_H_ -#define _MACHINE_BUS_MEMIO_H_ -#endif /* _MACHINE_BUS_MEMIO_H_ */ diff --git a/sys/arm/include/bus_pio.h b/sys/arm/include/bus_pio.h deleted file mode 100644 index aba61df..0000000 --- a/sys/arm/include/bus_pio.h +++ /dev/null @@ -1,33 +0,0 @@ -/*- - * Copyright (c) 1997 Justin Gibbs. - * 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. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * 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. - * - * from: FreeBSD: src/sys/i386/include/bus_pio.h,v 1.2 1999/08/28 - * - * $FreeBSD$ - */ - -#ifndef _MACHINE_BUS_PIO_H_ -#define _MACHINE_BUS_PIO_H_ -#endif /* _MACHINE_BUS_PIO_H_ */ diff --git a/sys/compat/ndis/subr_hal.c b/sys/compat/ndis/subr_hal.c index c6508ed..ca8f009 100644 --- a/sys/compat/ndis/subr_hal.c +++ b/sys/compat/ndis/subr_hal.c @@ -47,8 +47,6 @@ __FBSDID("$FreeBSD$"); #include <sys/systm.h> #include <machine/clock.h> -#include <machine/bus_memio.h> -#include <machine/bus_pio.h> #include <machine/bus.h> #include <sys/bus.h> diff --git a/sys/compat/ndis/subr_ndis.c b/sys/compat/ndis/subr_ndis.c index f7927c1..c1418a4 100644 --- a/sys/compat/ndis/subr_ndis.c +++ b/sys/compat/ndis/subr_ndis.c @@ -82,8 +82,6 @@ __FBSDID("$FreeBSD$"); #include <net/if_media.h> #include <machine/atomic.h> -#include <machine/bus_memio.h> -#include <machine/bus_pio.h> #include <machine/bus.h> #include <machine/resource.h> diff --git a/sys/compat/ndis/subr_ntoskrnl.c b/sys/compat/ndis/subr_ntoskrnl.c index 19f55fc..948f177 100644 --- a/sys/compat/ndis/subr_ntoskrnl.c +++ b/sys/compat/ndis/subr_ntoskrnl.c @@ -56,8 +56,6 @@ __FBSDID("$FreeBSD$"); #include <machine/atomic.h> #include <machine/clock.h> -#include <machine/bus_memio.h> -#include <machine/bus_pio.h> #include <machine/bus.h> #include <machine/stdarg.h> diff --git a/sys/dev/aac/aac.c b/sys/dev/aac/aac.c index 466c290..ea71528 100644 --- a/sys/dev/aac/aac.c +++ b/sys/dev/aac/aac.c @@ -52,7 +52,6 @@ __FBSDID("$FreeBSD$"); #include <sys/time.h> #include <sys/eventhandler.h> -#include <machine/bus_memio.h> #include <machine/bus.h> #include <sys/bus_dma.h> #include <machine/resource.h> diff --git a/sys/dev/aac/aac_pci.c b/sys/dev/aac/aac_pci.c index b57756f..15c4416 100644 --- a/sys/dev/aac/aac_pci.c +++ b/sys/dev/aac/aac_pci.c @@ -46,7 +46,6 @@ __FBSDID("$FreeBSD$"); #include <sys/conf.h> #include <sys/disk.h> -#include <machine/bus_memio.h> #include <machine/bus.h> #include <machine/resource.h> #include <sys/rman.h> diff --git a/sys/dev/acpica/Osd/OsdHardware.c b/sys/dev/acpica/Osd/OsdHardware.c index e8f933d..e239325 100644 --- a/sys/dev/acpica/Osd/OsdHardware.c +++ b/sys/dev/acpica/Osd/OsdHardware.c @@ -33,7 +33,6 @@ #include "acpi.h" -#include <machine/bus_pio.h> #include <machine/bus.h> #include <machine/pci_cfgreg.h> #include <dev/pci/pcireg.h> diff --git a/sys/dev/acpica/acpi_package.c b/sys/dev/acpica/acpi_package.c index 0cad9a0..78c1759 100644 --- a/sys/dev/acpica/acpi_package.c +++ b/sys/dev/acpica/acpi_package.c @@ -31,7 +31,6 @@ #include <sys/bus.h> #include <sys/sbuf.h> -#include <machine/bus_pio.h> #include <machine/bus.h> #include <machine/resource.h> #include <sys/rman.h> diff --git a/sys/dev/acpica/acpi_perf.c b/sys/dev/acpica/acpi_perf.c index 19a12d9..22b11bb 100644 --- a/sys/dev/acpica/acpi_perf.c +++ b/sys/dev/acpica/acpi_perf.c @@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$"); #include <sys/sbuf.h> #include <sys/pcpu.h> -#include <machine/bus_pio.h> #include <machine/bus.h> #include <machine/resource.h> #include <sys/rman.h> diff --git a/sys/dev/advansys/adv_eisa.c b/sys/dev/advansys/adv_eisa.c index e56cf29..6d6fa70 100644 --- a/sys/dev/advansys/adv_eisa.c +++ b/sys/dev/advansys/adv_eisa.c @@ -44,7 +44,6 @@ __FBSDID("$FreeBSD$"); #include <sys/mutex.h> #include <sys/bus.h> -#include <machine/bus_pio.h> #include <machine/bus.h> #include <machine/resource.h> #include <sys/rman.h> diff --git a/sys/dev/advansys/adv_isa.c b/sys/dev/advansys/adv_isa.c index 8a3a079..e0b7c15 100644 --- a/sys/dev/advansys/adv_isa.c +++ b/sys/dev/advansys/adv_isa.c @@ -55,7 +55,6 @@ __FBSDID("$FreeBSD$"); #include <sys/lock.h> #include <sys/mutex.h> -#include <machine/bus_pio.h> #include <machine/bus.h> #include <machine/resource.h> #include <sys/bus.h> diff --git a/sys/dev/advansys/adv_pci.c b/sys/dev/advansys/adv_pci.c index 909a85c..455e204 100644 --- a/sys/dev/advansys/adv_pci.c +++ b/sys/dev/advansys/adv_pci.c @@ -68,7 +68,6 @@ __FBSDID("$FreeBSD$"); #include <sys/module.h> #include <sys/mutex.h> -#include <machine/bus_pio.h> #include <machine/bus.h> #include <machine/resource.h> #include <sys/bus.h> diff --git a/sys/dev/advansys/advansys.c b/sys/dev/advansys/advansys.c index 7b9cfb1..aa6541d 100644 --- a/sys/dev/advansys/advansys.c +++ b/sys/dev/advansys/advansys.c @@ -55,7 +55,6 @@ __FBSDID("$FreeBSD$"); #include <sys/lock.h> #include <sys/mutex.h> -#include <machine/bus_pio.h> #include <machine/bus.h> #include <machine/resource.h> #include <sys/bus.h> diff --git a/sys/dev/advansys/advlib.c b/sys/dev/advansys/advlib.c index 4604571..e89829f 100644 --- a/sys/dev/advansys/advlib.c +++ b/sys/dev/advansys/advlib.c @@ -48,7 +48,6 @@ __FBSDID("$FreeBSD$"); #include <sys/kernel.h> #include <sys/systm.h> -#include <machine/bus_pio.h> #include <machine/bus.h> #include <machine/resource.h> #include <sys/bus.h> diff --git a/sys/dev/advansys/adw_pci.c b/sys/dev/advansys/adw_pci.c index 2e5e2e7..4d40ae3 100644 --- a/sys/dev/advansys/adw_pci.c +++ b/sys/dev/advansys/adw_pci.c @@ -44,7 +44,6 @@ __FBSDID("$FreeBSD$"); #include <sys/mutex.h> #include <sys/bus.h> -#include <machine/bus_pio.h> #include <machine/bus.h> #include <machine/resource.h> diff --git a/sys/dev/advansys/adwcam.c b/sys/dev/advansys/adwcam.c index c6c14fd..3b9ce17 100644 --- a/sys/dev/advansys/adwcam.c +++ b/sys/dev/advansys/adwcam.c @@ -54,8 +54,6 @@ __FBSDID("$FreeBSD$"); #include <sys/mutex.h> #include <sys/bus.h> -#include <machine/bus_pio.h> -#include <machine/bus_memio.h> #include <machine/bus.h> #include <machine/resource.h> diff --git a/sys/dev/advansys/adwlib.c b/sys/dev/advansys/adwlib.c index 518d76b..b926bba 100644 --- a/sys/dev/advansys/adwlib.c +++ b/sys/dev/advansys/adwlib.c @@ -49,8 +49,6 @@ __FBSDID("$FreeBSD$"); #include <sys/systm.h> #include <sys/bus.h> -#include <machine/bus_pio.h> -#include <machine/bus_memio.h> #include <machine/bus.h> #include <cam/cam.h> diff --git a/sys/dev/aha/aha.c b/sys/dev/aha/aha.c index 4300dba..b828a9d 100644 --- a/sys/dev/aha/aha.c +++ b/sys/dev/aha/aha.c @@ -68,7 +68,6 @@ __FBSDID("$FreeBSD$"); #include <sys/lock.h> #include <sys/mutex.h> -#include <machine/bus_pio.h> #include <machine/bus.h> #include <cam/cam.h> diff --git a/sys/dev/aha/aha_isa.c b/sys/dev/aha/aha_isa.c index 177b5cd..8805a60 100644 --- a/sys/dev/aha/aha_isa.c +++ b/sys/dev/aha/aha_isa.c @@ -63,7 +63,6 @@ __FBSDID("$FreeBSD$"); #include <sys/lock.h> #include <sys/mutex.h> -#include <machine/bus_pio.h> #include <machine/bus.h> #include <machine/resource.h> #include <sys/module.h> diff --git a/sys/dev/ahb/ahb.c b/sys/dev/ahb/ahb.c index 4d7249c..cafcd1a 100644 --- a/sys/dev/ahb/ahb.c +++ b/sys/dev/ahb/ahb.c @@ -37,7 +37,6 @@ #include <sys/mutex.h> #include <sys/bus.h> -#include <machine/bus_pio.h> #include <machine/bus.h> #include <machine/resource.h> #include <sys/rman.h> diff --git a/sys/dev/aic/aic.c b/sys/dev/aic/aic.c index 31f4283..b09d3e8 100644 --- a/sys/dev/aic/aic.c +++ b/sys/dev/aic/aic.c @@ -32,7 +32,6 @@ __FBSDID("$FreeBSD$"); #include <sys/kernel.h> #include <sys/bus.h> -#include <machine/bus_pio.h> #include <machine/bus.h> #include <cam/cam.h> diff --git a/sys/dev/aic/aic_isa.c b/sys/dev/aic/aic_isa.c index 0fd2125..71736f2 100644 --- a/sys/dev/aic/aic_isa.c +++ b/sys/dev/aic/aic_isa.c @@ -32,7 +32,6 @@ __FBSDID("$FreeBSD$"); #include <sys/module.h> #include <sys/bus.h> -#include <machine/bus_pio.h> #include <machine/bus.h> #include <machine/resource.h> #include <sys/rman.h> diff --git a/sys/dev/aic/aic_pccard.c b/sys/dev/aic/aic_pccard.c index 5583150..04e92ab 100644 --- a/sys/dev/aic/aic_pccard.c +++ b/sys/dev/aic/aic_pccard.c @@ -32,7 +32,6 @@ __FBSDID("$FreeBSD$"); #include <sys/module.h> #include <sys/bus.h> -#include <machine/bus_pio.h> #include <machine/bus.h> #include <machine/resource.h> #include <sys/rman.h> diff --git a/sys/dev/aic7xxx/aic79xx_osm.h b/sys/dev/aic7xxx/aic79xx_osm.h index c6f36f1..6615332 100644 --- a/sys/dev/aic7xxx/aic79xx_osm.h +++ b/sys/dev/aic7xxx/aic79xx_osm.h @@ -53,8 +53,6 @@ #include <sys/queue.h> #define AIC_PCI_CONFIG 1 -#include <machine/bus_memio.h> -#include <machine/bus_pio.h> #include <machine/bus.h> #include <machine/endian.h> #include <machine/clock.h> diff --git a/sys/dev/aic7xxx/aic7xxx_osm.h b/sys/dev/aic7xxx/aic7xxx_osm.h index 07752a3..159f9f9 100644 --- a/sys/dev/aic7xxx/aic7xxx_osm.h +++ b/sys/dev/aic7xxx/aic7xxx_osm.h @@ -59,9 +59,7 @@ #if NPCI > 0 #define AIC_PCI_CONFIG 1 -#include <machine/bus_memio.h> #endif -#include <machine/bus_pio.h> #include <machine/bus.h> #include <machine/endian.h> #include <machine/clock.h> diff --git a/sys/dev/amd/amd.c b/sys/dev/amd/amd.c index b1b615c..a91bd68 100644 --- a/sys/dev/amd/amd.c +++ b/sys/dev/amd/amd.c @@ -62,7 +62,6 @@ #include <vm/vm.h> #include <vm/pmap.h> -#include <machine/bus_pio.h> #include <machine/bus.h> #include <machine/resource.h> #include <sys/bus.h> diff --git a/sys/dev/amr/amr.c b/sys/dev/amr/amr.c index a20a580..e6fa569 100644 --- a/sys/dev/amr/amr.c +++ b/sys/dev/amr/amr.c @@ -72,8 +72,6 @@ __FBSDID("$FreeBSD$"); #include <sys/conf.h> #include <sys/stat.h> -#include <machine/bus_memio.h> -#include <machine/bus_pio.h> #include <machine/bus.h> #include <machine/resource.h> #include <sys/rman.h> diff --git a/sys/dev/amr/amr_pci.c b/sys/dev/amr/amr_pci.c index 6fab698..0fdfd8c 100644 --- a/sys/dev/amr/amr_pci.c +++ b/sys/dev/amr/amr_pci.c @@ -66,8 +66,6 @@ __FBSDID("$FreeBSD$"); #include <sys/bus.h> #include <sys/conf.h> -#include <machine/bus_memio.h> -#include <machine/bus_pio.h> #include <machine/bus.h> #include <machine/resource.h> #include <sys/rman.h> diff --git a/sys/dev/ar/if_ar.c b/sys/dev/ar/if_ar.c index a459d92..70741c0 100644 --- a/sys/dev/ar/if_ar.c +++ b/sys/dev/ar/if_ar.c @@ -58,8 +58,6 @@ __FBSDID("$FreeBSD$"); #include <sys/bus.h> #include <machine/bus.h> #include <machine/resource.h> -#include <machine/bus_pio.h> -#include <machine/bus_memio.h> #include <sys/rman.h> #include <net/if.h> diff --git a/sys/dev/ar/if_ar_isa.c b/sys/dev/ar/if_ar_isa.c index 81c001f..afe3615 100644 --- a/sys/dev/ar/if_ar_isa.c +++ b/sys/dev/ar/if_ar_isa.c @@ -52,8 +52,6 @@ __FBSDID("$FreeBSD$"); #include <sys/bus.h> #include <machine/bus.h> #include <machine/resource.h> -#include <machine/bus_pio.h> -#include <machine/bus_memio.h> #include <sys/rman.h> #include <isa/isavar.h> diff --git a/sys/dev/ar/if_ar_pci.c b/sys/dev/ar/if_ar_pci.c index 9b88c7c..3715c8b 100644 --- a/sys/dev/ar/if_ar_pci.c +++ b/sys/dev/ar/if_ar_pci.c @@ -38,8 +38,6 @@ __FBSDID("$FreeBSD$"); #include <sys/bus.h> #include <machine/bus.h> #include <machine/resource.h> -#include <machine/bus_pio.h> -#include <machine/bus_memio.h> #include <sys/rman.h> #include <dev/pci/pcireg.h> diff --git a/sys/dev/arcmsr/arcmsr.c b/sys/dev/arcmsr/arcmsr.c index e94e988..b7d9851 100644 --- a/sys/dev/arcmsr/arcmsr.c +++ b/sys/dev/arcmsr/arcmsr.c @@ -67,7 +67,6 @@ #include <isa/rtc.h> -#include <machine/bus_memio.h> #include <machine/bus.h> #include <machine/clock.h> #include <machine/resource.h> diff --git a/sys/dev/atkbdc/atkbdc.c b/sys/dev/atkbdc/atkbdc.c index 7fc2325..c0cee01 100644 --- a/sys/dev/atkbdc/atkbdc.c +++ b/sys/dev/atkbdc/atkbdc.c @@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$"); #include <sys/bus.h> #include <sys/malloc.h> #include <sys/syslog.h> -#include <machine/bus_pio.h> #include <machine/bus.h> #include <machine/resource.h> #include <sys/rman.h> diff --git a/sys/dev/atkbdc/atkbdc_isa.c b/sys/dev/atkbdc/atkbdc_isa.c index d0476a3..5f1408c 100644 --- a/sys/dev/atkbdc/atkbdc_isa.c +++ b/sys/dev/atkbdc/atkbdc_isa.c @@ -35,8 +35,6 @@ __FBSDID("$FreeBSD$"); #include <sys/module.h> #include <sys/bus.h> #include <sys/malloc.h> -#include <machine/bus_pio.h> -#include <machine/bus.h> #include <machine/resource.h> #include <sys/rman.h> diff --git a/sys/dev/atkbdc/atkbdc_subr.c b/sys/dev/atkbdc/atkbdc_subr.c index d0476a3..5f1408c 100644 --- a/sys/dev/atkbdc/atkbdc_subr.c +++ b/sys/dev/atkbdc/atkbdc_subr.c @@ -35,8 +35,6 @@ __FBSDID("$FreeBSD$"); #include <sys/module.h> #include <sys/bus.h> #include <sys/malloc.h> -#include <machine/bus_pio.h> -#include <machine/bus.h> #include <machine/resource.h> #include <sys/rman.h> diff --git a/sys/dev/awi/am79c930.c b/sys/dev/awi/am79c930.c index 90f85c0..a2eddd4 100644 --- a/sys/dev/awi/am79c930.c +++ b/sys/dev/awi/am79c930.c @@ -76,10 +76,6 @@ __FBSDID("$FreeBSD$"); #endif #include <machine/cpu.h> -#ifdef __FreeBSD__ -#include <machine/bus_pio.h> -#include <machine/bus_memio.h> -#endif #include <machine/bus.h> #ifdef __NetBSD__ #include <machine/intr.h> diff --git a/sys/dev/bfe/if_bfe.c b/sys/dev/bfe/if_bfe.c index 1f3cc7f..c83d17d 100644 --- a/sys/dev/bfe/if_bfe.c +++ b/sys/dev/bfe/if_bfe.c @@ -54,7 +54,6 @@ __FBSDID("$FreeBSD$"); #include <netinet/ip.h> #include <machine/clock.h> /* for DELAY */ -#include <machine/bus_memio.h> #include <machine/bus.h> #include <machine/resource.h> #include <sys/bus.h> diff --git a/sys/dev/bge/if_bge.c b/sys/dev/bge/if_bge.c index 8502e11..62a2cf6 100644 --- a/sys/dev/bge/if_bge.c +++ b/sys/dev/bge/if_bge.c @@ -93,7 +93,6 @@ __FBSDID("$FreeBSD$"); #include <netinet/ip.h> #include <machine/clock.h> /* for DELAY */ -#include <machine/bus_memio.h> #include <machine/bus.h> #include <machine/resource.h> #include <sys/bus.h> diff --git a/sys/dev/bktr/bktr_audio.c b/sys/dev/bktr/bktr_audio.c index 7c6965d..efc63da 100644 --- a/sys/dev/bktr/bktr_audio.c +++ b/sys/dev/bktr/bktr_audio.c @@ -66,7 +66,6 @@ __FBSDID("$FreeBSD$"); #include <dev/pci/pcivar.h> #endif -#include <machine/bus_memio.h> /* for bus space */ #include <machine/bus.h> #include <sys/bus.h> #endif diff --git a/sys/dev/bktr/bktr_card.c b/sys/dev/bktr/bktr_card.c index c0493ff..f08f810 100644 --- a/sys/dev/bktr/bktr_card.c +++ b/sys/dev/bktr/bktr_card.c @@ -64,7 +64,6 @@ __FBSDID("$FreeBSD$"); #include <dev/pci/pcivar.h> #endif -#include <machine/bus_memio.h> /* for bus space */ #include <machine/bus.h> #include <sys/bus.h> #endif diff --git a/sys/dev/bktr/bktr_core.c b/sys/dev/bktr/bktr_core.c index 5daca97..41f0b09 100644 --- a/sys/dev/bktr/bktr_core.c +++ b/sys/dev/bktr/bktr_core.c @@ -131,7 +131,6 @@ __FBSDID("$FreeBSD$"); #include <dev/pci/pcivar.h> #endif -#include <machine/bus_memio.h> /* for bus space */ #include <machine/bus.h> #include <sys/bus.h> diff --git a/sys/dev/bktr/bktr_i2c.c b/sys/dev/bktr/bktr_i2c.c index 807144d..20802f4 100644 --- a/sys/dev/bktr/bktr_i2c.c +++ b/sys/dev/bktr/bktr_i2c.c @@ -58,7 +58,6 @@ __FBSDID("$FreeBSD$"); #include <dev/pci/pcireg.h> #endif -#include <machine/bus_memio.h> /* for bus space */ #include <machine/bus.h> #include <sys/bus.h> diff --git a/sys/dev/bktr/bktr_os.c b/sys/dev/bktr/bktr_os.c index 27519bc..f555272 100644 --- a/sys/dev/bktr/bktr_os.c +++ b/sys/dev/bktr/bktr_os.c @@ -80,7 +80,6 @@ __FBSDID("$FreeBSD$"); #include <sys/bus.h> /* used by smbus and newbus */ -#include <machine/bus_memio.h> /* used by bus space */ #include <machine/bus.h> /* used by bus space and newbus */ #include <sys/bus.h> diff --git a/sys/dev/bktr/bktr_tuner.c b/sys/dev/bktr/bktr_tuner.c index a9b42ad..a74dd4f 100644 --- a/sys/dev/bktr/bktr_tuner.c +++ b/sys/dev/bktr/bktr_tuner.c @@ -61,7 +61,6 @@ __FBSDID("$FreeBSD$"); #include <dev/pci/pcivar.h> #endif -#include <machine/bus_memio.h> /* for bus space */ #include <machine/bus.h> #include <sys/bus.h> #endif diff --git a/sys/dev/buslogic/bt.c b/sys/dev/buslogic/bt.c index 74ad13b..37441f4 100644 --- a/sys/dev/buslogic/bt.c +++ b/sys/dev/buslogic/bt.c @@ -51,14 +51,6 @@ __FBSDID("$FreeBSD$"); #include <sys/sysctl.h> #include <sys/bus.h> -/* - * XXX It appears that BusLogic PCI adapters go out to lunch if you - * attempt to perform memory mapped I/O. - */ -#if 0 -#include <machine/bus_memio.h> -#endif -#include <machine/bus_pio.h> #include <machine/bus.h> #include <sys/rman.h> diff --git a/sys/dev/buslogic/bt_eisa.c b/sys/dev/buslogic/bt_eisa.c index b1c4010..cef2e53 100644 --- a/sys/dev/buslogic/bt_eisa.c +++ b/sys/dev/buslogic/bt_eisa.c @@ -39,7 +39,6 @@ __FBSDID("$FreeBSD$"); #include <sys/mutex.h> #include <sys/bus.h> -#include <machine/bus_pio.h> #include <machine/bus.h> #include <machine/resource.h> #include <sys/rman.h> diff --git a/sys/dev/buslogic/bt_isa.c b/sys/dev/buslogic/bt_isa.c index 78f4b2e..17638b2 100644 --- a/sys/dev/buslogic/bt_isa.c +++ b/sys/dev/buslogic/bt_isa.c @@ -39,7 +39,6 @@ __FBSDID("$FreeBSD$"); #include <sys/mutex.h> #include <sys/bus.h> -#include <machine/bus_pio.h> #include <machine/bus.h> #include <machine/resource.h> #include <sys/rman.h> diff --git a/sys/dev/buslogic/bt_pci.c b/sys/dev/buslogic/bt_pci.c index fe9d3f0..51d15cb 100644 --- a/sys/dev/buslogic/bt_pci.c +++ b/sys/dev/buslogic/bt_pci.c @@ -41,8 +41,6 @@ __FBSDID("$FreeBSD$"); #include <dev/pci/pcireg.h> #include <dev/pci/pcivar.h> -#include <machine/bus_memio.h> -#include <machine/bus_pio.h> #include <machine/bus.h> #include <machine/resource.h> #include <sys/rman.h> diff --git a/sys/dev/ciss/ciss.c b/sys/dev/ciss/ciss.c index 0b23fbf..62d296c 100644 --- a/sys/dev/ciss/ciss.c +++ b/sys/dev/ciss/ciss.c @@ -94,7 +94,6 @@ #include <cam/scsi/scsi_message.h> #include <machine/clock.h> -#include <machine/bus_memio.h> #include <machine/bus.h> #include <machine/endian.h> #include <machine/resource.h> diff --git a/sys/dev/cnw/if_cnw.c b/sys/dev/cnw/if_cnw.c index 9e2fdd4..d1891c3 100644 --- a/sys/dev/cnw/if_cnw.c +++ b/sys/dev/cnw/if_cnw.c @@ -248,7 +248,6 @@ struct cfattach cnw_ca = { #include <machine/resource.h> #include <machine/clock.h> #include <machine/md_var.h> -#include <machine/bus_pio.h> #include <sys/rman.h> #include <net/if.h> diff --git a/sys/dev/dc/dcphy.c b/sys/dev/dc/dcphy.c index ddf9b7e..3a6a5de 100644 --- a/sys/dev/dc/dcphy.c +++ b/sys/dev/dc/dcphy.c @@ -60,8 +60,6 @@ __FBSDID("$FreeBSD$"); #include <dev/mii/miivar.h> #include "miidevs.h" -#include <machine/bus_pio.h> -#include <machine/bus_memio.h> #include <machine/bus.h> #include <machine/resource.h> #include <sys/bus.h> diff --git a/sys/dev/dc/if_dc.c b/sys/dev/dc/if_dc.c index 4fe664d..ae92c8d 100644 --- a/sys/dev/dc/if_dc.c +++ b/sys/dev/dc/if_dc.c @@ -112,8 +112,6 @@ __FBSDID("$FreeBSD$"); #include <net/bpf.h> -#include <machine/bus_pio.h> -#include <machine/bus_memio.h> #include <machine/bus.h> #include <machine/resource.h> #include <sys/bus.h> diff --git a/sys/dev/dc/pnphy.c b/sys/dev/dc/pnphy.c index 63891f5..98d269a 100644 --- a/sys/dev/dc/pnphy.c +++ b/sys/dev/dc/pnphy.c @@ -58,8 +58,6 @@ __FBSDID("$FreeBSD$"); #include <dev/mii/miivar.h> #include "miidevs.h" -#include <machine/bus_pio.h> -#include <machine/bus_memio.h> #include <machine/bus.h> #include <machine/resource.h> #include <sys/bus.h> diff --git a/sys/dev/dpt/dpt_eisa.c b/sys/dev/dpt/dpt_eisa.c index 5e2a039..1a6ef9a 100644 --- a/sys/dev/dpt/dpt_eisa.c +++ b/sys/dev/dpt/dpt_eisa.c @@ -36,7 +36,6 @@ __FBSDID("$FreeBSD$"); #include <sys/mutex.h> #include <sys/bus.h> -#include <machine/bus_pio.h> #include <machine/bus.h> #include <machine/resource.h> #include <sys/rman.h> diff --git a/sys/dev/dpt/dpt_isa.c b/sys/dev/dpt/dpt_isa.c index c0ede88..c9264af 100644 --- a/sys/dev/dpt/dpt_isa.c +++ b/sys/dev/dpt/dpt_isa.c @@ -34,7 +34,6 @@ __FBSDID("$FreeBSD$"); #include <sys/module.h> #include <sys/bus.h> -#include <machine/bus_pio.h> #include <machine/bus.h> #include <machine/resource.h> #include <sys/rman.h> diff --git a/sys/dev/dpt/dpt_pci.c b/sys/dev/dpt/dpt_pci.c index d3b1190..c91ab25 100644 --- a/sys/dev/dpt/dpt_pci.c +++ b/sys/dev/dpt/dpt_pci.c @@ -38,8 +38,6 @@ __FBSDID("$FreeBSD$"); #include <sys/mutex.h> #include <sys/bus.h> -#include <machine/bus_memio.h> -#include <machine/bus_pio.h> #include <machine/bus.h> #include <machine/resource.h> #include <sys/rman.h> diff --git a/sys/dev/dpt/dpt_scsi.c b/sys/dev/dpt/dpt_scsi.c index db2f7b0..129c95b 100644 --- a/sys/dev/dpt/dpt_scsi.c +++ b/sys/dev/dpt/dpt_scsi.c @@ -58,8 +58,6 @@ __FBSDID("$FreeBSD$"); #include <sys/bus.h> -#include <machine/bus_memio.h> -#include <machine/bus_pio.h> #include <machine/bus.h> #include <machine/resource.h> diff --git a/sys/dev/fb/boot_font.c b/sys/dev/fb/boot_font.c index 77090c5..436ae40 100644 --- a/sys/dev/fb/boot_font.c +++ b/sys/dev/fb/boot_font.c @@ -62,7 +62,6 @@ __FBSDID("$FreeBSD$"); #include <machine/md_var.h> #include <machine/pc/bios.h> #include <machine/clock.h> -#include <machine/bus_memio.h> #include <machine/bus.h> #include <machine/pc/vesa.h> #include <machine/resource.h> diff --git a/sys/dev/fb/gfb.c b/sys/dev/fb/gfb.c index b0cf5a9..6a14dca 100644 --- a/sys/dev/fb/gfb.c +++ b/sys/dev/fb/gfb.c @@ -71,7 +71,6 @@ __FBSDID("$FreeBSD$"); #include <machine/md_var.h> #include <machine/pc/bios.h> #include <machine/clock.h> -#include <machine/bus_memio.h> #include <machine/bus.h> #include <machine/pc/vesa.h> #include <machine/resource.h> diff --git a/sys/dev/fb/s3_pci.c b/sys/dev/fb/s3_pci.c index 70f3b6b..854a685 100644 --- a/sys/dev/fb/s3_pci.c +++ b/sys/dev/fb/s3_pci.c @@ -34,8 +34,6 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> -#include <machine/bus_pio.h> -#include <machine/bus_memio.h> #include <machine/bus.h> #include <vm/vm.h> diff --git a/sys/dev/fb/tga.c b/sys/dev/fb/tga.c index b55dc5a..84923ef 100644 --- a/sys/dev/fb/tga.c +++ b/sys/dev/fb/tga.c @@ -77,7 +77,6 @@ __FBSDID("$FreeBSD$"); #include <machine/md_var.h> #include <machine/pc/bios.h> #include <machine/clock.h> -#include <machine/bus_memio.h> #include <machine/bus.h> #include <machine/pc/vesa.h> #include <machine/resource.h> diff --git a/sys/dev/gfb/gfb_pci.c b/sys/dev/gfb/gfb_pci.c index c58ae0e..9dc31aa 100644 --- a/sys/dev/gfb/gfb_pci.c +++ b/sys/dev/gfb/gfb_pci.c @@ -48,7 +48,6 @@ __FBSDID("$FreeBSD$"); #include <machine/md_var.h> #include <machine/pc/bios.h> #include <machine/clock.h> -#include <machine/bus_memio.h> #include <machine/bus.h> #include <machine/pc/vesa.h> #include <machine/resource.h> diff --git a/sys/dev/hfa/hfa_freebsd.c b/sys/dev/hfa/hfa_freebsd.c index 34db172..9b8d69c 100644 --- a/sys/dev/hfa/hfa_freebsd.c +++ b/sys/dev/hfa/hfa_freebsd.c @@ -67,7 +67,6 @@ #include <sys/conf.h> #include <sys/module.h> -#include <machine/bus_memio.h> #include <machine/bus.h> #include <machine/resource.h> #include <sys/rman.h> diff --git a/sys/dev/hfa/hfa_pci.c b/sys/dev/hfa/hfa_pci.c index 8fc59ed7..fb28478 100644 --- a/sys/dev/hfa/hfa_pci.c +++ b/sys/dev/hfa/hfa_pci.c @@ -69,7 +69,6 @@ __FBSDID("$FreeBSD$"); #include <sys/conf.h> #include <sys/module.h> -#include <machine/bus_memio.h> #include <machine/bus.h> #include <machine/resource.h> #include <sys/rman.h> diff --git a/sys/dev/hptmv/osbsd.h b/sys/dev/hptmv/osbsd.h index 5637c44..d81229e 100644 --- a/sys/dev/hptmv/osbsd.h +++ b/sys/dev/hptmv/osbsd.h @@ -32,7 +32,6 @@ #include <sys/resource.h> #include <sys/eventhandler.h> -#include <machine/bus_memio.h> #include <machine/bus.h> #include <machine/resource.h> #include <machine/bus.h> diff --git a/sys/dev/ida/ida.c b/sys/dev/ida/ida.c index cd3a95f..663b816 100644 --- a/sys/dev/ida/ida.c +++ b/sys/dev/ida/ida.c @@ -46,8 +46,6 @@ __FBSDID("$FreeBSD$"); #include <sys/conf.h> #include <sys/endian.h> -#include <machine/bus_memio.h> -#include <machine/bus_pio.h> #include <machine/bus.h> #include <sys/rman.h> diff --git a/sys/dev/ida/ida_disk.c b/sys/dev/ida/ida_disk.c index 794cb90..2446ddd 100644 --- a/sys/dev/ida/ida_disk.c +++ b/sys/dev/ida/ida_disk.c @@ -40,8 +40,6 @@ #include <sys/conf.h> #include <sys/cons.h> -#include <machine/bus_memio.h> -#include <machine/bus_pio.h> #include <machine/bus.h> #include <sys/rman.h> diff --git a/sys/dev/ida/ida_eisa.c b/sys/dev/ida/ida_eisa.c index 719d38c..864b170 100644 --- a/sys/dev/ida/ida_eisa.c +++ b/sys/dev/ida/ida_eisa.c @@ -37,7 +37,6 @@ __FBSDID("$FreeBSD$"); #include <sys/bio.h> #include <sys/conf.h> -#include <machine/bus_pio.h> #include <machine/bus.h> #include <machine/resource.h> #include <sys/rman.h> diff --git a/sys/dev/ida/ida_pci.c b/sys/dev/ida/ida_pci.c index 0f2fd2a..3c98105 100644 --- a/sys/dev/ida/ida_pci.c +++ b/sys/dev/ida/ida_pci.c @@ -36,8 +36,6 @@ __FBSDID("$FreeBSD$"); #include <sys/bus.h> #include <sys/conf.h> -#include <machine/bus_memio.h> -#include <machine/bus_pio.h> #include <machine/bus.h> #include <machine/resource.h> #include <sys/rman.h> diff --git a/sys/dev/idt/idt_harp.c b/sys/dev/idt/idt_harp.c index 4659c46..84e52eb 100644 --- a/sys/dev/idt/idt_harp.c +++ b/sys/dev/idt/idt_harp.c @@ -54,7 +54,6 @@ __FBSDID("$FreeBSD$"); #include <sys/conf.h> #include <sys/module.h> -#include <machine/bus_memio.h> #include <machine/bus.h> #include <machine/resource.h> #include <sys/rman.h> diff --git a/sys/dev/idt/idt_pci.c b/sys/dev/idt/idt_pci.c index 26b1e5a..1a77c4b 100644 --- a/sys/dev/idt/idt_pci.c +++ b/sys/dev/idt/idt_pci.c @@ -52,7 +52,6 @@ __FBSDID("$FreeBSD$"); #include <sys/conf.h> #include <sys/module.h> -#include <machine/bus_memio.h> #include <machine/bus.h> #include <machine/resource.h> #include <sys/rman.h> diff --git a/sys/dev/ie/if_ie.c b/sys/dev/ie/if_ie.c index f30d775..71845e9 100644 --- a/sys/dev/ie/if_ie.c +++ b/sys/dev/ie/if_ie.c @@ -124,7 +124,6 @@ __FBSDID("$FreeBSD$"); #include <sys/module.h> #include <sys/bus.h> -#include <machine/bus_pio.h> #include <machine/bus.h> #include <machine/resource.h> #include <sys/rman.h> diff --git a/sys/dev/ie/if_ie_isa.c b/sys/dev/ie/if_ie_isa.c index b8448c8..53ed256 100644 --- a/sys/dev/ie/if_ie_isa.c +++ b/sys/dev/ie/if_ie_isa.c @@ -47,7 +47,6 @@ __FBSDID("$FreeBSD$"); #include <sys/module.h> #include <sys/bus.h> -#include <machine/bus_pio.h> #include <machine/bus.h> #include <machine/resource.h> #include <sys/rman.h> diff --git a/sys/dev/if_ndis/if_ndis.c b/sys/dev/if_ndis/if_ndis.c index af7e02c..77eb9ee 100644 --- a/sys/dev/if_ndis/if_ndis.c +++ b/sys/dev/if_ndis/if_ndis.c @@ -60,8 +60,6 @@ __FBSDID("$FreeBSD$"); #include <net/bpf.h> -#include <machine/bus_memio.h> -#include <machine/bus_pio.h> #include <machine/bus.h> #include <machine/resource.h> #include <sys/bus.h> diff --git a/sys/dev/iir/iir.c b/sys/dev/iir/iir.c index 60b2962..4e3cef6 100644 --- a/sys/dev/iir/iir.c +++ b/sys/dev/iir/iir.c @@ -56,8 +56,6 @@ __FBSDID("$FreeBSD$"); #include <sys/kernel.h> #include <sys/bus.h> -#include <machine/bus_memio.h> -#include <machine/bus_pio.h> #include <machine/bus.h> #include <machine/clock.h> #include <machine/stdarg.h> diff --git a/sys/dev/iir/iir_pci.c b/sys/dev/iir/iir_pci.c index 2edfc91..4ad5d0c 100644 --- a/sys/dev/iir/iir_pci.c +++ b/sys/dev/iir/iir_pci.c @@ -54,8 +54,6 @@ __FBSDID("$FreeBSD$"); #include <sys/module.h> #include <sys/bus.h> -#include <machine/bus_memio.h> -#include <machine/bus_pio.h> #include <machine/bus.h> #include <machine/resource.h> #include <machine/clock.h> diff --git a/sys/dev/ips/ips.h b/sys/dev/ips/ips.h index 0e5e658..829bb46 100644 --- a/sys/dev/ips/ips.h +++ b/sys/dev/ips/ips.h @@ -43,7 +43,6 @@ #include <sys/sema.h> #include <sys/time.h> -#include <machine/bus_memio.h> #include <machine/bus.h> #include <sys/rman.h> #include <machine/resource.h> diff --git a/sys/dev/ips/ips_disk.h b/sys/dev/ips/ips_disk.h index 0b0fe65..b841eea 100644 --- a/sys/dev/ips/ips_disk.h +++ b/sys/dev/ips/ips_disk.h @@ -41,7 +41,6 @@ #include <sys/disk.h> #include <geom/geom_disk.h> -#include <machine/bus_memio.h> #include <machine/bus.h> #include <sys/rman.h> #include <machine/resource.h> diff --git a/sys/dev/isp/isp_freebsd.h b/sys/dev/isp/isp_freebsd.h index 8b467c6..ede1fe1 100644 --- a/sys/dev/isp/isp_freebsd.h +++ b/sys/dev/isp/isp_freebsd.h @@ -42,8 +42,6 @@ #include <sys/proc.h> #include <sys/bus.h> -#include <machine/bus_memio.h> -#include <machine/bus_pio.h> #include <machine/bus.h> #include <machine/clock.h> #include <machine/cpu.h> diff --git a/sys/dev/isp/isp_pci.c b/sys/dev/isp/isp_pci.c index 3a9c041..55a0ef7 100644 --- a/sys/dev/isp/isp_pci.c +++ b/sys/dev/isp/isp_pci.c @@ -38,8 +38,6 @@ __FBSDID("$FreeBSD$"); #include <dev/pci/pcireg.h> #include <dev/pci/pcivar.h> -#include <machine/bus_memio.h> -#include <machine/bus_pio.h> #include <machine/bus.h> #include <machine/resource.h> #include <sys/rman.h> diff --git a/sys/dev/kbd/atkbdc.c b/sys/dev/kbd/atkbdc.c index 7fc2325..c0cee01 100644 --- a/sys/dev/kbd/atkbdc.c +++ b/sys/dev/kbd/atkbdc.c @@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$"); #include <sys/bus.h> #include <sys/malloc.h> #include <sys/syslog.h> -#include <machine/bus_pio.h> #include <machine/bus.h> #include <machine/resource.h> #include <sys/rman.h> diff --git a/sys/dev/lge/if_lge.c b/sys/dev/lge/if_lge.c index 9c01ca4..ace667d 100644 --- a/sys/dev/lge/if_lge.c +++ b/sys/dev/lge/if_lge.c @@ -89,8 +89,6 @@ __FBSDID("$FreeBSD$"); #include <vm/vm.h> /* for vtophys */ #include <vm/pmap.h> /* for vtophys */ #include <machine/clock.h> /* for DELAY */ -#include <machine/bus_pio.h> -#include <machine/bus_memio.h> #include <machine/bus.h> #include <machine/resource.h> #include <sys/bus.h> diff --git a/sys/dev/mcd/mcd.c b/sys/dev/mcd/mcd.c index 401781c..86e40c4 100644 --- a/sys/dev/mcd/mcd.c +++ b/sys/dev/mcd/mcd.c @@ -56,7 +56,6 @@ static const char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore"; #include <sys/disk.h> #include <sys/bus.h> -#include <machine/bus_pio.h> #include <machine/bus.h> #include <machine/resource.h> #include <sys/rman.h> diff --git a/sys/dev/mcd/mcd_isa.c b/sys/dev/mcd/mcd_isa.c index f631672..8b71f10 100644 --- a/sys/dev/mcd/mcd_isa.c +++ b/sys/dev/mcd/mcd_isa.c @@ -17,7 +17,6 @@ __FBSDID("$FreeBSD$"); #include <sys/lock.h> #include <sys/mutex.h> -#include <machine/bus_pio.h> #include <machine/bus.h> #include <machine/resource.h> #include <sys/rman.h> diff --git a/sys/dev/mii/dcphy.c b/sys/dev/mii/dcphy.c index ddf9b7e..3a6a5de 100644 --- a/sys/dev/mii/dcphy.c +++ b/sys/dev/mii/dcphy.c @@ -60,8 +60,6 @@ __FBSDID("$FreeBSD$"); #include <dev/mii/miivar.h> #include "miidevs.h" -#include <machine/bus_pio.h> -#include <machine/bus_memio.h> #include <machine/bus.h> #include <machine/resource.h> #include <sys/bus.h> diff --git a/sys/dev/mii/pnphy.c b/sys/dev/mii/pnphy.c index 63891f5..98d269a 100644 --- a/sys/dev/mii/pnphy.c +++ b/sys/dev/mii/pnphy.c @@ -58,8 +58,6 @@ __FBSDID("$FreeBSD$"); #include <dev/mii/miivar.h> #include "miidevs.h" -#include <machine/bus_pio.h> -#include <machine/bus_memio.h> #include <machine/bus.h> #include <machine/resource.h> #include <sys/bus.h> diff --git a/sys/dev/mlx/mlx.c b/sys/dev/mlx/mlx.c index dcee43c..d8cc79a 100644 --- a/sys/dev/mlx/mlx.c +++ b/sys/dev/mlx/mlx.c @@ -40,8 +40,6 @@ #include <sys/stat.h> #include <machine/resource.h> -#include <machine/bus_memio.h> -#include <machine/bus_pio.h> #include <machine/bus.h> #include <machine/clock.h> #include <sys/rman.h> diff --git a/sys/dev/mlx/mlx_pci.c b/sys/dev/mlx/mlx_pci.c index da04278e..732fed8 100644 --- a/sys/dev/mlx/mlx_pci.c +++ b/sys/dev/mlx/mlx_pci.c @@ -35,8 +35,6 @@ __FBSDID("$FreeBSD$"); #include <sys/bus.h> #include <sys/conf.h> -#include <machine/bus_memio.h> -#include <machine/bus_pio.h> #include <machine/bus.h> #include <machine/resource.h> #include <sys/rman.h> diff --git a/sys/dev/mly/mly.c b/sys/dev/mly/mly.c index c7fa068..074d6fa 100644 --- a/sys/dev/mly/mly.c +++ b/sys/dev/mly/mly.c @@ -37,7 +37,6 @@ #include <sys/ioccom.h> #include <sys/stat.h> -#include <machine/bus_memio.h> #include <machine/bus.h> #include <machine/resource.h> #include <sys/rman.h> diff --git a/sys/dev/mpt/mpt_freebsd.h b/sys/dev/mpt/mpt_freebsd.h index 49e6f4e..50cd282 100644 --- a/sys/dev/mpt/mpt_freebsd.h +++ b/sys/dev/mpt/mpt_freebsd.h @@ -52,8 +52,6 @@ #include <sys/proc.h> #include <sys/bus.h> -#include <machine/bus_memio.h> -#include <machine/bus_pio.h> #include <machine/bus.h> #include <machine/clock.h> #include <machine/cpu.h> diff --git a/sys/dev/mpt/mpt_pci.c b/sys/dev/mpt/mpt_pci.c index cdb1287..828d6e1 100644 --- a/sys/dev/mpt/mpt_pci.c +++ b/sys/dev/mpt/mpt_pci.c @@ -42,8 +42,6 @@ __FBSDID("$FreeBSD$"); #include <dev/pci/pcireg.h> #include <dev/pci/pcivar.h> -#include <machine/bus_memio.h> -#include <machine/bus_pio.h> #include <machine/bus.h> #include <machine/resource.h> #include <sys/rman.h> diff --git a/sys/dev/my/if_my.c b/sys/dev/my/if_my.c index c9835e5..20b57e8 100644 --- a/sys/dev/my/if_my.c +++ b/sys/dev/my/if_my.c @@ -56,8 +56,6 @@ __FBSDID("$FreeBSD$"); #include <vm/vm.h> /* for vtophys */ #include <vm/pmap.h> /* for vtophys */ #include <machine/clock.h> /* for DELAY */ -#include <machine/bus_memio.h> -#include <machine/bus_pio.h> #include <machine/bus.h> #include <machine/resource.h> #include <sys/bus.h> diff --git a/sys/dev/ncv/ncr53c500.c b/sys/dev/ncv/ncr53c500.c index 346c09a..32bd902 100644 --- a/sys/dev/ncv/ncr53c500.c +++ b/sys/dev/ncv/ncr53c500.c @@ -75,7 +75,6 @@ __FBSDID("$FreeBSD$"); #ifdef __FreeBSD__ #include <machine/clock.h> #include <machine/cpu.h> -#include <machine/bus_pio.h> #include <machine/bus.h> #include <compat/netbsd/dvcfg.h> diff --git a/sys/dev/ncv/ncr53c500_pccard.c b/sys/dev/ncv/ncr53c500_pccard.c index 6434f6a..7472e62 100644 --- a/sys/dev/ncv/ncr53c500_pccard.c +++ b/sys/dev/ncv/ncr53c500_pccard.c @@ -46,7 +46,6 @@ __FBSDID("$FreeBSD$"); #include <sys/systm.h> #include <machine/bus.h> -#include <machine/bus_pio.h> #include <machine/resource.h> #include <sys/rman.h> #include <compat/netbsd/dvcfg.h> diff --git a/sys/dev/nge/if_nge.c b/sys/dev/nge/if_nge.c index 0fc0fca..f480cb5 100644 --- a/sys/dev/nge/if_nge.c +++ b/sys/dev/nge/if_nge.c @@ -110,8 +110,6 @@ __FBSDID("$FreeBSD$"); #include <vm/vm.h> /* for vtophys */ #include <vm/pmap.h> /* for vtophys */ #include <machine/clock.h> /* for DELAY */ -#include <machine/bus_pio.h> -#include <machine/bus_memio.h> #include <machine/bus.h> #include <machine/resource.h> #include <sys/bus.h> diff --git a/sys/dev/nsp/nsp.c b/sys/dev/nsp/nsp.c index d955ff2..cad7416 100644 --- a/sys/dev/nsp/nsp.c +++ b/sys/dev/nsp/nsp.c @@ -74,8 +74,6 @@ __FBSDID("$FreeBSD$"); #ifdef __FreeBSD__ #include <machine/clock.h> #include <machine/cpu.h> -#include <machine/bus_pio.h> -#include <machine/bus_memio.h> #include <machine/bus.h> #include <compat/netbsd/dvcfg.h> diff --git a/sys/dev/nve/if_nve.c b/sys/dev/nve/if_nve.c index c4d3b39..0963a6b 100644 --- a/sys/dev/nve/if_nve.c +++ b/sys/dev/nve/if_nve.c @@ -95,7 +95,6 @@ __FBSDID("$FreeBSD$"); #include <net/bpf.h> #include <net/if_vlan_var.h> -#include <machine/bus_memio.h> #include <machine/bus.h> #include <machine/resource.h> diff --git a/sys/dev/pbio/pbio.c b/sys/dev/pbio/pbio.c index e4c2b0e..32f50a9 100644 --- a/sys/dev/pbio/pbio.c +++ b/sys/dev/pbio/pbio.c @@ -41,7 +41,6 @@ __FBSDID("$FreeBSD$"); #include <sys/conf.h> /* cdevsw stuff */ #include <sys/malloc.h> /* malloc region definitions */ #include <sys/module.h> -#include <machine/bus_pio.h> #include <machine/bus.h> #include <machine/resource.h> #include <machine/clock.h> /* DELAY() */ diff --git a/sys/dev/pdq/if_fpa.c b/sys/dev/pdq/if_fpa.c index cfb6f89..6ed271a 100644 --- a/sys/dev/pdq/if_fpa.c +++ b/sys/dev/pdq/if_fpa.c @@ -41,8 +41,6 @@ __FBSDID("$FreeBSD$"); #include <sys/module.h> #include <sys/bus.h> -#include <machine/bus_memio.h> -#include <machine/bus_pio.h> #include <machine/bus.h> #include <machine/resource.h> #include <sys/rman.h> diff --git a/sys/dev/pdq/pdq_freebsd.h b/sys/dev/pdq/pdq_freebsd.h index ba2a993..6dc7c6c 100644 --- a/sys/dev/pdq/pdq_freebsd.h +++ b/sys/dev/pdq/pdq_freebsd.h @@ -48,8 +48,6 @@ #include <sys/module.h> #include <sys/bus.h> -#include <machine/bus_memio.h> -#include <machine/bus_pio.h> #include <machine/bus.h> #include <machine/resource.h> #include <sys/rman.h> diff --git a/sys/dev/pdq/pdq_ifsubr.c b/sys/dev/pdq/pdq_ifsubr.c index 1971a20..d3a64e2 100644 --- a/sys/dev/pdq/pdq_ifsubr.c +++ b/sys/dev/pdq/pdq_ifsubr.c @@ -55,8 +55,6 @@ __KERNEL_RCSID(0, "$NetBSD: pdq_ifsubr.c,v 1.38 2001/12/21 23:21:47 matt Exp $") #include <sys/module.h> #include <sys/bus.h> -#include <machine/bus_memio.h> -#include <machine/bus_pio.h> #include <machine/bus.h> #include <machine/resource.h> #include <sys/rman.h> diff --git a/sys/dev/re/if_re.c b/sys/dev/re/if_re.c index a887f18..ea52ef3 100644 --- a/sys/dev/re/if_re.c +++ b/sys/dev/re/if_re.c @@ -127,8 +127,6 @@ __FBSDID("$FreeBSD$"); #include <net/bpf.h> -#include <machine/bus_pio.h> -#include <machine/bus_memio.h> #include <machine/bus.h> #include <machine/resource.h> #include <sys/bus.h> diff --git a/sys/dev/scd/scd.c b/sys/dev/scd/scd.c index 2c5f796..136c900 100644 --- a/sys/dev/scd/scd.c +++ b/sys/dev/scd/scd.c @@ -58,7 +58,6 @@ __FBSDID("$FreeBSD$"); #include <machine/stdarg.h> -#include <machine/bus_pio.h> #include <machine/bus.h> #include <machine/resource.h> #include <sys/rman.h> diff --git a/sys/dev/scd/scd_isa.c b/sys/dev/scd/scd_isa.c index da2fe6a..082d0d8 100644 --- a/sys/dev/scd/scd_isa.c +++ b/sys/dev/scd/scd_isa.c @@ -16,7 +16,6 @@ __FBSDID("$FreeBSD$"); #include <sys/mutex.h> -#include <machine/bus_pio.h> #include <machine/bus.h> #include <machine/resource.h> #include <sys/rman.h> diff --git a/sys/dev/sf/if_sf.c b/sys/dev/sf/if_sf.c index ed91f01..5593d52 100644 --- a/sys/dev/sf/if_sf.c +++ b/sys/dev/sf/if_sf.c @@ -98,8 +98,6 @@ __FBSDID("$FreeBSD$"); #include <vm/vm.h> /* for vtophys */ #include <vm/pmap.h> /* for vtophys */ -#include <machine/bus_pio.h> -#include <machine/bus_memio.h> #include <machine/bus.h> #include <machine/resource.h> #include <sys/bus.h> diff --git a/sys/dev/sio/sio.c b/sys/dev/sio/sio.c index 2a9240b..4dfabc0 100644 --- a/sys/dev/sio/sio.c +++ b/sys/dev/sio/sio.c @@ -67,7 +67,6 @@ __FBSDID("$FreeBSD$"); #include <sys/sysctl.h> #include <sys/syslog.h> #include <sys/tty.h> -#include <machine/bus_pio.h> #include <machine/bus.h> #include <sys/rman.h> #include <sys/timepps.h> diff --git a/sys/dev/sio/sio_isa.c b/sys/dev/sio/sio_isa.c index 40541e6..afb6fac 100644 --- a/sys/dev/sio/sio_isa.c +++ b/sys/dev/sio/sio_isa.c @@ -35,7 +35,6 @@ __FBSDID("$FreeBSD$"); #include <sys/mutex.h> #include <sys/module.h> #include <sys/tty.h> -#include <machine/bus_pio.h> #include <machine/bus.h> #include <sys/timepps.h> diff --git a/sys/dev/sio/sio_pccard.c b/sys/dev/sio/sio_pccard.c index 713393a..b715828 100644 --- a/sys/dev/sio/sio_pccard.c +++ b/sys/dev/sio/sio_pccard.c @@ -35,7 +35,6 @@ __FBSDID("$FreeBSD$"); #include <sys/mutex.h> #include <sys/module.h> #include <sys/tty.h> -#include <machine/bus_pio.h> #include <machine/bus.h> #include <machine/resource.h> #include <sys/timepps.h> diff --git a/sys/dev/sio/sio_pci.c b/sys/dev/sio/sio_pci.c index 05d4226..459baa1 100644 --- a/sys/dev/sio/sio_pci.c +++ b/sys/dev/sio/sio_pci.c @@ -35,7 +35,6 @@ __FBSDID("$FreeBSD$"); #include <sys/mutex.h> #include <sys/module.h> #include <sys/tty.h> -#include <machine/bus_pio.h> #include <machine/bus.h> #include <sys/timepps.h> diff --git a/sys/dev/sio/sio_puc.c b/sys/dev/sio/sio_puc.c index 877a039..dd80e68 100644 --- a/sys/dev/sio/sio_puc.c +++ b/sys/dev/sio/sio_puc.c @@ -36,7 +36,6 @@ __FBSDID("$FreeBSD$"); #include <sys/mutex.h> #include <sys/module.h> #include <sys/tty.h> -#include <machine/bus_pio.h> #include <machine/bus.h> #include <sys/timepps.h> diff --git a/sys/dev/sk/if_sk.c b/sys/dev/sk/if_sk.c index 9f148a1..1703e2f 100644 --- a/sys/dev/sk/if_sk.c +++ b/sys/dev/sk/if_sk.c @@ -106,8 +106,6 @@ __FBSDID("$FreeBSD$"); #include <vm/vm.h> /* for vtophys */ #include <vm/pmap.h> /* for vtophys */ -#include <machine/bus_pio.h> -#include <machine/bus_memio.h> #include <machine/bus.h> #include <machine/resource.h> #include <sys/bus.h> diff --git a/sys/dev/sr/if_sr.c b/sys/dev/sr/if_sr.c index 7382fdc..db4eafb 100644 --- a/sys/dev/sr/if_sr.c +++ b/sys/dev/sr/if_sr.c @@ -65,8 +65,6 @@ __FBSDID("$FreeBSD$"); #include <sys/bus.h> #include <machine/bus.h> #include <machine/resource.h> -#include <machine/bus_pio.h> -#include <machine/bus_memio.h> #include <sys/rman.h> #include <net/if.h> diff --git a/sys/dev/sr/if_sr_isa.c b/sys/dev/sr/if_sr_isa.c index 510a32b..3f68e00 100644 --- a/sys/dev/sr/if_sr_isa.c +++ b/sys/dev/sr/if_sr_isa.c @@ -42,8 +42,6 @@ __FBSDID("$FreeBSD$"); #include <sys/bus.h> #include <machine/bus.h> #include <machine/resource.h> -#include <machine/bus_pio.h> -#include <machine/bus_memio.h> #include <sys/rman.h> #include <sys/time.h> diff --git a/sys/dev/sr/if_sr_pci.c b/sys/dev/sr/if_sr_pci.c index dbb8a83..8f62513 100644 --- a/sys/dev/sr/if_sr_pci.c +++ b/sys/dev/sr/if_sr_pci.c @@ -39,8 +39,6 @@ __FBSDID("$FreeBSD$"); #include <sys/bus.h> #include <machine/bus.h> #include <machine/resource.h> -#include <machine/bus_pio.h> -#include <machine/bus_memio.h> #include <sys/rman.h> #include <dev/pci/pcivar.h> diff --git a/sys/dev/stg/tmc18c30.c b/sys/dev/stg/tmc18c30.c index c07c4c8..a0e7139 100644 --- a/sys/dev/stg/tmc18c30.c +++ b/sys/dev/stg/tmc18c30.c @@ -73,7 +73,6 @@ __FBSDID("$FreeBSD$"); #ifdef __FreeBSD__ #include <machine/clock.h> #include <machine/cpu.h> -#include <machine/bus_pio.h> #include <machine/bus.h> #include <compat/netbsd/dvcfg.h> diff --git a/sys/dev/stg/tmc18c30_isa.c b/sys/dev/stg/tmc18c30_isa.c index 4096669..7165a81 100644 --- a/sys/dev/stg/tmc18c30_isa.c +++ b/sys/dev/stg/tmc18c30_isa.c @@ -49,7 +49,6 @@ __FBSDID("$FreeBSD$"); #include <sys/malloc.h> #include <sys/errno.h> -#include <machine/bus_pio.h> #include <machine/bus.h> #include <machine/resource.h> #include <sys/rman.h> diff --git a/sys/dev/stg/tmc18c30_pccard.c b/sys/dev/stg/tmc18c30_pccard.c index 67bffd3..a66f65c 100644 --- a/sys/dev/stg/tmc18c30_pccard.c +++ b/sys/dev/stg/tmc18c30_pccard.c @@ -49,7 +49,6 @@ __FBSDID("$FreeBSD$"); #include <sys/systm.h> #include <machine/bus.h> -#include <machine/bus_pio.h> #include <compat/netbsd/dvcfg.h> #include <sys/device_port.h> diff --git a/sys/dev/stg/tmc18c30_pci.c b/sys/dev/stg/tmc18c30_pci.c index cda2ed7..1edda5a 100644 --- a/sys/dev/stg/tmc18c30_pci.c +++ b/sys/dev/stg/tmc18c30_pci.c @@ -48,7 +48,6 @@ __FBSDID("$FreeBSD$"); #include <sys/malloc.h> #include <sys/errno.h> -#include <machine/bus_pio.h> #include <machine/bus.h> #include <machine/resource.h> #include <sys/rman.h> diff --git a/sys/dev/stg/tmc18c30_subr.c b/sys/dev/stg/tmc18c30_subr.c index c2cfd44..152fd11 100644 --- a/sys/dev/stg/tmc18c30_subr.c +++ b/sys/dev/stg/tmc18c30_subr.c @@ -47,8 +47,6 @@ __FBSDID("$FreeBSD$"); #include <sys/module.h> #include <sys/bus.h> -#include <machine/bus_memio.h> -#include <machine/bus_pio.h> #include <machine/bus.h> #include <machine/resource.h> #include <sys/rman.h> diff --git a/sys/dev/sym/sym_hipd.c b/sys/dev/sym/sym_hipd.c index 54abca6..e8f10f0 100644 --- a/sys/dev/sym/sym_hipd.c +++ b/sys/dev/sym/sym_hipd.c @@ -86,17 +86,7 @@ __FBSDID("$FreeBSD$"); #include <dev/pci/pcireg.h> #include <dev/pci/pcivar.h> -#include <machine/bus_memio.h> -/* - * Only include bus_pio if needed. - * This avoids bus space primitives to be uselessly bloated - * by out-of-age PIO operations. - */ -#ifdef SYM_CONF_IOMAPPED -#include <machine/bus_pio.h> -#endif #include <machine/bus.h> - #include <machine/resource.h> #include <sys/rman.h> diff --git a/sys/dev/tga/tga_pci.c b/sys/dev/tga/tga_pci.c index 25afbfd..47f32f4 100644 --- a/sys/dev/tga/tga_pci.c +++ b/sys/dev/tga/tga_pci.c @@ -49,7 +49,6 @@ __FBSDID("$FreeBSD$"); #include <machine/md_var.h> #include <machine/pc/bios.h> #include <machine/clock.h> -#include <machine/bus_memio.h> #include <machine/bus.h> #include <machine/pc/vesa.h> #include <machine/resource.h> diff --git a/sys/dev/ti/if_ti.c b/sys/dev/ti/if_ti.c index 86cea7c..4af3b29 100644 --- a/sys/dev/ti/if_ti.c +++ b/sys/dev/ti/if_ti.c @@ -108,7 +108,6 @@ __FBSDID("$FreeBSD$"); #include <vm/vm.h> /* for vtophys */ #include <vm/pmap.h> /* for vtophys */ -#include <machine/bus_memio.h> #include <machine/bus.h> #include <machine/resource.h> #include <sys/bus.h> diff --git a/sys/dev/trm/trm.c b/sys/dev/trm/trm.c index 0c03791..500c307 100644 --- a/sys/dev/trm/trm.c +++ b/sys/dev/trm/trm.c @@ -82,7 +82,6 @@ __FBSDID("$FreeBSD$"); #include <dev/pci/pcivar.h> #include <dev/pci/pcireg.h> #include <machine/resource.h> -#include <machine/bus_pio.h> #include <machine/bus.h> #include <machine/clock.h> #include <sys/rman.h> diff --git a/sys/dev/twe/twe_compat.h b/sys/dev/twe/twe_compat.h index 3729100..1bd46f0 100644 --- a/sys/dev/twe/twe_compat.h +++ b/sys/dev/twe/twe_compat.h @@ -51,7 +51,6 @@ #include <sys/disk.h> #include <sys/stat.h> -#include <machine/bus_pio.h> #include <machine/bus.h> #include <machine/resource.h> #include <sys/rman.h> diff --git a/sys/dev/tx/if_tx.c b/sys/dev/tx/if_tx.c index a7be029..18fe63f 100644 --- a/sys/dev/tx/if_tx.c +++ b/sys/dev/tx/if_tx.c @@ -58,8 +58,6 @@ __FBSDID("$FreeBSD$"); #include <net/if_vlan_var.h> -#include <machine/bus_memio.h> -#include <machine/bus_pio.h> #include <machine/bus.h> #include <machine/resource.h> #include <machine/clock.h> /* for DELAY */ diff --git a/sys/dev/txp/if_txp.c b/sys/dev/txp/if_txp.c index 8e708eb..749ea44 100644 --- a/sys/dev/txp/if_txp.c +++ b/sys/dev/txp/if_txp.c @@ -74,8 +74,6 @@ __FBSDID("$FreeBSD$"); #include <vm/vm.h> /* for vtophys */ #include <vm/pmap.h> /* for vtophys */ #include <machine/clock.h> /* for DELAY */ -#include <machine/bus_pio.h> -#include <machine/bus_memio.h> #include <machine/bus.h> #include <machine/resource.h> #include <sys/bus.h> diff --git a/sys/dev/usb/ehci.c b/sys/dev/usb/ehci.c index 27680c4..5870c4f 100644 --- a/sys/dev/usb/ehci.c +++ b/sys/dev/usb/ehci.c @@ -72,8 +72,6 @@ __FBSDID("$FreeBSD$"); #include <sys/endian.h> #include <sys/module.h> #include <sys/bus.h> -#include <machine/bus_pio.h> -#include <machine/bus_memio.h> #include <sys/lockmgr.h> #if defined(DIAGNOSTIC) && defined(__i386__) && defined(__FreeBSD__) #include <machine/cpu.h> diff --git a/sys/dev/usb/ohci.c b/sys/dev/usb/ohci.c index e0db856..4821cc6 100644 --- a/sys/dev/usb/ohci.c +++ b/sys/dev/usb/ohci.c @@ -70,8 +70,6 @@ __FBSDID("$FreeBSD$"); #include <sys/endian.h> #include <sys/module.h> #include <sys/bus.h> -#include <machine/bus_pio.h> -#include <machine/bus_memio.h> #if defined(DIAGNOSTIC) && defined(__i386__) && defined(__FreeBSD__) #include <machine/cpu.h> #endif diff --git a/sys/dev/usb/uhci.c b/sys/dev/usb/uhci.c index 4340a25..05fdd1e 100644 --- a/sys/dev/usb/uhci.c +++ b/sys/dev/usb/uhci.c @@ -72,7 +72,6 @@ __FBSDID("$FreeBSD$"); #include <sys/endian.h> #include <sys/module.h> #include <sys/bus.h> -#include <machine/bus_pio.h> #if defined(DIAGNOSTIC) && defined(__i386__) #include <machine/cpu.h> #endif diff --git a/sys/dev/vge/if_vge.c b/sys/dev/vge/if_vge.c index ef6040e..5607c9b 100644 --- a/sys/dev/vge/if_vge.c +++ b/sys/dev/vge/if_vge.c @@ -100,8 +100,6 @@ __FBSDID("$FreeBSD$"); #include <net/bpf.h> -#include <machine/bus_pio.h> -#include <machine/bus_memio.h> #include <machine/bus.h> #include <machine/resource.h> #include <sys/bus.h> diff --git a/sys/dev/vr/if_vr.c b/sys/dev/vr/if_vr.c index 843be85..502deb1 100644 --- a/sys/dev/vr/if_vr.c +++ b/sys/dev/vr/if_vr.c @@ -79,8 +79,6 @@ __FBSDID("$FreeBSD$"); #include <vm/vm.h> /* for vtophys */ #include <vm/pmap.h> /* for vtophys */ -#include <machine/bus_pio.h> -#include <machine/bus_memio.h> #include <machine/bus.h> #include <machine/resource.h> #include <sys/bus.h> diff --git a/sys/dev/vx/if_vx.c b/sys/dev/vx/if_vx.c index 9fd6f51..e526567 100644 --- a/sys/dev/vx/if_vx.c +++ b/sys/dev/vx/if_vx.c @@ -69,7 +69,6 @@ __FBSDID("$FreeBSD$"); #include <net/ethernet.h> #include <net/if_arp.h> -#include <machine/bus_pio.h> #include <machine/bus.h> #include <sys/bus.h> diff --git a/sys/dev/vx/if_vx_pci.c b/sys/dev/vx/if_vx_pci.c index 3afe238..c0694f1 100644 --- a/sys/dev/vx/if_vx_pci.c +++ b/sys/dev/vx/if_vx_pci.c @@ -39,7 +39,6 @@ __FBSDID("$FreeBSD$"); #include <net/if.h> #include <net/if_arp.h> -#include <machine/bus_pio.h> #include <machine/bus.h> #include <machine/resource.h> #include <sys/bus.h> diff --git a/sys/i386/include/bus.h b/sys/i386/include/bus.h index 4fd13ea..b3a9951 100644 --- a/sys/i386/include/bus.h +++ b/sys/i386/include/bus.h @@ -108,15 +108,6 @@ #include <machine/cpufunc.h> /* - * To remain compatible with NetBSD's interface, default to both memio and - * pio when neither of them is defined. - */ -#if !defined(_I386_BUS_PIO_H_) && !defined(_I386_BUS_MEMIO_H_) -#define _I386_BUS_PIO_H_ -#define _I386_BUS_MEMIO_H_ -#endif - -/* * Values for the i386 bus space tag, not to be used directly by MI code. */ #define I386_BUS_SPACE_IO 0 /* space is i/o space */ @@ -208,8 +199,6 @@ bus_space_free(bus_space_tag_t t __unused, bus_space_handle_t bsh __unused, } -#if defined(_I386_BUS_PIO_H_) || defined(_I386_BUS_MEMIO_H_) - /* * Read a 1, 2, 4, or 8 byte quantity from bus space * described by tag/handle/offset. @@ -230,45 +219,30 @@ static __inline u_int8_t bus_space_read_1(bus_space_tag_t tag, bus_space_handle_t handle, bus_size_t offset) { -#if defined (_I386_BUS_PIO_H_) -#if defined (_I386_BUS_MEMIO_H_) + if (tag == I386_BUS_SPACE_IO) -#endif return (inb(handle + offset)); -#endif -#if defined (_I386_BUS_MEMIO_H_) return (*(volatile u_int8_t *)(handle + offset)); -#endif } static __inline u_int16_t bus_space_read_2(bus_space_tag_t tag, bus_space_handle_t handle, bus_size_t offset) { -#if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) + if (tag == I386_BUS_SPACE_IO) -#endif return (inw(handle + offset)); -#endif -#if defined(_I386_BUS_MEMIO_H_) return (*(volatile u_int16_t *)(handle + offset)); -#endif } static __inline u_int32_t bus_space_read_4(bus_space_tag_t tag, bus_space_handle_t handle, bus_size_t offset) { -#if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) + if (tag == I386_BUS_SPACE_IO) -#endif return (inl(handle + offset)); -#endif -#if defined(_I386_BUS_MEMIO_H_) return (*(volatile u_int32_t *)(handle + offset)); -#endif } #if 0 /* Cause a link error for bus_space_read_8 */ @@ -298,17 +272,10 @@ static __inline void bus_space_read_multi_1(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t offset, u_int8_t *addr, size_t count) { -#if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) + if (tag == I386_BUS_SPACE_IO) -#endif insb(bsh + offset, addr, count); -#endif -#if defined(_I386_BUS_MEMIO_H_) -#if defined(_I386_BUS_PIO_H_) - else -#endif - { + else { #ifdef __GNUCLIKE_ASM __asm __volatile(" \n\ cld \n\ @@ -324,24 +291,16 @@ bus_space_read_multi_1(bus_space_tag_t tag, bus_space_handle_t bsh, # endif #endif } -#endif } static __inline void bus_space_read_multi_2(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t offset, u_int16_t *addr, size_t count) { -#if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) + if (tag == I386_BUS_SPACE_IO) -#endif insw(bsh + offset, addr, count); -#endif -#if defined(_I386_BUS_MEMIO_H_) -#if defined(_I386_BUS_PIO_H_) - else -#endif - { + else { #ifdef __GNUCLIKE_ASM __asm __volatile(" \n\ cld \n\ @@ -357,24 +316,16 @@ bus_space_read_multi_2(bus_space_tag_t tag, bus_space_handle_t bsh, # endif #endif } -#endif } static __inline void bus_space_read_multi_4(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t offset, u_int32_t *addr, size_t count) { -#if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) + if (tag == I386_BUS_SPACE_IO) -#endif insl(bsh + offset, addr, count); -#endif -#if defined(_I386_BUS_MEMIO_H_) -#if defined(_I386_BUS_PIO_H_) - else -#endif - { + else { #ifdef __GNUCLIKE_ASM __asm __volatile(" \n\ cld \n\ @@ -390,7 +341,6 @@ bus_space_read_multi_4(bus_space_tag_t tag, bus_space_handle_t bsh, # endif #endif } -#endif } #if 0 /* Cause a link error for bus_space_read_multi_8 */ @@ -422,11 +372,8 @@ static __inline void bus_space_read_region_1(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t offset, u_int8_t *addr, size_t count) { -#if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) - if (tag == I386_BUS_SPACE_IO) -#endif - { + + if (tag == I386_BUS_SPACE_IO) { int _port_ = bsh + offset; #ifdef __GNUCLIKE_ASM __asm __volatile(" \n\ @@ -443,13 +390,7 @@ bus_space_read_region_1(bus_space_tag_t tag, bus_space_handle_t bsh, # error "no assembler code for your compiler" # endif #endif - } -#endif -#if defined(_I386_BUS_MEMIO_H_) -#if defined(_I386_BUS_PIO_H_) - else -#endif - { + } else { int _port_ = bsh + offset; #ifdef __GNUCLIKE_ASM __asm __volatile(" \n\ @@ -465,18 +406,14 @@ bus_space_read_region_1(bus_space_tag_t tag, bus_space_handle_t bsh, # endif #endif } -#endif } static __inline void bus_space_read_region_2(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t offset, u_int16_t *addr, size_t count) { -#if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) - if (tag == I386_BUS_SPACE_IO) -#endif - { + + if (tag == I386_BUS_SPACE_IO) { int _port_ = bsh + offset; #ifdef __GNUCLIKE_ASM __asm __volatile(" \n\ @@ -493,13 +430,7 @@ bus_space_read_region_2(bus_space_tag_t tag, bus_space_handle_t bsh, # error "no assembler code for your compiler" # endif #endif - } -#endif -#if defined(_I386_BUS_MEMIO_H_) -#if defined(_I386_BUS_PIO_H_) - else -#endif - { + } else { int _port_ = bsh + offset; #ifdef __GNUCLIKE_ASM __asm __volatile(" \n\ @@ -515,18 +446,14 @@ bus_space_read_region_2(bus_space_tag_t tag, bus_space_handle_t bsh, # endif #endif } -#endif } static __inline void bus_space_read_region_4(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t offset, u_int32_t *addr, size_t count) { -#if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) - if (tag == I386_BUS_SPACE_IO) -#endif - { + + if (tag == I386_BUS_SPACE_IO) { int _port_ = bsh + offset; #ifdef __GNUCLIKE_ASM __asm __volatile(" \n\ @@ -543,13 +470,7 @@ bus_space_read_region_4(bus_space_tag_t tag, bus_space_handle_t bsh, # error "no assembler code for your compiler" # endif #endif - } -#endif -#if defined(_I386_BUS_MEMIO_H_) -#if defined(_I386_BUS_PIO_H_) - else -#endif - { + } else { int _port_ = bsh + offset; #ifdef __GNUCLIKE_ASM __asm __volatile(" \n\ @@ -565,7 +486,6 @@ bus_space_read_region_4(bus_space_tag_t tag, bus_space_handle_t bsh, # endif #endif } -#endif } #if 0 /* Cause a link error for bus_space_read_region_8 */ @@ -593,54 +513,33 @@ static __inline void bus_space_write_1(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t offset, u_int8_t value) { -#if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) + if (tag == I386_BUS_SPACE_IO) -#endif outb(bsh + offset, value); -#endif -#if defined(_I386_BUS_MEMIO_H_) -#if defined(_I386_BUS_PIO_H_) else -#endif *(volatile u_int8_t *)(bsh + offset) = value; -#endif } static __inline void bus_space_write_2(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t offset, u_int16_t value) { -#if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) + if (tag == I386_BUS_SPACE_IO) -#endif outw(bsh + offset, value); -#endif -#if defined(_I386_BUS_MEMIO_H_) -#if defined(_I386_BUS_PIO_H_) else -#endif *(volatile u_int16_t *)(bsh + offset) = value; -#endif } static __inline void bus_space_write_4(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t offset, u_int32_t value) { -#if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) + if (tag == I386_BUS_SPACE_IO) -#endif outl(bsh + offset, value); -#endif -#if defined(_I386_BUS_MEMIO_H_) -#if defined(_I386_BUS_PIO_H_) else -#endif *(volatile u_int32_t *)(bsh + offset) = value; -#endif } #if 0 /* Cause a link error for bus_space_write_8 */ @@ -673,17 +572,10 @@ static __inline void bus_space_write_multi_1(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t offset, const u_int8_t *addr, size_t count) { -#if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) + if (tag == I386_BUS_SPACE_IO) -#endif outsb(bsh + offset, addr, count); -#endif -#if defined(_I386_BUS_MEMIO_H_) -#if defined(_I386_BUS_PIO_H_) - else -#endif - { + else { #ifdef __GNUCLIKE_ASM __asm __volatile(" \n\ cld \n\ @@ -699,24 +591,16 @@ bus_space_write_multi_1(bus_space_tag_t tag, bus_space_handle_t bsh, # endif #endif } -#endif } static __inline void bus_space_write_multi_2(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t offset, const u_int16_t *addr, size_t count) { -#if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) + if (tag == I386_BUS_SPACE_IO) -#endif outsw(bsh + offset, addr, count); -#endif -#if defined(_I386_BUS_MEMIO_H_) -#if defined(_I386_BUS_PIO_H_) - else -#endif - { + else { #ifdef __GNUCLIKE_ASM __asm __volatile(" \n\ cld \n\ @@ -732,24 +616,16 @@ bus_space_write_multi_2(bus_space_tag_t tag, bus_space_handle_t bsh, # endif #endif } -#endif } static __inline void bus_space_write_multi_4(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t offset, const u_int32_t *addr, size_t count) { -#if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) + if (tag == I386_BUS_SPACE_IO) -#endif outsl(bsh + offset, addr, count); -#endif -#if defined(_I386_BUS_MEMIO_H_) -#if defined(_I386_BUS_PIO_H_) - else -#endif - { + else { #ifdef __GNUCLIKE_ASM __asm __volatile(" \n\ cld \n\ @@ -765,7 +641,6 @@ bus_space_write_multi_4(bus_space_tag_t tag, bus_space_handle_t bsh, # endif #endif } -#endif } #if 0 /* Cause a link error for bus_space_write_multi_8 */ @@ -798,11 +673,8 @@ static __inline void bus_space_write_region_1(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t offset, const u_int8_t *addr, size_t count) { -#if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) - if (tag == I386_BUS_SPACE_IO) -#endif - { + + if (tag == I386_BUS_SPACE_IO) { int _port_ = bsh + offset; #ifdef __GNUCLIKE_ASM __asm __volatile(" \n\ @@ -819,13 +691,7 @@ bus_space_write_region_1(bus_space_tag_t tag, bus_space_handle_t bsh, # error "no assembler code for your compiler" # endif #endif - } -#endif -#if defined(_I386_BUS_MEMIO_H_) -#if defined(_I386_BUS_PIO_H_) - else -#endif - { + } else { int _port_ = bsh + offset; #ifdef __GNUCLIKE_ASM __asm __volatile(" \n\ @@ -841,18 +707,14 @@ bus_space_write_region_1(bus_space_tag_t tag, bus_space_handle_t bsh, # endif #endif } -#endif } static __inline void bus_space_write_region_2(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t offset, const u_int16_t *addr, size_t count) { -#if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) - if (tag == I386_BUS_SPACE_IO) -#endif - { + + if (tag == I386_BUS_SPACE_IO) { int _port_ = bsh + offset; #ifdef __GNUCLIKE_ASM __asm __volatile(" \n\ @@ -869,13 +731,7 @@ bus_space_write_region_2(bus_space_tag_t tag, bus_space_handle_t bsh, # error "no assembler code for your compiler" # endif #endif - } -#endif -#if defined(_I386_BUS_MEMIO_H_) -#if defined(_I386_BUS_PIO_H_) - else -#endif - { + } else { int _port_ = bsh + offset; #ifdef __GNUCLIKE_ASM __asm __volatile(" \n\ @@ -891,18 +747,14 @@ bus_space_write_region_2(bus_space_tag_t tag, bus_space_handle_t bsh, # endif #endif } -#endif } static __inline void bus_space_write_region_4(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t offset, const u_int32_t *addr, size_t count) { -#if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) - if (tag == I386_BUS_SPACE_IO) -#endif - { + + if (tag == I386_BUS_SPACE_IO) { int _port_ = bsh + offset; #ifdef __GNUCLIKE_ASM __asm __volatile(" \n\ @@ -919,13 +771,7 @@ bus_space_write_region_4(bus_space_tag_t tag, bus_space_handle_t bsh, # error "no assembler code for your compiler" # endif #endif - } -#endif -#if defined(_I386_BUS_MEMIO_H_) -#if defined(_I386_BUS_PIO_H_) - else -#endif - { + } else { int _port_ = bsh + offset; #ifdef __GNUCLIKE_ASM __asm __volatile(" \n\ @@ -941,7 +787,6 @@ bus_space_write_region_4(bus_space_tag_t tag, bus_space_handle_t bsh, # endif #endif } -#endif } #if 0 /* Cause a link error for bus_space_write_region_8 */ @@ -973,20 +818,12 @@ bus_space_set_multi_1(bus_space_tag_t tag, bus_space_handle_t bsh, { bus_space_handle_t addr = bsh + offset; -#if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) if (tag == I386_BUS_SPACE_IO) -#endif while (count--) outb(addr, value); -#endif -#if defined(_I386_BUS_MEMIO_H_) -#if defined(_I386_BUS_PIO_H_) else -#endif while (count--) *(volatile u_int8_t *)(addr) = value; -#endif } static __inline void @@ -995,20 +832,12 @@ bus_space_set_multi_2(bus_space_tag_t tag, bus_space_handle_t bsh, { bus_space_handle_t addr = bsh + offset; -#if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) if (tag == I386_BUS_SPACE_IO) -#endif while (count--) outw(addr, value); -#endif -#if defined(_I386_BUS_MEMIO_H_) -#if defined(_I386_BUS_PIO_H_) else -#endif while (count--) *(volatile u_int16_t *)(addr) = value; -#endif } static __inline void @@ -1017,20 +846,12 @@ bus_space_set_multi_4(bus_space_tag_t tag, bus_space_handle_t bsh, { bus_space_handle_t addr = bsh + offset; -#if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) if (tag == I386_BUS_SPACE_IO) -#endif while (count--) outl(addr, value); -#endif -#if defined(_I386_BUS_MEMIO_H_) -#if defined(_I386_BUS_PIO_H_) else -#endif while (count--) *(volatile u_int32_t *)(addr) = value; -#endif } #if 0 /* Cause a link error for bus_space_set_multi_8 */ @@ -1061,20 +882,12 @@ bus_space_set_region_1(bus_space_tag_t tag, bus_space_handle_t bsh, { bus_space_handle_t addr = bsh + offset; -#if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) if (tag == I386_BUS_SPACE_IO) -#endif for (; count != 0; count--, addr++) outb(addr, value); -#endif -#if defined(_I386_BUS_MEMIO_H_) -#if defined(_I386_BUS_PIO_H_) else -#endif for (; count != 0; count--, addr++) *(volatile u_int8_t *)(addr) = value; -#endif } static __inline void @@ -1083,20 +896,12 @@ bus_space_set_region_2(bus_space_tag_t tag, bus_space_handle_t bsh, { bus_space_handle_t addr = bsh + offset; -#if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) if (tag == I386_BUS_SPACE_IO) -#endif for (; count != 0; count--, addr += 2) outw(addr, value); -#endif -#if defined(_I386_BUS_MEMIO_H_) -#if defined(_I386_BUS_PIO_H_) else -#endif for (; count != 0; count--, addr += 2) *(volatile u_int16_t *)(addr) = value; -#endif } static __inline void @@ -1105,20 +910,12 @@ bus_space_set_region_4(bus_space_tag_t tag, bus_space_handle_t bsh, { bus_space_handle_t addr = bsh + offset; -#if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) if (tag == I386_BUS_SPACE_IO) -#endif for (; count != 0; count--, addr += 4) outl(addr, value); -#endif -#if defined(_I386_BUS_MEMIO_H_) -#if defined(_I386_BUS_PIO_H_) else -#endif for (; count != 0; count--, addr += 4) *(volatile u_int32_t *)(addr) = value; -#endif } #if 0 /* Cause a link error for bus_space_set_region_8 */ @@ -1156,11 +953,7 @@ bus_space_copy_region_1(bus_space_tag_t tag, bus_space_handle_t bsh1, bus_space_handle_t addr1 = bsh1 + off1; bus_space_handle_t addr2 = bsh2 + off2; -#if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) - if (tag == I386_BUS_SPACE_IO) -#endif - { + if (tag == I386_BUS_SPACE_IO) { if (addr1 >= addr2) { /* src after dest: copy forward */ for (; count != 0; count--, addr1++, addr2++) @@ -1171,13 +964,7 @@ bus_space_copy_region_1(bus_space_tag_t tag, bus_space_handle_t bsh1, count != 0; count--, addr1--, addr2--) outb(addr2, inb(addr1)); } - } -#endif -#if defined(_I386_BUS_MEMIO_H_) -#if defined(_I386_BUS_PIO_H_) - else -#endif - { + } else { if (addr1 >= addr2) { /* src after dest: copy forward */ for (; count != 0; count--, addr1++, addr2++) @@ -1191,7 +978,6 @@ bus_space_copy_region_1(bus_space_tag_t tag, bus_space_handle_t bsh1, *(volatile u_int8_t *)(addr1); } } -#endif } static __inline void @@ -1202,11 +988,7 @@ bus_space_copy_region_2(bus_space_tag_t tag, bus_space_handle_t bsh1, bus_space_handle_t addr1 = bsh1 + off1; bus_space_handle_t addr2 = bsh2 + off2; -#if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) - if (tag == I386_BUS_SPACE_IO) -#endif - { + if (tag == I386_BUS_SPACE_IO) { if (addr1 >= addr2) { /* src after dest: copy forward */ for (; count != 0; count--, addr1 += 2, addr2 += 2) @@ -1217,13 +999,7 @@ bus_space_copy_region_2(bus_space_tag_t tag, bus_space_handle_t bsh1, count != 0; count--, addr1 -= 2, addr2 -= 2) outw(addr2, inw(addr1)); } - } -#endif -#if defined(_I386_BUS_MEMIO_H_) -#if defined(_I386_BUS_PIO_H_) - else -#endif - { + } else { if (addr1 >= addr2) { /* src after dest: copy forward */ for (; count != 0; count--, addr1 += 2, addr2 += 2) @@ -1237,7 +1013,6 @@ bus_space_copy_region_2(bus_space_tag_t tag, bus_space_handle_t bsh1, *(volatile u_int16_t *)(addr1); } } -#endif } static __inline void @@ -1248,11 +1023,7 @@ bus_space_copy_region_4(bus_space_tag_t tag, bus_space_handle_t bsh1, bus_space_handle_t addr1 = bsh1 + off1; bus_space_handle_t addr2 = bsh2 + off2; -#if defined(_I386_BUS_PIO_H_) -#if defined(_I386_BUS_MEMIO_H_) - if (tag == I386_BUS_SPACE_IO) -#endif - { + if (tag == I386_BUS_SPACE_IO) { if (addr1 >= addr2) { /* src after dest: copy forward */ for (; count != 0; count--, addr1 += 4, addr2 += 4) @@ -1263,13 +1034,7 @@ bus_space_copy_region_4(bus_space_tag_t tag, bus_space_handle_t bsh1, count != 0; count--, addr1 -= 4, addr2 -= 4) outl(addr2, inl(addr1)); } - } -#endif -#if defined(_I386_BUS_MEMIO_H_) -#if defined(_I386_BUS_PIO_H_) - else -#endif - { + } else { if (addr1 >= addr2) { /* src after dest: copy forward */ for (; count != 0; count--, addr1 += 4, addr2 += 4) @@ -1283,11 +1048,8 @@ bus_space_copy_region_4(bus_space_tag_t tag, bus_space_handle_t bsh1, *(volatile u_int32_t *)(addr1); } } -#endif } -#endif /* defined(_I386_BUS_PIO_H_) || defined(_I386_MEM_IO_H_) */ - #if 0 /* Cause a link error for bus_space_copy_8 */ #define bus_space_copy_region_8 !!! bus_space_copy_region_8 unimplemented !!! #endif diff --git a/sys/i386/include/bus_memio.h b/sys/i386/include/bus_memio.h deleted file mode 100644 index fe943c7..0000000 --- a/sys/i386/include/bus_memio.h +++ /dev/null @@ -1,31 +0,0 @@ -/*- - * Copyright (c) 1997 Justin Gibbs. - * 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. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * 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 _I386_BUS_MEMIO_H_ -#define _I386_BUS_MEMIO_H_ -#endif /* _I386_BUS_MEMIO_H_ */ diff --git a/sys/i386/include/bus_pio.h b/sys/i386/include/bus_pio.h deleted file mode 100644 index 15b5762..0000000 --- a/sys/i386/include/bus_pio.h +++ /dev/null @@ -1,31 +0,0 @@ -/*- - * Copyright (c) 1997 Justin Gibbs. - * 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. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * 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 _I386_BUS_PIO_H_ -#define _I386_BUS_PIO_H_ -#endif /* _I386_BUS_PIO_H_ */ diff --git a/sys/i386/isa/if_el.c b/sys/i386/isa/if_el.c index 80e4a36..cea72ab 100644 --- a/sys/i386/isa/if_el.c +++ b/sys/i386/isa/if_el.c @@ -43,7 +43,6 @@ __FBSDID("$FreeBSD$"); #include <net/bpf.h> -#include <machine/bus_pio.h> #include <machine/bus.h> #include <machine/resource.h> #include <sys/bus.h> diff --git a/sys/i4b/layer1/itjc/i4b_itjc_pci.c b/sys/i4b/layer1/itjc/i4b_itjc_pci.c index 2033e52..773a84d 100644 --- a/sys/i4b/layer1/itjc/i4b_itjc_pci.c +++ b/sys/i4b/layer1/itjc/i4b_itjc_pci.c @@ -48,7 +48,6 @@ __FBSDID("$FreeBSD$"); #include <sys/mbuf.h> #include <machine/clock.h> -#include <machine/bus_pio.h> #include <machine/bus.h> #include <machine/resource.h> #include <sys/bus.h> diff --git a/sys/ia64/include/bus.h b/sys/ia64/include/bus.h index 7e823f4..02fe8be 100644 --- a/sys/ia64/include/bus.h +++ b/sys/ia64/include/bus.h @@ -72,17 +72,6 @@ #ifndef _MACHINE_BUS_H_ #define _MACHINE_BUS_H_ -/* - * Platform notes: - * o We don't use the _MACHINE_BUS_PIO_H_ and _MACHINE_BUS_MEMIO_H_ - * macros to conditionally compile for I/O port, memory mapped I/O - * or both. It's a micro-optimization that is not worth the pain - * because there is no I/O port space. I/O ports are emulated by - * doing memory mapped I/O in a special memory range. The address - * translation is slightly magic for I/O port accesses, but it does - * not warrant the overhead. - */ - #include <machine/_bus.h> #include <machine/cpufunc.h> diff --git a/sys/ia64/include/bus_memio.h b/sys/ia64/include/bus_memio.h deleted file mode 100644 index 0b02084..0000000 --- a/sys/ia64/include/bus_memio.h +++ /dev/null @@ -1,31 +0,0 @@ -/*- - * Copyright (c) 1997 Justin Gibbs. - * 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. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * 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 _MACHINE_BUS_MEMIO_H_ -#define _MACHINE_BUS_MEMIO_H_ -#endif /* _MACHINE_BUS_MEMIO_H_ */ diff --git a/sys/ia64/include/bus_pio.h b/sys/ia64/include/bus_pio.h deleted file mode 100644 index 5fdb891..0000000 --- a/sys/ia64/include/bus_pio.h +++ /dev/null @@ -1,31 +0,0 @@ -/*- - * Copyright (c) 1997 Justin Gibbs. - * 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. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * 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 _MACHINE_BUS_PIO_H_ -#define _MACHINE_BUS_PIO_H_ -#endif /* _MACHINE_BUS_PIO_H_ */ diff --git a/sys/isa/atkbdc_isa.c b/sys/isa/atkbdc_isa.c index d0476a3..5f1408c 100644 --- a/sys/isa/atkbdc_isa.c +++ b/sys/isa/atkbdc_isa.c @@ -35,8 +35,6 @@ __FBSDID("$FreeBSD$"); #include <sys/module.h> #include <sys/bus.h> #include <sys/malloc.h> -#include <machine/bus_pio.h> -#include <machine/bus.h> #include <machine/resource.h> #include <sys/rman.h> diff --git a/sys/pc98/include/bus_memio.h b/sys/pc98/include/bus_memio.h deleted file mode 100644 index 5221cfc..0000000 --- a/sys/pc98/include/bus_memio.h +++ /dev/null @@ -1,4 +0,0 @@ -/*- - * This file is in the public domain. - */ -/* $FreeBSD$ */ diff --git a/sys/pc98/include/bus_pio.h b/sys/pc98/include/bus_pio.h deleted file mode 100644 index 5221cfc..0000000 --- a/sys/pc98/include/bus_pio.h +++ /dev/null @@ -1,4 +0,0 @@ -/*- - * This file is in the public domain. - */ -/* $FreeBSD$ */ diff --git a/sys/pci/alpm.c b/sys/pci/alpm.c index 9a0e537..e6f8149 100644 --- a/sys/pci/alpm.c +++ b/sys/pci/alpm.c @@ -38,8 +38,6 @@ __FBSDID("$FreeBSD$"); #include <sys/bus.h> #include <sys/uio.h> -#include <machine/bus_pio.h> -#include <machine/bus_memio.h> #include <machine/bus.h> #include <machine/resource.h> #include <sys/rman.h> diff --git a/sys/pci/amdpm.c b/sys/pci/amdpm.c index 22ca103..2c8af62 100644 --- a/sys/pci/amdpm.c +++ b/sys/pci/amdpm.c @@ -42,8 +42,6 @@ __FBSDID("$FreeBSD$"); #include <sys/bus.h> #include <sys/uio.h> -#include <machine/bus_pio.h> -#include <machine/bus_memio.h> #include <machine/bus.h> #include <machine/clock.h> #include <machine/resource.h> diff --git a/sys/pci/if_dc.c b/sys/pci/if_dc.c index 4fe664d..ae92c8d 100644 --- a/sys/pci/if_dc.c +++ b/sys/pci/if_dc.c @@ -112,8 +112,6 @@ __FBSDID("$FreeBSD$"); #include <net/bpf.h> -#include <machine/bus_pio.h> -#include <machine/bus_memio.h> #include <machine/bus.h> #include <machine/resource.h> #include <sys/bus.h> diff --git a/sys/pci/if_pcn.c b/sys/pci/if_pcn.c index 00607242..640c827 100644 --- a/sys/pci/if_pcn.c +++ b/sys/pci/if_pcn.c @@ -71,8 +71,6 @@ __FBSDID("$FreeBSD$"); #include <vm/vm.h> /* for vtophys */ #include <vm/pmap.h> /* for vtophys */ -#include <machine/bus_pio.h> -#include <machine/bus_memio.h> #include <machine/bus.h> #include <machine/resource.h> #include <sys/bus.h> diff --git a/sys/pci/if_rl.c b/sys/pci/if_rl.c index e71cbb8..4f2fd9b 100644 --- a/sys/pci/if_rl.c +++ b/sys/pci/if_rl.c @@ -101,8 +101,6 @@ __FBSDID("$FreeBSD$"); #include <net/bpf.h> -#include <machine/bus_pio.h> -#include <machine/bus_memio.h> #include <machine/bus.h> #include <machine/resource.h> #include <sys/bus.h> diff --git a/sys/pci/if_sf.c b/sys/pci/if_sf.c index ed91f01..5593d52 100644 --- a/sys/pci/if_sf.c +++ b/sys/pci/if_sf.c @@ -98,8 +98,6 @@ __FBSDID("$FreeBSD$"); #include <vm/vm.h> /* for vtophys */ #include <vm/pmap.h> /* for vtophys */ -#include <machine/bus_pio.h> -#include <machine/bus_memio.h> #include <machine/bus.h> #include <machine/resource.h> #include <sys/bus.h> diff --git a/sys/pci/if_sis.c b/sys/pci/if_sis.c index 0e461ba..ad7e1b3 100644 --- a/sys/pci/if_sis.c +++ b/sys/pci/if_sis.c @@ -78,8 +78,6 @@ __FBSDID("$FreeBSD$"); #include <net/bpf.h> -#include <machine/bus_pio.h> -#include <machine/bus_memio.h> #include <machine/bus.h> #include <machine/resource.h> #include <sys/bus.h> diff --git a/sys/pci/if_sk.c b/sys/pci/if_sk.c index 9f148a1..1703e2f 100644 --- a/sys/pci/if_sk.c +++ b/sys/pci/if_sk.c @@ -106,8 +106,6 @@ __FBSDID("$FreeBSD$"); #include <vm/vm.h> /* for vtophys */ #include <vm/pmap.h> /* for vtophys */ -#include <machine/bus_pio.h> -#include <machine/bus_memio.h> #include <machine/bus.h> #include <machine/resource.h> #include <sys/bus.h> diff --git a/sys/pci/if_ste.c b/sys/pci/if_ste.c index ac5a2b5..7c51421 100644 --- a/sys/pci/if_ste.c +++ b/sys/pci/if_ste.c @@ -54,8 +54,6 @@ __FBSDID("$FreeBSD$"); #include <vm/vm.h> /* for vtophys */ #include <vm/pmap.h> /* for vtophys */ -#include <machine/bus_memio.h> -#include <machine/bus_pio.h> #include <machine/bus.h> #include <machine/resource.h> #include <sys/bus.h> diff --git a/sys/pci/if_ti.c b/sys/pci/if_ti.c index 86cea7c..4af3b29 100644 --- a/sys/pci/if_ti.c +++ b/sys/pci/if_ti.c @@ -108,7 +108,6 @@ __FBSDID("$FreeBSD$"); #include <vm/vm.h> /* for vtophys */ #include <vm/pmap.h> /* for vtophys */ -#include <machine/bus_memio.h> #include <machine/bus.h> #include <machine/resource.h> #include <sys/bus.h> diff --git a/sys/pci/if_tl.c b/sys/pci/if_tl.c index 1415f21..0f70a32 100644 --- a/sys/pci/if_tl.c +++ b/sys/pci/if_tl.c @@ -196,8 +196,6 @@ __FBSDID("$FreeBSD$"); #include <vm/vm.h> /* for vtophys */ #include <vm/pmap.h> /* for vtophys */ -#include <machine/bus_memio.h> -#include <machine/bus_pio.h> #include <machine/bus.h> #include <machine/resource.h> #include <sys/bus.h> diff --git a/sys/pci/if_vr.c b/sys/pci/if_vr.c index 843be85..502deb1 100644 --- a/sys/pci/if_vr.c +++ b/sys/pci/if_vr.c @@ -79,8 +79,6 @@ __FBSDID("$FreeBSD$"); #include <vm/vm.h> /* for vtophys */ #include <vm/pmap.h> /* for vtophys */ -#include <machine/bus_pio.h> -#include <machine/bus_memio.h> #include <machine/bus.h> #include <machine/resource.h> #include <sys/bus.h> diff --git a/sys/pci/if_wb.c b/sys/pci/if_wb.c index e22d61c..8b460ec 100644 --- a/sys/pci/if_wb.c +++ b/sys/pci/if_wb.c @@ -105,8 +105,6 @@ __FBSDID("$FreeBSD$"); #include <vm/vm.h> /* for vtophys */ #include <vm/pmap.h> /* for vtophys */ -#include <machine/bus_memio.h> -#include <machine/bus_pio.h> #include <machine/bus.h> #include <machine/resource.h> #include <sys/bus.h> diff --git a/sys/pci/if_xl.c b/sys/pci/if_xl.c index 0741667..272b70b 100644 --- a/sys/pci/if_xl.c +++ b/sys/pci/if_xl.c @@ -119,8 +119,6 @@ __FBSDID("$FreeBSD$"); #include <net/bpf.h> -#include <machine/bus_memio.h> -#include <machine/bus_pio.h> #include <machine/bus.h> #include <machine/resource.h> #include <sys/bus.h> diff --git a/sys/pci/intpm.c b/sys/pci/intpm.c index cbe622b..1e454bb 100644 --- a/sys/pci/intpm.c +++ b/sys/pci/intpm.c @@ -30,8 +30,6 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> -#include <machine/bus_pio.h> -#include <machine/bus_memio.h> #include <machine/bus.h> #include <sys/uio.h> diff --git a/sys/pci/viapm.c b/sys/pci/viapm.c index 522d057..685eccd 100644 --- a/sys/pci/viapm.c +++ b/sys/pci/viapm.c @@ -34,8 +34,6 @@ __FBSDID("$FreeBSD$"); #include <sys/bus.h> #include <sys/uio.h> -#include <machine/bus_pio.h> -#include <machine/bus_memio.h> #include <machine/bus.h> #include <machine/clock.h> /* for DELAY */ #include <machine/resource.h> diff --git a/sys/powerpc/include/bus_memio.h b/sys/powerpc/include/bus_memio.h deleted file mode 100644 index 2441000..0000000 --- a/sys/powerpc/include/bus_memio.h +++ /dev/null @@ -1,33 +0,0 @@ -/*- - * Copyright (c) 1997 Justin Gibbs. - * 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. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * 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. - * - * from: FreeBSD: src/sys/i386/include/bus_memio.h,v 1.2 1999/08/28 - * - * $FreeBSD$ - */ - -#ifndef _MACHINE_BUS_MEMIO_H_ -#define _MACHINE_BUS_MEMIO_H_ -#endif /* _MACHINE_BUS_MEMIO_H_ */ diff --git a/sys/powerpc/include/bus_pio.h b/sys/powerpc/include/bus_pio.h deleted file mode 100644 index aba61df..0000000 --- a/sys/powerpc/include/bus_pio.h +++ /dev/null @@ -1,33 +0,0 @@ -/*- - * Copyright (c) 1997 Justin Gibbs. - * 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. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * 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. - * - * from: FreeBSD: src/sys/i386/include/bus_pio.h,v 1.2 1999/08/28 - * - * $FreeBSD$ - */ - -#ifndef _MACHINE_BUS_PIO_H_ -#define _MACHINE_BUS_PIO_H_ -#endif /* _MACHINE_BUS_PIO_H_ */ diff --git a/sys/powerpc/psim/sio_iobus.c b/sys/powerpc/psim/sio_iobus.c index cb6cffa..1d6c601 100644 --- a/sys/powerpc/psim/sio_iobus.c +++ b/sys/powerpc/psim/sio_iobus.c @@ -41,7 +41,6 @@ #include <sys/mutex.h> #include <sys/module.h> #include <sys/tty.h> -#include <machine/bus_pio.h> #include <machine/bus.h> #include <sys/timepps.h> diff --git a/sys/powerpc/psim/uart_iobus.c b/sys/powerpc/psim/uart_iobus.c index cb6cffa..1d6c601 100644 --- a/sys/powerpc/psim/uart_iobus.c +++ b/sys/powerpc/psim/uart_iobus.c @@ -41,7 +41,6 @@ #include <sys/mutex.h> #include <sys/module.h> #include <sys/tty.h> -#include <machine/bus_pio.h> #include <machine/bus.h> #include <sys/timepps.h> diff --git a/sys/sparc64/include/bus_memio.h b/sys/sparc64/include/bus_memio.h deleted file mode 100644 index 2441000..0000000 --- a/sys/sparc64/include/bus_memio.h +++ /dev/null @@ -1,33 +0,0 @@ -/*- - * Copyright (c) 1997 Justin Gibbs. - * 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. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * 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. - * - * from: FreeBSD: src/sys/i386/include/bus_memio.h,v 1.2 1999/08/28 - * - * $FreeBSD$ - */ - -#ifndef _MACHINE_BUS_MEMIO_H_ -#define _MACHINE_BUS_MEMIO_H_ -#endif /* _MACHINE_BUS_MEMIO_H_ */ diff --git a/sys/sparc64/include/bus_pio.h b/sys/sparc64/include/bus_pio.h deleted file mode 100644 index aba61df..0000000 --- a/sys/sparc64/include/bus_pio.h +++ /dev/null @@ -1,33 +0,0 @@ -/*- - * Copyright (c) 1997 Justin Gibbs. - * 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. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * 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. - * - * from: FreeBSD: src/sys/i386/include/bus_pio.h,v 1.2 1999/08/28 - * - * $FreeBSD$ - */ - -#ifndef _MACHINE_BUS_PIO_H_ -#define _MACHINE_BUS_PIO_H_ -#endif /* _MACHINE_BUS_PIO_H_ */ |
