diff options
Diffstat (limited to 'sys')
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 d0b0ba38a617..000000000000 --- 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 f51bf436642b..000000000000 --- 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 3cddfa578ec2..de13690c0bd5 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 41431736237b..b1a91a27b2d1 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 6a0d4f8a95dc..000000000000 --- 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 2044adf07637..000000000000 --- 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 24410006b93c..000000000000 --- 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 aba61dfddfcd..000000000000 --- 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 c6508ed17b53..ca8f009f9135 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 f7927c104f14..c1418a461a74 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 19f55fc198f0..948f17748fa6 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 466c290f42b9..ea71528fe9dc 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 b57756fc582b..15c4416a1647 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 e8f933d5af23..e239325fa5cf 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 0cad9a01fa9c..78c1759cac5d 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 19a12d92502d..22b11bb8ece6 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 e56cf29653f0..6d6fa70ca29c 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 8a3a0790843b..e0b7c1591bac 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 909a85c20ed8..455e2044555b 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 7b9cfb1e3fb8..aa6541dfa995 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 4604571da52f..e89829f962e3 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 2e5e2e76637a..4d40ae3eb7cc 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 c6c14fd99cc0..3b9ce175eb86 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 518d76bc367d..b926bba2c159 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 4300dbac7b26..b828a9daf84c 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 177b5cd4c1f8..8805a60c6bc6 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 4d7249c5aaa6..cafcd1a765e7 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 31f4283cb2bc..b09d3e82bc07 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 0fd2125d07a6..71736f21d667 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 55831508a966..04e92ab0be1b 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 c6f36f1d8700..66153321a06e 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 07752a3b5bc4..159f9f9c31ba 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 b1b615ceeaf6..a91bd68487c4 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 a20a580b0960..e6fa569214bd 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 6fab69855b8a..0fdfd8c82b75 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 a459d9267374..70741c0a085d 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 81c001f35e8a..afe36153d0d3 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 9b88c7c0bf5b..3715c8b8ee33 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 e94e9887c676..b7d985175acc 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 7fc2325c0dd4..c0cee013e6c1 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 d0476a315d44..5f1408c8ddb9 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 d0476a315d44..5f1408c8ddb9 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 90f85c0b1acf..a2eddd4bd768 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 1f3cc7f4577b..c83d17d39477 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 8502e1168315..62a2cf63c886 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 7c6965d6a08d..efc63da05bf4 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 c0493fff2b6a..f08f810733a5 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 5daca971a031..41f0b09ad6ea 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 807144d6fe1f..20802f460587 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 27519bc1e228..f55527223363 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 a9b42ad76b4b..a74dd4faf01b 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 74ad13b81875..37441f4a5da4 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 b1c40107aa78..cef2e53d61ce 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 78f4b2e1133b..17638b22374f 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 fe9d3f02ba1d..51d15cb3ca49 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 0b23fbf52021..62d296c82441 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 9e2fdd4bea0d..d1891c3d5ab6 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 ddf9b7e2a605..3a6a5de27e4e 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 4fe664d1c8cb..ae92c8dc920b 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 63891f58e5e0..98d269a34e6b 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 5e2a039f6871..1a6ef9a7bb6d 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 c0ede88cf9d5..c9264af3708c 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 d3b1190f7211..c91ab25b1ef9 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 db2f7b06603c..129c95b94824 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 77090c5f38bf..436ae40f4669 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 b0cf5a927f9a..6a14dca6de82 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 70f3b6bfc0a4..854a68549cef 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 b55dc5a5cf37..84923ef7784c 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 c58ae0e021e1..9dc31aa45442 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 34db172bb4cd..9b8d69caac41 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 8fc59ed780de..fb28478fac6c 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 5637c44c5e9a..d81229ec8754 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 cd3a95fec3d8..663b816a71d8 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 794cb90b90c3..2446dddbe185 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 719d38c33273..864b1700a010 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 0f2fd2a6fe0f..3c9810537c2f 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 4659c4689037..84e52eb7b071 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 26b1e5a9329d..1a77c4bb060e 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 f30d7752f11f..71845e94324d 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 b8448c86bcfd..53ed25635d67 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 af7e02c5312c..77eb9eee10b5 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 60b2962e64fd..4e3cef6b902e 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 2edfc91e042b..4ad5d0cbf4d5 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 0e5e658336e9..829bb46d6ad9 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 0b0fe65d4030..b841eeaeea2f 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 8b467c602e4b..ede1fe14b2d3 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 3a9c041872ba..55a0ef7058ac 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 7fc2325c0dd4..c0cee013e6c1 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 9c01ca4db2df..ace667df0910 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 401781c95434..86e40c474436 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 f63167246f4d..8b71f105977d 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 ddf9b7e2a605..3a6a5de27e4e 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 63891f58e5e0..98d269a34e6b 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 dcee43c6576c..d8cc79ac7b36 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 da04278eb4c7..732fed8697e3 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 c7fa06844aa2..074d6fa20176 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 49e6f4e0c371..50cd28289ded 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 cdb128747e82..828d6e15df90 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 c9835e55e62c..20b57e8345ca 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 346c09aebda8..32bd9021fac1 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 6434f6a81700..7472e625f32c 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 0fc0fca782aa..f480cb5cf87f 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 d955ff2938b2..cad74162fe56 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 c4d3b393edd8..0963a6b49c11 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 e4c2b0ea185d..32f50a9cd8f8 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 cfb6f89fc48d..6ed271aa1fc5 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 ba2a993faf9e..6dc7c6c9345d 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 1971a208ff23..d3a64e223a10 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 a887f1887acd..ea52ef302076 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 2c5f7966f506..136c900973e8 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 da2fe6a0d5eb..082d0d8461af 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 ed91f015aada..5593d525ecea 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 2a9240b0936a..4dfabc0c8883 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 40541e662521..afb6fac79cff 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 713393a87097..b71582842eea 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 05d42268f655..459baa169366 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 877a03966d07..dd80e68f5d3b 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 9f148a1c72f4..1703e2f36f56 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 7382fdc0bacd..db4eafb60913 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 510a32b74196..3f68e001295b 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 dbb8a83a46ba..8f62513b360f 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 c07c4c8b516d..a0e7139b4969 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 40966697dc43..7165a817db90 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 67bffd3f40c2..a66f65c8841a 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 cda2ed7e63d2..1edda5af141a 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 c2cfd44b42ac..152fd11bbbdf 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 54abca694bdf..e8f10f0f05bb 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 25afbfd006f8..47f32f438526 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 86cea7c74750..4af3b292bde4 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 0c03791c6761..500c3076f6b1 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 372910041131..1bd46f0022ae 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 a7be0290c22d..18fe63f2cc5a 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 8e708ebfb75a..749ea4487486 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 27680c483750..5870c4fa8f58 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 e0db856e797a..4821cc6a625b 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 4340a252340b..05fdd1eddb18 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 ef6040ec255d..5607c9bbe053 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 843be854f4fe..502deb1d212c 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 9fd6f5167cb7..e5265675f398 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 3afe2385e0c5..c0694f1978da 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 4fd13ea046c5..b3a99511e13c 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 fe943c7e6ffa..000000000000 --- 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 15b5762ee9f6..000000000000 --- 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 80e4a3653bd6..cea72ab2d941 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 2033e5230898..773a84d55d7b 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 7e823f473eab..02fe8bee1056 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 0b02084abec3..000000000000 --- 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 5fdb891485ad..000000000000 --- 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 d0476a315d44..5f1408c8ddb9 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 5221cfcd7be1..000000000000 --- 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 5221cfcd7be1..000000000000 --- 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 9a0e5374f6b1..e6f81493a800 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 22ca10313385..2c8af6266ed2 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 4fe664d1c8cb..ae92c8dc920b 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 006072429cca..640c827c2f70 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 e71cbb8471c7..4f2fd9b42f22 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 ed91f015aada..5593d525ecea 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 0e461ba7ea0c..ad7e1b321bc1 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 9f148a1c72f4..1703e2f36f56 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 ac5a2b52caf1..7c51421049c7 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 86cea7c74750..4af3b292bde4 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 1415f210ff54..0f70a32d10cc 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 843be854f4fe..502deb1d212c 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 e22d61c2a8a1..8b460ec58a7b 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 074166793101..272b70bb3a60 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 cbe622b93326..1e454bb8413c 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 522d057637ef..685eccd468f4 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 24410006b93c..000000000000 --- 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 aba61dfddfcd..000000000000 --- 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 cb6cffa79a4f..1d6c6017cf1c 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 cb6cffa79a4f..1d6c6017cf1c 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 24410006b93c..000000000000 --- 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 aba61dfddfcd..000000000000 --- 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_ */ |