d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove bus_{mem,p}io.h and related code for a micro-optimization on i386

Browse Source 
and amd64.  The optimization is a trivial on recent machines.

Reviewed by:	-arch (imp, marcel, dfr)
This commit is contained in:
Yoshihiro Takahashi 2005-05-29 04:42:30 +00:00
parent 885fec3e08
commit d4fcf3cba5
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=146734
173 changed files with 84 additions and 1269 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
sys/alpha/include/bus_memio.h
View File

@ -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_ */

31
sys/alpha/include/bus_pio.h
View File

@ -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_ */

1
sys/alpha/isa/mcclock_isa.c
View File

@ -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>

322
sys/amd64/include/bus.h
View File

@ -107,15 +107,6 @@
#include <machine/_bus.h>
#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.
*/
@ -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

31
sys/amd64/include/bus_memio.h
View File

@ -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_ */

31
sys/amd64/include/bus_pio.h
View File

@ -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_ */

33
sys/arm/include/bus_memio.h
View File

@ -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_ */

33
sys/arm/include/bus_pio.h
View File

@ -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_ */

2
sys/compat/ndis/subr_hal.c
View File

@ -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>

2
sys/compat/ndis/subr_ndis.c
View File

@ -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>

2
sys/compat/ndis/subr_ntoskrnl.c
View File

@ -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>

1
sys/dev/aac/aac.c
View File

@ -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>

1
sys/dev/aac/aac_pci.c
View File

@ -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>

1
sys/dev/acpica/Osd/OsdHardware.c
View File

@ -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>

1
sys/dev/acpica/acpi_package.c
View File

@ -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>

1
sys/dev/acpica/acpi_perf.c
View File

@ -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>

1
sys/dev/advansys/adv_eisa.c
View File

@ -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>

1
sys/dev/advansys/adv_isa.c
View File

@ -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>

1
sys/dev/advansys/adv_pci.c
View File

@ -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>

1
sys/dev/advansys/advansys.c
View File

@ -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>

1
sys/dev/advansys/advlib.c
View File

@ -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>

1
sys/dev/advansys/adw_pci.c
View File

@ -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>

2
sys/dev/advansys/adwcam.c
View File

@ -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>

2
sys/dev/advansys/adwlib.c
View File

@ -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>

1
sys/dev/aha/aha.c
View File

@ -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>

1
sys/dev/aha/aha_isa.c
View File

@ -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>

1
sys/dev/ahb/ahb.c
View File

@ -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>

1
sys/dev/aic/aic.c
View File

@ -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>

1
sys/dev/aic/aic_isa.c
View File

@ -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>

1
sys/dev/aic/aic_pccard.c
View File

@ -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>

2
sys/dev/aic7xxx/aic79xx_osm.h
View File

@ -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>

2
sys/dev/aic7xxx/aic7xxx_osm.h
View File

@ -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>

1
sys/dev/amd/amd.c
View File

@ -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>

2
sys/dev/amr/amr.c
View File

@ -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>

2
sys/dev/amr/amr_pci.c
View File

@ -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>

2
sys/dev/ar/if_ar.c
View File

@ -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>

2
sys/dev/ar/if_ar_isa.c
View File

@ -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>

2
sys/dev/ar/if_ar_pci.c
View File

@ -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>

1
sys/dev/arcmsr/arcmsr.c
View File

@ -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>

1
sys/dev/atkbdc/atkbdc.c
View File

@ -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>

2
sys/dev/atkbdc/atkbdc_isa.c
View File

@ -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>

2
sys/dev/atkbdc/atkbdc_subr.c
View File

@ -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>

4
sys/dev/awi/am79c930.c
View File

@ -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>

1
sys/dev/bfe/if_bfe.c
View File

@ -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>

1
sys/dev/bge/if_bge.c
View File

@ -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>

1
sys/dev/bktr/bktr_audio.c
View File

@ -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

1
sys/dev/bktr/bktr_card.c
View File

@ -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

1
sys/dev/bktr/bktr_core.c
View File

@ -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>

1
sys/dev/bktr/bktr_i2c.c
View File

@ -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>

1
sys/dev/bktr/bktr_os.c
View File

@ -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>

1
sys/dev/bktr/bktr_tuner.c
View File

@ -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

8
sys/dev/buslogic/bt.c
View File

@ -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>

1
sys/dev/buslogic/bt_eisa.c
View File

@ -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>

1
sys/dev/buslogic/bt_isa.c
View File

@ -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>

2
sys/dev/buslogic/bt_pci.c
View File

@ -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>

1
sys/dev/ciss/ciss.c
View File

@ -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>

1
sys/dev/cnw/if_cnw.c
View File

@ -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>

2
sys/dev/dc/dcphy.c
View File

@ -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>

2
sys/dev/dc/if_dc.c
View File

@ -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>

2
sys/dev/dc/pnphy.c
View File

@ -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>

1
sys/dev/dpt/dpt_eisa.c
View File

@ -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>

1
sys/dev/dpt/dpt_isa.c
View File

@ -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>

2
sys/dev/dpt/dpt_pci.c
View File

@ -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>

2
sys/dev/dpt/dpt_scsi.c
View File

@ -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>

1
sys/dev/fb/boot_font.c
View File

@ -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>

1
sys/dev/fb/gfb.c
View File

@ -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>

2
sys/dev/fb/s3_pci.c
View File

@ -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>

1
sys/dev/fb/tga.c
View File

@ -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>

1
sys/dev/gfb/gfb_pci.c
View File

@ -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>

1
sys/dev/hfa/hfa_freebsd.c
View File

@ -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>

1
sys/dev/hfa/hfa_pci.c
View File

@ -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>

1
sys/dev/hptmv/osbsd.h
View File

@ -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>

2
sys/dev/ida/ida.c
View File

@ -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>

2
sys/dev/ida/ida_disk.c
View File

@ -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>

1
sys/dev/ida/ida_eisa.c
View File

@ -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>

2
sys/dev/ida/ida_pci.c
View File

@ -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>

1
sys/dev/idt/idt_harp.c
View File

@ -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>

1
sys/dev/idt/idt_pci.c
View File

@ -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>

1
sys/dev/ie/if_ie.c
View File

@ -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>

1
sys/dev/ie/if_ie_isa.c
View File

@ -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>

2
sys/dev/if_ndis/if_ndis.c
View File

@ -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>

2
sys/dev/iir/iir.c
View File

@ -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>

2
sys/dev/iir/iir_pci.c
View File

@ -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>

1
sys/dev/ips/ips.h
View File

@ -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>

1
sys/dev/ips/ips_disk.h
View File

@ -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>

2
sys/dev/isp/isp_freebsd.h
View File

@ -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>

2
sys/dev/isp/isp_pci.c
View File

@ -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>

1
sys/dev/kbd/atkbdc.c
View File

@ -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>

2
sys/dev/lge/if_lge.c
View File

@ -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>

1
sys/dev/mcd/mcd.c
View File

@ -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>

1
sys/dev/mcd/mcd_isa.c
View File

@ -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>

2
sys/dev/mii/dcphy.c
View File

@ -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>

2
sys/dev/mii/pnphy.c
View File

@ -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>

2
sys/dev/mlx/mlx.c
View File

@ -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>

2
sys/dev/mlx/mlx_pci.c
View File

@ -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>

1
sys/dev/mly/mly.c
View File

@ -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>

2
sys/dev/mpt/mpt_freebsd.h
View File

@ -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>

2
sys/dev/mpt/mpt_pci.c
View File

@ -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>

2
sys/dev/my/if_my.c
View File

@ -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>

1
sys/dev/ncv/ncr53c500.c
View File

@ -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>

Some files were not shown because too many files have changed in this diff Show More