From: Matthew Dillon Date: Wed, 25 Oct 2006 20:56:03 +0000 (+0000) Subject: Do a major clean-up of the BUSDMA architecture. A large number of X-Git-Tag: v2.0.1~4201 X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/1f7ab7c9fc18f47a2f16dc45b13dee254c603ce7 Do a major clean-up of the BUSDMA architecture. A large number of essentially machine-independant drivers use the structures and definitions in machine-dependant directories that are really machine-independant in nature. Split into machine-depdendant and machine-independant parts and make the primary access run through . Remove , and . The optimizations related to bus_memio.h and bus_pio.h made a huge mess, introduced machine-specific knowledge into essentially machine-independant drivers, and required specific #include file orderings to do their job. They may be reintroduced in some other form later on. Move to . The contents of the file is machine-independant or can be made a superset across many platforms. Make include and and include where necessary. Remove all #include's of and . That is, make the BUSDMA infrastructure integral to I/O-mapped and memory-mapped accesses to devices and remove a large chunk of machine-specific dependancies from drivers. bus_if.h and device_if.h are now required to be present when using . --- diff --git a/sys/bus/eisa/eisaconf.c b/sys/bus/eisa/eisaconf.c index 9fc7a90508..c51805e825 100644 --- a/sys/bus/eisa/eisaconf.c +++ b/sys/bus/eisa/eisaconf.c @@ -29,7 +29,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/eisa/eisaconf.c,v 1.55 2000/01/14 07:13:57 peter Exp $ - * $DragonFly: src/sys/bus/eisa/eisaconf.c,v 1.8 2006/09/05 03:48:08 dillon Exp $ + * $DragonFly: src/sys/bus/eisa/eisaconf.c,v 1.9 2006/10/25 20:55:51 dillon Exp $ */ #include "opt_eisa.h" @@ -43,8 +43,6 @@ #include #include -#include -#include #include #include "eisaconf.h" diff --git a/sys/bus/firewire/firewire.c b/sys/bus/firewire/firewire.c index 7e1b3a7769..b76c8d5ae7 100644 --- a/sys/bus/firewire/firewire.c +++ b/sys/bus/firewire/firewire.c @@ -32,7 +32,7 @@ * POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/firewire/firewire.c,v 1.68 2004/01/08 14:58:09 simokawa Exp $ - * $DragonFly: src/sys/bus/firewire/firewire.c,v 1.16 2006/09/05 03:48:09 dillon Exp $ + * $DragonFly: src/sys/bus/firewire/firewire.c,v 1.17 2006/10/25 20:55:51 dillon Exp $ * */ @@ -43,6 +43,7 @@ #include #include #include +#include /* used by smbus and newbus */ #include #include @@ -50,9 +51,6 @@ #include /* for DELAY() */ #endif -#include /* used by smbus and newbus */ -#include - #ifdef __DragonFly__ #include "firewire.h" #include "firewirereg.h" diff --git a/sys/bus/firewire/fwdev.c b/sys/bus/firewire/fwdev.c index 6f5243db75..2a80b59bf1 100644 --- a/sys/bus/firewire/fwdev.c +++ b/sys/bus/firewire/fwdev.c @@ -32,7 +32,7 @@ * POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/firewire/fwdev.c,v 1.36 2004/01/22 14:41:17 simokawa Exp $ - * $DragonFly: src/sys/bus/firewire/fwdev.c,v 1.16 2006/09/10 01:26:32 dillon Exp $ + * $DragonFly: src/sys/bus/firewire/fwdev.c,v 1.17 2006/10/25 20:55:51 dillon Exp $ * */ @@ -53,7 +53,6 @@ #include #include -#include #include #include diff --git a/sys/bus/firewire/fwdma.c b/sys/bus/firewire/fwdma.c index 69992c002b..a6e3085198 100644 --- a/sys/bus/firewire/fwdma.c +++ b/sys/bus/firewire/fwdma.c @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $DragonFly: src/sys/bus/firewire/fwdma.c,v 1.7 2006/09/05 03:48:09 dillon Exp $ + * $DragonFly: src/sys/bus/firewire/fwdma.c,v 1.8 2006/10/25 20:55:51 dillon Exp $ */ #ifndef __DragonFly__ @@ -42,6 +42,7 @@ __FBSDID("$FreeBSD: src/sys/dev/firewire/fwdma.c,v 1.5 2003/08/24 17:46:07 obrie #include #include #include +#include #include #include #include @@ -50,9 +51,6 @@ __FBSDID("$FreeBSD: src/sys/dev/firewire/fwdma.c,v 1.5 2003/08/24 17:46:07 obrie #include #endif -#include -#include - #ifdef __DragonFly__ #include #include diff --git a/sys/bus/firewire/fwmem.c b/sys/bus/firewire/fwmem.c index 1bad1aa5c8..67ae7a8d64 100644 --- a/sys/bus/firewire/fwmem.c +++ b/sys/bus/firewire/fwmem.c @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $DragonFly: src/sys/bus/firewire/fwmem.c,v 1.13 2006/09/10 01:26:32 dillon Exp $ + * $DragonFly: src/sys/bus/firewire/fwmem.c,v 1.14 2006/10/25 20:55:51 dillon Exp $ */ #ifndef __DragonFly__ @@ -46,6 +46,7 @@ __FBSDID("$FreeBSD: src/sys/dev/firewire/fwmem.c,v 1.26 2004/01/05 14:21:18 simo #include #include #include +#include #include #if defined(__DragonFly__) || __FreeBSD_version < 500000 #include @@ -53,9 +54,6 @@ __FBSDID("$FreeBSD: src/sys/dev/firewire/fwmem.c,v 1.26 2004/01/05 14:21:18 simo #include #endif -#include -#include - #include #include #include diff --git a/sys/bus/firewire/fwohci.c b/sys/bus/firewire/fwohci.c index 0f2054f614..9fee5dfa10 100644 --- a/sys/bus/firewire/fwohci.c +++ b/sys/bus/firewire/fwohci.c @@ -33,7 +33,7 @@ * * $FreeBSD: src/sys/dev/firewire/fwohci.c,v 1.72 2004/01/22 14:41:17 simokawa Exp $ * $FreeBSD: src/sys/dev/firewire/fwohci.c,v 1.1.2.19 2003/05/01 06:24:37 simokawa Exp $ - * $DragonFly: src/sys/bus/firewire/fwohci.c,v 1.13 2006/09/10 01:26:32 dillon Exp $ + * $DragonFly: src/sys/bus/firewire/fwohci.c,v 1.14 2006/10/25 20:55:51 dillon Exp $ */ #define ATRQ_CH 0 @@ -53,9 +53,8 @@ #include #include #include -#include -#include +#include #if defined(__DragonFly__) || __FreeBSD_version < 500000 #include /* for DELAY() */ diff --git a/sys/bus/firewire/fwohci_pci.c b/sys/bus/firewire/fwohci_pci.c index c387b31137..86cbec8c47 100644 --- a/sys/bus/firewire/fwohci_pci.c +++ b/sys/bus/firewire/fwohci_pci.c @@ -32,7 +32,7 @@ * POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/firewire/fwohci_pci.c,v 1.38 2004/01/23 17:37:09 simokawa Exp $ - * $DragonFly: src/sys/bus/firewire/fwohci_pci.c,v 1.21 2005/11/17 21:29:45 dillon Exp $ + * $DragonFly: src/sys/bus/firewire/fwohci_pci.c,v 1.22 2006/10/25 20:55:51 dillon Exp $ */ #define BOUNCE_BUFFER_TEST 0 @@ -44,14 +44,12 @@ #include #include #include -#include #include #include #if defined(__FreeBSD__) && __FreeBSD_version >= 501102 #include #include #endif -#include #include #if defined(__DragonFly__) || __FreeBSD_version < 500000 diff --git a/sys/bus/iicbus/i386/pcf.c b/sys/bus/iicbus/i386/pcf.c index 46f9c8fd81..3a0eea77fd 100644 --- a/sys/bus/iicbus/i386/pcf.c +++ b/sys/bus/iicbus/i386/pcf.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/isa/pcf.c,v 1.14 2000/01/14 00:18:05 nsouch Exp $ - * $DragonFly: src/sys/bus/iicbus/i386/pcf.c,v 1.7 2006/01/22 14:03:51 swildner Exp $ + * $DragonFly: src/sys/bus/iicbus/i386/pcf.c,v 1.8 2006/10/25 20:55:51 dillon Exp $ * */ #include @@ -35,8 +35,6 @@ #include #include -#include -#include #include #include diff --git a/sys/bus/isa/i386/isa.c b/sys/bus/isa/i386/isa.c index cd48d548e4..a4be1bde89 100644 --- a/sys/bus/isa/i386/isa.c +++ b/sys/bus/isa/i386/isa.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/isa/isa.c,v 1.132.2.5 2002/03/03 05:42:50 nyan Exp $ - * $DragonFly: src/sys/bus/isa/i386/isa.c,v 1.7 2005/06/12 20:55:14 swildner Exp $ + * $DragonFly: src/sys/bus/isa/i386/isa.c,v 1.8 2006/10/25 20:55:51 dillon Exp $ */ /* @@ -60,11 +60,8 @@ #include #include #include -#include #include -#include - #include "../isavar.h" #include "../isa_common.h" diff --git a/sys/bus/isa/i386/isa_compat.c b/sys/bus/isa/i386/isa_compat.c index cb358bcc8f..e50b44fabe 100644 --- a/sys/bus/isa/i386/isa_compat.c +++ b/sys/bus/isa/i386/isa_compat.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/isa/isa_compat.c,v 1.18.2.1 2001/05/17 23:05:06 imp Exp $ - * $DragonFly: src/sys/bus/isa/i386/isa_compat.c,v 1.10 2006/09/05 00:55:35 dillon Exp $ + * $DragonFly: src/sys/bus/isa/i386/isa_compat.c,v 1.11 2006/10/25 20:55:51 dillon Exp $ */ #include @@ -33,7 +33,6 @@ #include #include #include -#include #include #include @@ -42,7 +41,6 @@ #include #include -#include #include "../isavar.h" #include "isa_compat.h" #include "isa_device.h" diff --git a/sys/bus/isa/isa_common.c b/sys/bus/isa/isa_common.c index 786393d635..cb4103ea20 100644 --- a/sys/bus/isa/isa_common.c +++ b/sys/bus/isa/isa_common.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/isa/isa_common.c,v 1.16.2.1 2000/09/16 15:49:52 roger Exp $ - * $DragonFly: src/sys/bus/isa/isa_common.c,v 1.11 2006/09/05 00:55:35 dillon Exp $ + * $DragonFly: src/sys/bus/isa/isa_common.c,v 1.12 2006/10/25 20:55:51 dillon Exp $ */ /* * Modifications for Intel architecture by Garrett A. Wollman. @@ -66,11 +66,8 @@ #include #include #include -#include #include -#include - #include "isavar.h" #include "isa_common.h" diff --git a/sys/bus/isa/isahint.c b/sys/bus/isa/isahint.c index b51c291cd2..cdff93f35b 100644 --- a/sys/bus/isa/isahint.c +++ b/sys/bus/isa/isahint.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/isa/isahint.c,v 1.8.2.1 2001/03/21 11:18:25 nyan Exp $ - * $DragonFly: src/sys/bus/isa/isahint.c,v 1.5 2005/10/30 04:41:09 dillon Exp $ + * $DragonFly: src/sys/bus/isa/isahint.c,v 1.6 2006/10/25 20:55:51 dillon Exp $ */ #include @@ -32,8 +32,8 @@ #include #include #include + #include "isavar.h" -#include static void isahint_add_device(device_t parent, const char *name, int unit) diff --git a/sys/bus/isa/pnpeat.c b/sys/bus/isa/pnpeat.c index e906c57a91..08346e97fb 100644 --- a/sys/bus/isa/pnpeat.c +++ b/sys/bus/isa/pnpeat.c @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/i386/nexus.c,v 1.26.2.10 2003/02/22 13:16:45 imp Exp $ - * $DragonFly: src/sys/bus/isa/pnpeat.c,v 1.2 2006/10/23 21:50:31 dillon Exp $ + * $DragonFly: src/sys/bus/isa/pnpeat.c,v 1.3 2006/10/25 20:55:51 dillon Exp $ */ /* @@ -47,7 +47,6 @@ #include #include #include -#include #include #include @@ -56,7 +55,6 @@ #include #include -#include #include #include diff --git a/sys/bus/isa/vga_isa.c b/sys/bus/isa/vga_isa.c index 56babc9abc..9456e77408 100644 --- a/sys/bus/isa/vga_isa.c +++ b/sys/bus/isa/vga_isa.c @@ -24,7 +24,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/isa/vga_isa.c,v 1.17 2000/01/29 15:08:56 peter Exp $ - * $DragonFly: src/sys/bus/isa/vga_isa.c,v 1.12 2006/09/10 01:26:33 dillon Exp $ + * $DragonFly: src/sys/bus/isa/vga_isa.c,v 1.13 2006/10/25 20:55:51 dillon Exp $ */ #include "opt_vga.h" @@ -39,10 +39,6 @@ #include #include #include - -#include -#include - #include #include diff --git a/sys/bus/pccard/pccard.c b/sys/bus/pccard/pccard.c index cf3e90fe86..81510c4f06 100644 --- a/sys/bus/pccard/pccard.c +++ b/sys/bus/pccard/pccard.c @@ -1,6 +1,6 @@ /* $NetBSD: pcmcia.c,v 1.23 2000/07/28 19:17:02 drochner Exp $ */ /* $FreeBSD: src/sys/dev/pccard/pccard.c,v 1.70 2002/11/14 14:02:32 mux Exp $ */ -/* $DragonFly: src/sys/bus/pccard/pccard.c,v 1.16 2006/09/05 00:55:36 dillon Exp $ */ +/* $DragonFly: src/sys/bus/pccard/pccard.c,v 1.17 2006/10/25 20:55:51 dillon Exp $ */ /* * Copyright (c) 1997 Marc Horowitz. All rights reserved. @@ -41,9 +41,7 @@ #include #include -#include #include -#include #include diff --git a/sys/bus/pccard/pccard_cis.c b/sys/bus/pccard/pccard_cis.c index 0bb00e95f1..6b4444df78 100644 --- a/sys/bus/pccard/pccard_cis.c +++ b/sys/bus/pccard/pccard_cis.c @@ -1,6 +1,6 @@ /* $NetBSD: pcmcia_cis.c,v 1.17 2000/02/10 09:01:52 chopps Exp $ */ /* $FreeBSD: src/sys/dev/pccard/pccard_cis.c,v 1.23 2002/11/14 14:02:32 mux Exp $ */ -/* $DragonFly: src/sys/bus/pccard/pccard_cis.c,v 1.5 2006/09/05 03:48:09 dillon Exp $ */ +/* $DragonFly: src/sys/bus/pccard/pccard_cis.c,v 1.6 2006/10/25 20:55:51 dillon Exp $ */ /* * Copyright (c) 1997 Marc Horowitz. All rights reserved. @@ -40,9 +40,7 @@ #include #include -#include #include -#include #include #include diff --git a/sys/bus/pccard/pccard_cis_quirks.c b/sys/bus/pccard/pccard_cis_quirks.c index dafb872ae4..2dcb60000a 100644 --- a/sys/bus/pccard/pccard_cis_quirks.c +++ b/sys/bus/pccard/pccard_cis_quirks.c @@ -1,6 +1,6 @@ /* $NetBSD: pcmcia_cis_quirks.c,v 1.6 2000/04/12 21:07:55 scw Exp $ */ /* $FreeBSD: src/sys/dev/pccard/pccard_cis_quirks.c,v 1.7 2002/02/09 21:34:06 imp Exp $ */ -/* $DragonFly: src/sys/bus/pccard/pccard_cis_quirks.c,v 1.4 2006/09/05 00:55:36 dillon Exp $ */ +/* $DragonFly: src/sys/bus/pccard/pccard_cis_quirks.c,v 1.5 2006/10/25 20:55:51 dillon Exp $ */ #define PCCARDDEBUG @@ -42,9 +42,7 @@ #include #include -#include #include -#include #include #include diff --git a/sys/bus/pccard/pccardvar.h b/sys/bus/pccard/pccardvar.h index 11aa65ee9d..8abd4943d4 100644 --- a/sys/bus/pccard/pccardvar.h +++ b/sys/bus/pccard/pccardvar.h @@ -1,6 +1,6 @@ /* $NetBSD: pcmciavar.h,v 1.12 2000/02/08 12:51:31 enami Exp $ */ /* $FreeBSD: src/sys/dev/pccard/pccardvar.h,v 1.34 2002/11/14 05:15:50 imp Exp $ */ -/* $DragonFly: src/sys/bus/pccard/pccardvar.h,v 1.5 2004/02/13 22:12:33 joerg Exp $ */ +/* $DragonFly: src/sys/bus/pccard/pccardvar.h,v 1.6 2006/10/25 20:55:51 dillon Exp $ */ /* * Copyright (c) 1997 Marc Horowitz. All rights reserved. @@ -33,8 +33,7 @@ #include #include - -#include +#include extern int pccard_verbose; diff --git a/sys/bus/pccard/slot.h b/sys/bus/pccard/slot.h index 8ab87903bc..3d2ee4988a 100644 --- a/sys/bus/pccard/slot.h +++ b/sys/bus/pccard/slot.h @@ -33,7 +33,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/pccard/slot.h,v 1.25.2.5 2002/09/22 20:26:58 imp Exp $ - * $DragonFly: src/sys/bus/pccard/Attic/slot.h,v 1.6 2006/09/10 01:26:33 dillon Exp $ + * $DragonFly: src/sys/bus/pccard/Attic/slot.h,v 1.7 2006/10/25 20:55:51 dillon Exp $ */ #ifndef _PCCARD_SLOT_H @@ -45,9 +45,7 @@ */ #include #include -#include #include -#include #include /* diff --git a/sys/bus/pci/pci.c b/sys/bus/pci/pci.c index c62641b5d9..82042a09c8 100644 --- a/sys/bus/pci/pci.c +++ b/sys/bus/pci/pci.c @@ -24,7 +24,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/pci/pci.c,v 1.141.2.15 2002/04/30 17:48:18 tmm Exp $ - * $DragonFly: src/sys/bus/pci/pci.c,v 1.32 2006/09/05 00:55:36 dillon Exp $ + * $DragonFly: src/sys/bus/pci/pci.c,v 1.33 2006/10/25 20:55:51 dillon Exp $ * */ @@ -50,9 +50,7 @@ #include #include -#include #include -#include #include #ifdef __i386__ #include diff --git a/sys/bus/pci/pci_compat.c b/sys/bus/pci/pci_compat.c index ea1ebab7ca..e1941369f7 100644 --- a/sys/bus/pci/pci_compat.c +++ b/sys/bus/pci/pci_compat.c @@ -24,7 +24,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/pci/pci_compat.c,v 1.35.2.1 2001/10/14 21:14:14 luigi Exp $ - * $DragonFly: src/sys/bus/pci/pci_compat.c,v 1.11 2006/09/05 00:55:36 dillon Exp $ + * $DragonFly: src/sys/bus/pci/pci_compat.c,v 1.12 2006/10/25 20:55:51 dillon Exp $ * */ @@ -41,9 +41,7 @@ #include #include -#include #include -#include #include #include diff --git a/sys/bus/pci/pci_isab.c b/sys/bus/pci/pci_isab.c index a1ed7b4118..2280ddf331 100644 --- a/sys/bus/pci/pci_isab.c +++ b/sys/bus/pci/pci_isab.c @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $DragonFly: src/sys/bus/pci/pci_isab.c,v 1.6 2006/01/22 04:10:32 swildner Exp $ + * $DragonFly: src/sys/bus/pci/pci_isab.c,v 1.7 2006/10/25 20:55:51 dillon Exp $ */ #include "opt_pci.h" @@ -39,8 +39,6 @@ #include #include -#include - #include #include #include diff --git a/sys/bus/pci/pci_pcib.c b/sys/bus/pci/pci_pcib.c index a1dfab0770..b706a5450b 100644 --- a/sys/bus/pci/pci_pcib.c +++ b/sys/bus/pci/pci_pcib.c @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $DragonFly: src/sys/bus/pci/pci_pcib.c,v 1.5 2005/10/30 04:41:10 dillon Exp $ + * $DragonFly: src/sys/bus/pci/pci_pcib.c,v 1.6 2006/10/25 20:55:51 dillon Exp $ */ #include @@ -37,8 +37,6 @@ #include #include -#include - #include #include #include "pcib_if.h" diff --git a/sys/bus/pci/pcisupport.c b/sys/bus/pci/pcisupport.c index d71f7ead9d..635873d109 100644 --- a/sys/bus/pci/pcisupport.c +++ b/sys/bus/pci/pcisupport.c @@ -1,7 +1,7 @@ /************************************************************************** ** ** $FreeBSD: src/sys/pci/pcisupport.c,v 1.154.2.15 2003/04/29 15:55:06 simokawa Exp $ -** $DragonFly: src/sys/bus/pci/pcisupport.c,v 1.17 2006/09/05 00:55:36 dillon Exp $ +** $DragonFly: src/sys/bus/pci/pcisupport.c,v 1.18 2006/10/25 20:55:51 dillon Exp $ ** ** Device driver for DEC/INTEL PCI chipsets. ** @@ -52,8 +52,6 @@ #include #include -#include - #include "pcivar.h" #include "pcireg.h" diff --git a/sys/bus/usb/ehci.c b/sys/bus/usb/ehci.c index 5788dd4152..be35710cff 100644 --- a/sys/bus/usb/ehci.c +++ b/sys/bus/usb/ehci.c @@ -1,7 +1,7 @@ /* * $NetBSD: ehci.c,v 1.67 2004/07/06 04:18:05 mycroft Exp $ * $FreeBSD: src/sys/dev/usb/ehci.c,v 1.5 2003/11/10 00:20:52 joe Exp $ - * $DragonFly: src/sys/bus/usb/ehci.c,v 1.24 2006/09/05 00:55:36 dillon Exp $ + * $DragonFly: src/sys/bus/usb/ehci.c,v 1.25 2006/10/25 20:55:51 dillon Exp $ */ /* @@ -68,26 +68,16 @@ #include #include #include -#if defined(__NetBSD__) || defined(__OpenBSD__) -#include -#include -#elif defined(__FreeBSD__) || defined(__DragonFly__) #include #include #include -#include -#include #include -#if defined(DIAGNOSTIC) && defined(__i386__) -#include -#endif -#endif #include #include #include #include -#include +#include #include #include diff --git a/sys/bus/usb/ehci_pci.c b/sys/bus/usb/ehci_pci.c index ccf1b85fc0..a0450e0207 100644 --- a/sys/bus/usb/ehci_pci.c +++ b/sys/bus/usb/ehci_pci.c @@ -34,7 +34,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * $FreeBSD: src/sys/dev/usb/ehci_pci.c,v 1.9 2003/12/17 17:15:41 peter Exp $ - * $DragonFly: src/sys/bus/usb/ehci_pci.c,v 1.10 2006/05/02 16:12:01 dillon Exp $ + * $DragonFly: src/sys/bus/usb/ehci_pci.c,v 1.11 2006/10/25 20:55:52 dillon Exp $ */ /* @@ -60,9 +60,7 @@ #include #include #include -#include #include -#include #include #include diff --git a/sys/bus/usb/ohci.c b/sys/bus/usb/ohci.c index 2b25c26aa8..7f94dc22d1 100644 --- a/sys/bus/usb/ohci.c +++ b/sys/bus/usb/ohci.c @@ -1,7 +1,7 @@ /* * $NetBSD: ohci.c,v 1.138 2003/02/08 03:32:50 ichiro Exp $ * $FreeBSD: src/sys/dev/usb/ohci.c,v 1.141 2003/12/22 15:40:10 shiba Exp $ - * $DragonFly: src/sys/bus/usb/ohci.c,v 1.15 2006/09/05 00:55:36 dillon Exp $ + * $DragonFly: src/sys/bus/usb/ohci.c,v 1.16 2006/10/25 20:55:52 dillon Exp $ */ /* Also, already ported: * $NetBSD: ohci.c,v 1.140 2003/05/13 04:42:00 gson Exp $ @@ -66,8 +66,6 @@ #include #include #include -#include -#include #if defined(DIAGNOSTIC) && defined(__i386__) #include #endif @@ -78,7 +76,6 @@ #include -#include #include #include "usb.h" diff --git a/sys/bus/usb/ohci_pci.c b/sys/bus/usb/ohci_pci.c index 6e6f8fef62..20bcde94ff 100644 --- a/sys/bus/usb/ohci_pci.c +++ b/sys/bus/usb/ohci_pci.c @@ -35,7 +35,7 @@ * POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/usb/ohci_pci.c,v 1.38 2003/12/22 15:18:46 shiba Exp $ - * $DragonFly: src/sys/bus/usb/ohci_pci.c,v 1.4 2005/10/12 17:35:49 dillon Exp $ + * $DragonFly: src/sys/bus/usb/ohci_pci.c,v 1.5 2006/10/25 20:55:52 dillon Exp $ */ /* @@ -57,9 +57,7 @@ #include #include #include -#include #include -#include #include #include diff --git a/sys/bus/usb/uhci.c b/sys/bus/usb/uhci.c index 255d1e1b8d..2b00fcce56 100644 --- a/sys/bus/usb/uhci.c +++ b/sys/bus/usb/uhci.c @@ -2,7 +2,7 @@ * $NetBSD: uhci.c,v 1.80 2000/01/19 01:16:38 augustss Exp $ * $NetBSD: uhci.c,v 1.170 2003/02/19 01:35:04 augustss Exp $ * $FreeBSD: src/sys/dev/usb/uhci.c,v 1.149 2003/11/10 00:08:41 joe Exp $ - * $DragonFly: src/sys/bus/usb/uhci.c,v 1.16 2006/09/05 03:48:09 dillon Exp $ + * $DragonFly: src/sys/bus/usb/uhci.c,v 1.17 2006/10/25 20:55:52 dillon Exp $ */ /* Also already incorporated from NetBSD: @@ -71,7 +71,6 @@ #include #include #include -#include #if defined(DIAGNOSTIC) && defined(__i386__) #include #endif @@ -81,7 +80,6 @@ #include #include -#include #include #include "usb.h" diff --git a/sys/bus/usb/uhci_pci.c b/sys/bus/usb/uhci_pci.c index c03ddb630c..419c251064 100644 --- a/sys/bus/usb/uhci_pci.c +++ b/sys/bus/usb/uhci_pci.c @@ -35,7 +35,7 @@ * POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/usb/uhci_pci.c,v 1.51 2003/11/28 05:28:29 imp Exp $ - * $DragonFly: src/sys/bus/usb/uhci_pci.c,v 1.7 2005/10/12 17:35:49 dillon Exp $ + * $DragonFly: src/sys/bus/usb/uhci_pci.c,v 1.8 2006/10/25 20:55:52 dillon Exp $ */ /* Universal Host Controller Interface @@ -58,9 +58,6 @@ #include #if defined(__FreeBSD__) || defined(__DragonFly__) #include - -#include -#include #include #endif diff --git a/sys/bus/usb/uhub.c b/sys/bus/usb/uhub.c index d2560c46c8..80337498a2 100644 --- a/sys/bus/usb/uhub.c +++ b/sys/bus/usb/uhub.c @@ -1,7 +1,7 @@ /* * $NetBSD: uhub.c,v 1.64 2003/02/08 03:32:51 ichiro Exp $ * $FreeBSD: src/sys/dev/usb/uhub.c,v 1.54 2003/08/24 17:55:55 obrien Exp $ - * $DragonFly: src/sys/bus/usb/uhub.c,v 1.8 2006/09/05 03:48:09 dillon Exp $ + * $DragonFly: src/sys/bus/usb/uhub.c,v 1.9 2006/10/25 20:55:52 dillon Exp $ */ /* @@ -59,8 +59,6 @@ #endif #include -#include - #include "usb.h" #include "usbdi.h" #include "usbdi_util.h" diff --git a/sys/bus/usb/usb.c b/sys/bus/usb/usb.c index be036e23a8..ee6647fee1 100644 --- a/sys/bus/usb/usb.c +++ b/sys/bus/usb/usb.c @@ -1,7 +1,7 @@ /* * $NetBSD: usb.c,v 1.68 2002/02/20 20:30:12 christos Exp $ * $FreeBSD: src/sys/dev/usb/usb.c,v 1.95 2003/11/09 23:54:21 joe Exp $ - * $DragonFly: src/sys/bus/usb/usb.c,v 1.21 2006/09/10 01:26:33 dillon Exp $ + * $DragonFly: src/sys/bus/usb/usb.c,v 1.22 2006/10/25 20:55:52 dillon Exp $ */ /* Also already merged from NetBSD: @@ -100,8 +100,6 @@ MALLOC_DEFINE(M_USBHC, "USBHC", "USB host controller"); #include "usb_if.h" #endif /* defined(__FreeBSD__) */ -#include - #include "usbdivar.h" #include "usb_quirks.h" diff --git a/sys/bus/usb/usb_mem.c b/sys/bus/usb/usb_mem.c index 8c18b97646..69a8370b14 100644 --- a/sys/bus/usb/usb_mem.c +++ b/sys/bus/usb/usb_mem.c @@ -1,7 +1,7 @@ /* * $NetBSD: usb_mem.c,v 1.26 2003/02/01 06:23:40 thorpej Exp $ * $FreeBSD: src/sys/dev/usb/usb_mem.c,v 1.5 2003/10/04 22:13:21 joe Exp $ - * $DragonFly: src/sys/bus/usb/usb_mem.c,v 1.7 2006/09/05 00:55:36 dillon Exp $ + * $DragonFly: src/sys/bus/usb/usb_mem.c,v 1.8 2006/10/25 20:55:52 dillon Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -50,19 +50,13 @@ #include #include #include -#if defined(__NetBSD__) || defined(__OpenBSD__) -#include /* for usbdivar.h */ -#include -#elif defined(__FreeBSD__) || defined(__DragonFly__) #include #include #include -#endif #include #include #include -#include #include #ifdef DIAGNOSTIC diff --git a/sys/bus/usb/usb_subr.c b/sys/bus/usb/usb_subr.c index c9ee4ddab7..fb430521f3 100644 --- a/sys/bus/usb/usb_subr.c +++ b/sys/bus/usb/usb_subr.c @@ -1,7 +1,7 @@ /* * $NetBSD: usb_subr.c,v 1.99 2002/07/11 21:14:34 augustss Exp $ * $FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.58 2003/09/01 07:47:42 ticso Exp $ - * $DragonFly: src/sys/bus/usb/usb_subr.c,v 1.13 2006/09/05 03:48:09 dillon Exp $ + * $DragonFly: src/sys/bus/usb/usb_subr.c,v 1.14 2006/10/25 20:55:52 dillon Exp $ */ /* Also already have from NetBSD: @@ -50,17 +50,10 @@ #include #include #include -#if defined(__NetBSD__) || defined(__OpenBSD__) -#include -#include -#elif defined(__FreeBSD__) || defined(__DragonFly__) #include #include -#endif #include -#include - #include "usb.h" #include "usbdi.h" diff --git a/sys/bus/usb/usbdi.c b/sys/bus/usb/usbdi.c index cd1f80a683..ce48d6f831 100644 --- a/sys/bus/usb/usbdi.c +++ b/sys/bus/usb/usbdi.c @@ -1,7 +1,7 @@ /* * $NetBSD: usbdi.c,v 1.103 2002/09/27 15:37:38 provos Exp $ * $FreeBSD: src/sys/dev/usb/usbdi.c,v 1.84 2003/11/09 23:56:19 joe Exp $ - * $DragonFly: src/sys/bus/usb/usbdi.c,v 1.10 2006/09/05 00:55:36 dillon Exp $ + * $DragonFly: src/sys/bus/usb/usbdi.c,v 1.11 2006/10/25 20:55:52 dillon Exp $ */ /* @@ -43,22 +43,16 @@ #include #include -#if defined(__NetBSD__) || defined(__OpenBSD__) -#include -#elif defined(__FreeBSD__) || defined(__DragonFly__) #include #include #include "usb_if.h" #if defined(DIAGNOSTIC) && defined(__i386__) #include #endif -#endif #include #include #include -#include - #include "usb.h" #include "usbdi.h" #include "usbdi_util.h" diff --git a/sys/contrib/dev/ath/dragonfly/ah_osdep.h b/sys/contrib/dev/ath/dragonfly/ah_osdep.h index 3759d8432a..ee927da4bf 100644 --- a/sys/contrib/dev/ath/dragonfly/ah_osdep.h +++ b/sys/contrib/dev/ath/dragonfly/ah_osdep.h @@ -43,8 +43,7 @@ #include #include #include - -#include +#include typedef void* HAL_SOFTC; typedef bus_space_tag_t HAL_BUS_TAG; diff --git a/sys/contrib/dev/fla/fla.c b/sys/contrib/dev/fla/fla.c index 214386f1a2..3919f711bf 100644 --- a/sys/contrib/dev/fla/fla.c +++ b/sys/contrib/dev/fla/fla.c @@ -7,7 +7,7 @@ * ---------------------------------------------------------------------------- * * $FreeBSD: src/sys/contrib/dev/fla/fla.c,v 1.16 1999/12/08 04:45:16 ken Exp $ - * $DragonFly: src/sys/contrib/dev/fla/Attic/fla.c,v 1.15 2006/09/10 01:26:33 dillon Exp $ + * $DragonFly: src/sys/contrib/dev/fla/Attic/fla.c,v 1.16 2006/10/25 20:55:52 dillon Exp $ * */ @@ -25,7 +25,6 @@ #include #include #include -#include #include #include diff --git a/sys/contrib/dev/oltr/if_oltr.c b/sys/contrib/dev/oltr/if_oltr.c index 84ec8da5e9..f43b9d4658 100644 --- a/sys/contrib/dev/oltr/if_oltr.c +++ b/sys/contrib/dev/oltr/if_oltr.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/contrib/dev/oltr/if_oltr.c,v 1.11.2.5 2001/10/20 04:15:21 mdodd Exp $ - * $DragonFly: src/sys/contrib/dev/oltr/Attic/if_oltr.c,v 1.23 2006/09/05 00:55:36 dillon Exp $ + * $DragonFly: src/sys/contrib/dev/oltr/Attic/if_oltr.c,v 1.24 2006/10/25 20:55:52 dillon Exp $ */ #include @@ -42,6 +42,7 @@ #include #include #include +#include #include #include @@ -57,10 +58,6 @@ #include /* for vtophys */ #include /* for vtophys */ -#include -#include -#include -#include #include #include #include diff --git a/sys/cpu/i386/include/bus_at386.h b/sys/cpu/i386/include/bus_at386.h index dfdabe4c92..86cb36693f 100644 --- a/sys/cpu/i386/include/bus_at386.h +++ b/sys/cpu/i386/include/bus_at386.h @@ -68,22 +68,13 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ /* $FreeBSD: src/sys/i386/include/bus_at386.h,v 1.8.2.3 2002/03/03 05:42:50 nyan Exp $ */ -/* $DragonFly: src/sys/cpu/i386/include/bus_at386.h,v 1.8 2006/10/23 21:50:31 dillon Exp $ */ +/* $DragonFly: src/sys/cpu/i386/include/bus_at386.h,v 1.9 2006/10/25 20:55:51 dillon Exp $ */ #ifndef _MACHINE_BUS_AT386_H_ #define _MACHINE_BUS_AT386_H_ #include -/* - * To remain compatible with NetBSD's interface, default to both memio and - * pio when neither of them is defined. - */ -#if !defined(_MACHINE_BUS_PIO_H_) && !defined(_MACHINE_BUS_MEMIO_H_) -#define _MACHINE_BUS_PIO_H_ -#define _MACHINE_BUS_MEMIO_H_ -#endif - /* * Values for the i386 bus space tag, not to be used directly by MI code. */ @@ -173,9 +164,6 @@ bus_space_free(bus_space_tag_t t __unused, bus_space_handle_t bsh __unused, bus_ { } - -#if defined(_MACHINE_BUS_PIO_H_) || defined(_MACHINE_BUS_MEMIO_H_) - /* * Read a 1, 2, 4, or 8 byte quantity from bus space * described by tag/handle/offset. @@ -196,51 +184,29 @@ 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 (_MACHINE_BUS_PIO_H_) -#if defined (_MACHINE_BUS_MEMIO_H_) if (tag == I386_BUS_SPACE_IO) -#endif return (inb(handle + offset)); -#endif -#if defined (_MACHINE_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(_MACHINE_BUS_PIO_H_) -#if defined(_MACHINE_BUS_MEMIO_H_) if (tag == I386_BUS_SPACE_IO) -#endif return (inw(handle + offset)); -#endif -#if defined(_MACHINE_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(_MACHINE_BUS_PIO_H_) -#if defined(_MACHINE_BUS_MEMIO_H_) if (tag == I386_BUS_SPACE_IO) -#endif return (inl(handle + offset)); -#endif -#if defined(_MACHINE_BUS_MEMIO_H_) return (*(volatile u_int32_t *)(handle + offset)); -#endif } -#if 0 /* Cause a link error for bus_space_read_8 */ -#define bus_space_read_8(t, h, o) !!! bus_space_read_8 unimplemented !!! -#endif - /* * Read `count' 1, 2, 4, or 8 byte quantities from bus space * described by tag/handle/offset and copy into buffer provided. @@ -264,17 +230,9 @@ 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(_MACHINE_BUS_PIO_H_) -#if defined(_MACHINE_BUS_MEMIO_H_) - if (tag == I386_BUS_SPACE_IO) -#endif + if (tag == I386_BUS_SPACE_IO) { insb(bsh + offset, addr, count); -#endif -#if defined(_MACHINE_BUS_MEMIO_H_) -#if defined(_MACHINE_BUS_PIO_H_) - else -#endif - { + } else { __asm __volatile(" \n\ cld \n\ 1: movb (%2),%%al \n\ @@ -284,24 +242,15 @@ bus_space_read_multi_1(bus_space_tag_t tag, bus_space_handle_t bsh, "r" (bsh + offset), "0" (addr), "1" (count) : "%eax", "memory"); } -#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(_MACHINE_BUS_PIO_H_) -#if defined(_MACHINE_BUS_MEMIO_H_) - if (tag == I386_BUS_SPACE_IO) -#endif + if (tag == I386_BUS_SPACE_IO) { insw(bsh + offset, addr, count); -#endif -#if defined(_MACHINE_BUS_MEMIO_H_) -#if defined(_MACHINE_BUS_PIO_H_) - else -#endif - { + } else { __asm __volatile(" \n\ cld \n\ 1: movw (%2),%%ax \n\ @@ -311,24 +260,15 @@ bus_space_read_multi_2(bus_space_tag_t tag, bus_space_handle_t bsh, "r" (bsh + offset), "0" (addr), "1" (count) : "%eax", "memory"); } -#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(_MACHINE_BUS_PIO_H_) -#if defined(_MACHINE_BUS_MEMIO_H_) - if (tag == I386_BUS_SPACE_IO) -#endif + if (tag == I386_BUS_SPACE_IO) { insl(bsh + offset, addr, count); -#endif -#if defined(_MACHINE_BUS_MEMIO_H_) -#if defined(_MACHINE_BUS_PIO_H_) - else -#endif - { + } else { __asm __volatile(" \n\ cld \n\ 1: movl (%2),%%eax \n\ @@ -338,13 +278,8 @@ bus_space_read_multi_4(bus_space_tag_t tag, bus_space_handle_t bsh, "r" (bsh + offset), "0" (addr), "1" (count) : "%eax", "memory"); } -#endif } -#if 0 /* Cause a link error for bus_space_read_multi_8 */ -#define bus_space_read_multi_8 !!! bus_space_read_multi_8 unimplemented !!! -#endif - /* * Read `count' 1, 2, 4, or 8 byte quantities from bus space * described by tag/handle and starting at `offset' and copy into @@ -370,11 +305,7 @@ 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(_MACHINE_BUS_PIO_H_) -#if defined(_MACHINE_BUS_MEMIO_H_) - if (tag == I386_BUS_SPACE_IO) -#endif - { + if (tag == I386_BUS_SPACE_IO) { int _port_ = bsh + offset; \ __asm __volatile(" \n\ cld \n\ @@ -385,13 +316,7 @@ bus_space_read_region_1(bus_space_tag_t tag, bus_space_handle_t bsh, "=D" (addr), "=c" (count), "=d" (_port_) : "0" (addr), "1" (count), "2" (_port_) : "%eax", "memory", "cc"); - } -#endif -#if defined(_MACHINE_BUS_MEMIO_H_) -#if defined(_MACHINE_BUS_PIO_H_) - else -#endif - { + } else { int _port_ = bsh + offset; \ __asm __volatile(" \n\ cld \n\ @@ -401,18 +326,13 @@ bus_space_read_region_1(bus_space_tag_t tag, bus_space_handle_t bsh, "0" (addr), "1" (count), "2" (_port_) : "memory", "cc"); } -#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(_MACHINE_BUS_PIO_H_) -#if defined(_MACHINE_BUS_MEMIO_H_) - if (tag == I386_BUS_SPACE_IO) -#endif - { + if (tag == I386_BUS_SPACE_IO) { int _port_ = bsh + offset; \ __asm __volatile(" \n\ cld \n\ @@ -423,13 +343,7 @@ bus_space_read_region_2(bus_space_tag_t tag, bus_space_handle_t bsh, "=D" (addr), "=c" (count), "=d" (_port_) : "0" (addr), "1" (count), "2" (_port_) : "%eax", "memory", "cc"); - } -#endif -#if defined(_MACHINE_BUS_MEMIO_H_) -#if defined(_MACHINE_BUS_PIO_H_) - else -#endif - { + } else { int _port_ = bsh + offset; \ __asm __volatile(" \n\ cld \n\ @@ -439,18 +353,13 @@ bus_space_read_region_2(bus_space_tag_t tag, bus_space_handle_t bsh, "0" (addr), "1" (count), "2" (_port_) : "memory", "cc"); } -#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(_MACHINE_BUS_PIO_H_) -#if defined(_MACHINE_BUS_MEMIO_H_) - if (tag == I386_BUS_SPACE_IO) -#endif - { + if (tag == I386_BUS_SPACE_IO) { int _port_ = bsh + offset; \ __asm __volatile(" \n\ cld \n\ @@ -461,13 +370,7 @@ bus_space_read_region_4(bus_space_tag_t tag, bus_space_handle_t bsh, "=D" (addr), "=c" (count), "=d" (_port_) : "0" (addr), "1" (count), "2" (_port_) : "%eax", "memory", "cc"); - } -#endif -#if defined(_MACHINE_BUS_MEMIO_H_) -#if defined(_MACHINE_BUS_PIO_H_) - else -#endif - { + } else { int _port_ = bsh + offset; \ __asm __volatile(" \n\ cld \n\ @@ -477,13 +380,8 @@ bus_space_read_region_4(bus_space_tag_t tag, bus_space_handle_t bsh, "0" (addr), "1" (count), "2" (_port_) : "memory", "cc"); } -#endif } -#if 0 /* Cause a link error for bus_space_read_region_8 */ -#define bus_space_read_region_8 !!! bus_space_read_region_8 unimplemented !!! -#endif - /* * Write the 1, 2, 4, or 8 byte value `value' to bus space * described by tag/handle/offset. @@ -505,60 +403,32 @@ 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(_MACHINE_BUS_PIO_H_) -#if defined(_MACHINE_BUS_MEMIO_H_) if (tag == I386_BUS_SPACE_IO) -#endif outb(bsh + offset, value); -#endif -#if defined(_MACHINE_BUS_MEMIO_H_) -#if defined(_MACHINE_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(_MACHINE_BUS_PIO_H_) -#if defined(_MACHINE_BUS_MEMIO_H_) if (tag == I386_BUS_SPACE_IO) -#endif outw(bsh + offset, value); -#endif -#if defined(_MACHINE_BUS_MEMIO_H_) -#if defined(_MACHINE_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(_MACHINE_BUS_PIO_H_) -#if defined(_MACHINE_BUS_MEMIO_H_) if (tag == I386_BUS_SPACE_IO) -#endif outl(bsh + offset, value); -#endif -#if defined(_MACHINE_BUS_MEMIO_H_) -#if defined(_MACHINE_BUS_PIO_H_) else -#endif *(volatile u_int32_t *)(bsh + offset) = value; -#endif } -#if 0 /* Cause a link error for bus_space_write_8 */ -#define bus_space_write_8 !!! bus_space_write_8 not implemented !!! -#endif - /* * Write `count' 1, 2, 4, or 8 byte quantities from the buffer * provided to bus space described by tag/handle/offset. @@ -585,17 +455,9 @@ 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(_MACHINE_BUS_PIO_H_) -#if defined(_MACHINE_BUS_MEMIO_H_) - if (tag == I386_BUS_SPACE_IO) -#endif + if (tag == I386_BUS_SPACE_IO) { outsb(bsh + offset, addr, count); -#endif -#if defined(_MACHINE_BUS_MEMIO_H_) -#if defined(_MACHINE_BUS_PIO_H_) - else -#endif - { + } else { __asm __volatile(" \n\ cld \n\ 1: lodsb \n\ @@ -605,24 +467,15 @@ bus_space_write_multi_1(bus_space_tag_t tag, bus_space_handle_t bsh, "r" (bsh + offset), "0" (addr), "1" (count) : "%eax", "memory", "cc"); } -#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(_MACHINE_BUS_PIO_H_) -#if defined(_MACHINE_BUS_MEMIO_H_) - if (tag == I386_BUS_SPACE_IO) -#endif + if (tag == I386_BUS_SPACE_IO) { outsw(bsh + offset, addr, count); -#endif -#if defined(_MACHINE_BUS_MEMIO_H_) -#if defined(_MACHINE_BUS_PIO_H_) - else -#endif - { + } else { __asm __volatile(" \n\ cld \n\ 1: lodsw \n\ @@ -632,24 +485,15 @@ bus_space_write_multi_2(bus_space_tag_t tag, bus_space_handle_t bsh, "r" (bsh + offset), "0" (addr), "1" (count) : "%eax", "memory", "cc"); } -#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(_MACHINE_BUS_PIO_H_) -#if defined(_MACHINE_BUS_MEMIO_H_) - if (tag == I386_BUS_SPACE_IO) -#endif + if (tag == I386_BUS_SPACE_IO) { outsl(bsh + offset, addr, count); -#endif -#if defined(_MACHINE_BUS_MEMIO_H_) -#if defined(_MACHINE_BUS_PIO_H_) - else -#endif - { + } else { __asm __volatile(" \n\ cld \n\ 1: lodsl \n\ @@ -659,14 +503,8 @@ bus_space_write_multi_4(bus_space_tag_t tag, bus_space_handle_t bsh, "r" (bsh + offset), "0" (addr), "1" (count) : "%eax", "memory", "cc"); } -#endif } -#if 0 /* Cause a link error for bus_space_write_multi_8 */ -#define bus_space_write_multi_8(t, h, o, a, c) \ - !!! bus_space_write_multi_8 unimplemented !!! -#endif - /* * Write `count' 1, 2, 4, or 8 byte quantities from the buffer provided * to bus space described by tag/handle starting at `offset'. @@ -692,11 +530,7 @@ 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(_MACHINE_BUS_PIO_H_) -#if defined(_MACHINE_BUS_MEMIO_H_) - if (tag == I386_BUS_SPACE_IO) -#endif - { + if (tag == I386_BUS_SPACE_IO) { int _port_ = bsh + offset; \ __asm __volatile(" \n\ cld \n\ @@ -707,13 +541,7 @@ bus_space_write_region_1(bus_space_tag_t tag, bus_space_handle_t bsh, "=d" (_port_), "=S" (addr), "=c" (count) : "0" (_port_), "1" (addr), "2" (count) : "%eax", "memory", "cc"); - } -#endif -#if defined(_MACHINE_BUS_MEMIO_H_) -#if defined(_MACHINE_BUS_PIO_H_) - else -#endif - { + } else { int _port_ = bsh + offset; \ __asm __volatile(" \n\ cld \n\ @@ -723,18 +551,13 @@ bus_space_write_region_1(bus_space_tag_t tag, bus_space_handle_t bsh, "0" (_port_), "1" (addr), "2" (count) : "memory", "cc"); } -#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(_MACHINE_BUS_PIO_H_) -#if defined(_MACHINE_BUS_MEMIO_H_) - if (tag == I386_BUS_SPACE_IO) -#endif - { + if (tag == I386_BUS_SPACE_IO) { int _port_ = bsh + offset; \ __asm __volatile(" \n\ cld \n\ @@ -745,13 +568,7 @@ bus_space_write_region_2(bus_space_tag_t tag, bus_space_handle_t bsh, "=d" (_port_), "=S" (addr), "=c" (count) : "0" (_port_), "1" (addr), "2" (count) : "%eax", "memory", "cc"); - } -#endif -#if defined(_MACHINE_BUS_MEMIO_H_) -#if defined(_MACHINE_BUS_PIO_H_) - else -#endif - { + } else { int _port_ = bsh + offset; \ __asm __volatile(" \n\ cld \n\ @@ -761,18 +578,13 @@ bus_space_write_region_2(bus_space_tag_t tag, bus_space_handle_t bsh, "0" (_port_), "1" (addr), "2" (count) : "memory", "cc"); } -#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(_MACHINE_BUS_PIO_H_) -#if defined(_MACHINE_BUS_MEMIO_H_) - if (tag == I386_BUS_SPACE_IO) -#endif - { + if (tag == I386_BUS_SPACE_IO) { int _port_ = bsh + offset; \ __asm __volatile(" \n\ cld \n\ @@ -783,13 +595,7 @@ bus_space_write_region_4(bus_space_tag_t tag, bus_space_handle_t bsh, "=d" (_port_), "=S" (addr), "=c" (count) : "0" (_port_), "1" (addr), "2" (count) : "%eax", "memory", "cc"); - } -#endif -#if defined(_MACHINE_BUS_MEMIO_H_) -#if defined(_MACHINE_BUS_PIO_H_) - else -#endif - { + } else { int _port_ = bsh + offset; \ __asm __volatile(" \n\ cld \n\ @@ -799,14 +605,8 @@ bus_space_write_region_4(bus_space_tag_t tag, bus_space_handle_t bsh, "0" (_port_), "1" (addr), "2" (count) : "memory", "cc"); } -#endif } -#if 0 /* Cause a link error for bus_space_write_region_8 */ -#define bus_space_write_region_8 \ - !!! bus_space_write_region_8 unimplemented !!! -#endif - /* * Write the 1, 2, 4, or 8 byte value `val' to bus space described * by tag/handle/offset `count' times. @@ -831,20 +631,13 @@ bus_space_set_multi_1(bus_space_tag_t tag, bus_space_handle_t bsh, { bus_space_handle_t addr = bsh + offset; -#if defined(_MACHINE_BUS_PIO_H_) -#if defined(_MACHINE_BUS_MEMIO_H_) - if (tag == I386_BUS_SPACE_IO) -#endif + if (tag == I386_BUS_SPACE_IO) { while (count--) outb(addr, value); -#endif -#if defined(_MACHINE_BUS_MEMIO_H_) -#if defined(_MACHINE_BUS_PIO_H_) - else -#endif + } else { while (count--) *(volatile u_int8_t *)(addr) = value; -#endif + } } static __inline void @@ -853,20 +646,13 @@ bus_space_set_multi_2(bus_space_tag_t tag, bus_space_handle_t bsh, { bus_space_handle_t addr = bsh + offset; -#if defined(_MACHINE_BUS_PIO_H_) -#if defined(_MACHINE_BUS_MEMIO_H_) - if (tag == I386_BUS_SPACE_IO) -#endif + if (tag == I386_BUS_SPACE_IO) { while (count--) outw(addr, value); -#endif -#if defined(_MACHINE_BUS_MEMIO_H_) -#if defined(_MACHINE_BUS_PIO_H_) - else -#endif + } else { while (count--) *(volatile u_int16_t *)(addr) = value; -#endif + } } static __inline void @@ -875,26 +661,15 @@ bus_space_set_multi_4(bus_space_tag_t tag, bus_space_handle_t bsh, { bus_space_handle_t addr = bsh + offset; -#if defined(_MACHINE_BUS_PIO_H_) -#if defined(_MACHINE_BUS_MEMIO_H_) - if (tag == I386_BUS_SPACE_IO) -#endif + if (tag == I386_BUS_SPACE_IO) { while (count--) outl(addr, value); -#endif -#if defined(_MACHINE_BUS_MEMIO_H_) -#if defined(_MACHINE_BUS_PIO_H_) - else -#endif + } else { while (count--) *(volatile u_int32_t *)(addr) = value; -#endif + } } -#if 0 /* Cause a link error for bus_space_set_multi_8 */ -#define bus_space_set_multi_8 !!! bus_space_set_multi_8 unimplemented !!! -#endif - /* * Write `count' 1, 2, 4, or 8 byte value `val' to bus space described * by tag/handle starting at `offset'. @@ -919,20 +694,13 @@ bus_space_set_region_1(bus_space_tag_t tag, bus_space_handle_t bsh, { bus_space_handle_t addr = bsh + offset; -#if defined(_MACHINE_BUS_PIO_H_) -#if defined(_MACHINE_BUS_MEMIO_H_) - if (tag == I386_BUS_SPACE_IO) -#endif + if (tag == I386_BUS_SPACE_IO) { for (; count != 0; count--, addr++) outb(addr, value); -#endif -#if defined(_MACHINE_BUS_MEMIO_H_) -#if defined(_MACHINE_BUS_PIO_H_) - else -#endif + } else { for (; count != 0; count--, addr++) *(volatile u_int8_t *)(addr) = value; -#endif + } } static __inline void @@ -941,20 +709,13 @@ bus_space_set_region_2(bus_space_tag_t tag, bus_space_handle_t bsh, { bus_space_handle_t addr = bsh + offset; -#if defined(_MACHINE_BUS_PIO_H_) -#if defined(_MACHINE_BUS_MEMIO_H_) - if (tag == I386_BUS_SPACE_IO) -#endif + if (tag == I386_BUS_SPACE_IO) { for (; count != 0; count--, addr += 2) outw(addr, value); -#endif -#if defined(_MACHINE_BUS_MEMIO_H_) -#if defined(_MACHINE_BUS_PIO_H_) - else -#endif + } else { for (; count != 0; count--, addr += 2) *(volatile u_int16_t *)(addr) = value; -#endif + } } static __inline void @@ -963,26 +724,15 @@ bus_space_set_region_4(bus_space_tag_t tag, bus_space_handle_t bsh, { bus_space_handle_t addr = bsh + offset; -#if defined(_MACHINE_BUS_PIO_H_) -#if defined(_MACHINE_BUS_MEMIO_H_) - if (tag == I386_BUS_SPACE_IO) -#endif + if (tag == I386_BUS_SPACE_IO) { for (; count != 0; count--, addr += 4) outl(addr, value); -#endif -#if defined(_MACHINE_BUS_MEMIO_H_) -#if defined(_MACHINE_BUS_PIO_H_) - else -#endif + } else { 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 */ -#define bus_space_set_region_8 !!! bus_space_set_region_8 unimplemented !!! -#endif - /* * Copy `count' 1, 2, 4, or 8 byte values from bus space starting * at tag/bsh1/off1 to bus space starting at tag/bsh2/off2. @@ -1014,11 +764,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(_MACHINE_BUS_PIO_H_) -#if defined(_MACHINE_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++) @@ -1029,13 +775,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(_MACHINE_BUS_MEMIO_H_) -#if defined(_MACHINE_BUS_PIO_H_) - else -#endif - { + } else { if (addr1 >= addr2) { /* src after dest: copy forward */ for (; count != 0; count--, addr1++, addr2++) @@ -1049,7 +789,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 @@ -1060,11 +799,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(_MACHINE_BUS_PIO_H_) -#if defined(_MACHINE_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) @@ -1075,13 +810,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(_MACHINE_BUS_MEMIO_H_) -#if defined(_MACHINE_BUS_PIO_H_) - else -#endif - { + } else { if (addr1 >= addr2) { /* src after dest: copy forward */ for (; count != 0; count--, addr1 += 2, addr2 += 2) @@ -1095,7 +824,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 @@ -1106,11 +834,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(_MACHINE_BUS_PIO_H_) -#if defined(_MACHINE_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) @@ -1121,13 +845,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(_MACHINE_BUS_MEMIO_H_) -#if defined(_MACHINE_BUS_PIO_H_) - else -#endif - { + } else { if (addr1 >= addr2) { /* src after dest: copy forward */ for (; count != 0; count--, addr1 += 4, addr2 += 4) @@ -1141,15 +859,8 @@ bus_space_copy_region_4(bus_space_tag_t tag, bus_space_handle_t bsh1, *(volatile u_int32_t *)(addr1); } } -#endif } -#endif /* defined(_MACHINE_BUS_PIO_H_) || defined(_MACHINE_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 - /* * Bus read/write barrier methods. * diff --git a/sys/cpu/i386/include/bus_dma.h b/sys/cpu/i386/include/bus_dma.h index b49425d498..972441a441 100644 --- a/sys/cpu/i386/include/bus_dma.h +++ b/sys/cpu/i386/include/bus_dma.h @@ -1,61 +1,22 @@ -/* $NetBSD: bus.h,v 1.12 1997/10/01 08:25:15 fvdl Exp $ */ - /*- - * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc. - * All rights reserved. - * - * This code is derived from software contributed to The NetBSD Foundation - * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility, - * NASA Ames Research Center. - * - * 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. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the NetBSD - * Foundation, Inc. and its contributors. - * 4. Neither the name of The NetBSD Foundation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. + * Copyright (c) KATO Takenori, 1999. * - * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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. - */ - -/* - * Copyright (c) 1996 Charles M. Hannum. All rights reserved. - * Copyright (c) 1996 Christopher G. Demetriou. All rights reserved. + * All rights reserved. Unpublished rights reserved under the copyright + * laws of Japan. * * 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. + * notice, this list of conditions and the following disclaimer as + * the first lines of this file unmodified. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Christopher G. Demetriou - * for the NetBSD Project. - * 4. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission - * + * 3. 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 ``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. @@ -66,9 +27,10 @@ * 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: src/sys/i386/include/bus.h,v 1.7.2.2 2002/03/03 05:42:50 nyan Exp $ + * $DragonFly: src/sys/cpu/i386/include/bus_dma.h,v 1.7 2006/10/25 20:55:51 dillon Exp $ */ -/* $FreeBSD: src/sys/i386/include/bus_dma.h,v 1.15.2.2 2002/11/21 23:36:01 sam Exp $ */ -/* $DragonFly: src/sys/cpu/i386/include/bus_dma.h,v 1.6 2006/10/23 21:50:31 dillon Exp $ */ #ifndef _MACHINE_BUS_DMA_H_ #define _MACHINE_BUS_DMA_H_ @@ -78,173 +40,67 @@ #endif /* - * Flags used in various bus DMA methods. - */ -#define BUS_DMA_WAITOK 0x00 /* safe to sleep (pseudo-flag) */ -#define BUS_DMA_NOWAIT 0x01 /* not safe to sleep */ -#define BUS_DMA_ALLOCNOW 0x02 /* perform resource allocation now */ -#define BUS_DMA_COHERENT 0x04 /* map memory to not require sync */ -#define BUS_DMA_ZERO 0x08 /* allocate zero'ed memory */ -#define BUS_DMA_BUS1 0x10 /* placeholders for bus functions... */ -#define BUS_DMA_BUS2 0x20 -#define BUS_DMA_BUS3 0x40 -#define BUS_DMA_BUS4 0x80 - -/* Forwards needed by prototypes below. */ -struct mbuf; -struct uio; - -/* - * bus_dmasync_op_t - * - * Operations performed by bus_dmamap_sync(). - */ -typedef enum { - BUS_DMASYNC_PREREAD, - BUS_DMASYNC_POSTREAD, - BUS_DMASYNC_PREWRITE, - BUS_DMASYNC_POSTWRITE -} bus_dmasync_op_t; - -/* - * bus_dma_tag_t - * - * A machine-dependent opaque type describing the characteristics - * of how to perform DMA mappings. This structure encapsultes - * information concerning address and alignment restrictions, number - * of S/G segments, amount of data per S/G segment, etc. - */ -typedef struct bus_dma_tag *bus_dma_tag_t; - -/* - * bus_dmamap_t - * - * DMA mapping instance information. - */ -typedef struct bus_dmamap *bus_dmamap_t; - -/* - * bus_dma_segment_t - * - * Describes a single contiguous DMA transaction. Values - * are suitable for programming into DMA registers. - */ -typedef struct bus_dma_segment { - bus_addr_t ds_addr; /* DMA address */ - bus_size_t ds_len; /* length of transfer */ -} bus_dma_segment_t; - -/* - * A function that returns 1 if the address cannot be accessed by - * a device and 0 if it can be. - */ -typedef int bus_dma_filter_t(void *, bus_addr_t); - -/* - * Allocate a device specific dma_tag encapsulating the constraints of - * the parent tag in addition to other restrictions specified: - * - * alignment: alignment for segments. - * boundary: Boundary that segments cannot cross. - * lowaddr: Low restricted address that cannot appear in a mapping. - * highaddr: High restricted address that cannot appear in a mapping. - * filtfunc: An optional function to further test if an address - * within the range of lowaddr and highaddr cannot appear - * in a mapping. - * filtfuncarg: An argument that will be passed to filtfunc in addition - * to the address to test. - * maxsize: Maximum mapping size supported by this tag. - * nsegments: Number of discontinuities allowed in maps. - * maxsegsz: Maximum size of a segment in the map. - * flags: Bus DMA flags. - * dmat: A pointer to set to a valid dma tag should the return - * value of this function indicate success. - */ -/* XXX Should probably allow specification of alignment */ -int bus_dma_tag_create(bus_dma_tag_t parent, bus_size_t alignment, - bus_size_t boundary, bus_addr_t lowaddr, - bus_addr_t highaddr, bus_dma_filter_t *filtfunc, - void *filtfuncarg, bus_size_t maxsize, int nsegments, - bus_size_t maxsegsz, int flags, bus_dma_tag_t *dmat); - -int bus_dma_tag_destroy(bus_dma_tag_t dmat); - -/* - * Allocate a handle for mapping from kva/uva/physical - * address space into bus device space. - */ -int bus_dmamap_create(bus_dma_tag_t dmat, int flags, bus_dmamap_t *mapp); - -/* - * Destroy a handle for mapping from kva/uva/physical - * address space into bus device space. - */ -int bus_dmamap_destroy(bus_dma_tag_t dmat, bus_dmamap_t map); - -/* - * Allocate a piece of memory that can be efficiently mapped into - * bus device space based on the constraints lited in the dma tag. - * A dmamap to for use with dmamap_load is also allocated. - */ -int bus_dmamem_alloc(bus_dma_tag_t dmat, void** vaddr, int flags, - bus_dmamap_t *mapp); - -/* - * Free a piece of memory and it's allociated dmamap, that was allocated - * via bus_dmamem_alloc. - */ -void bus_dmamem_free(bus_dma_tag_t dmat, void *vaddr, bus_dmamap_t map); - -/* - * A function that processes a successfully loaded dma map or an error - * from a delayed load map. - */ -typedef void bus_dmamap_callback_t(void *, bus_dma_segment_t *, int, int); - -/* - * Map the buffer buf into bus space using the dmamap map. - */ -int bus_dmamap_load(bus_dma_tag_t dmat, bus_dmamap_t map, void *buf, - bus_size_t buflen, bus_dmamap_callback_t *callback, - void *callback_arg, int flags); - -/* - * Like bus_dmamap_callback but includes map size in bytes. This is - * defined as a separate interface to maintain compatiiblity for users - * of bus_dmamap_callback_t--at some point these interfaces should be merged. - */ -typedef void bus_dmamap_callback2_t(void *, bus_dma_segment_t *, int, bus_size_t, int); -/* - * Like bus_dmamap_load but for mbufs. Note the use of the - * bus_dmamap_callback2_t interface. - */ -int bus_dmamap_load_mbuf(bus_dma_tag_t dmat, bus_dmamap_t map, - struct mbuf *mbuf, - bus_dmamap_callback2_t *callback, void *callback_arg, - int flags); -/* - * Like bus_dmamap_load but for uios. Note the use of the - * bus_dmamap_callback2_t interface. - */ -int bus_dmamap_load_uio(bus_dma_tag_t dmat, bus_dmamap_t map, - struct uio *ui, - bus_dmamap_callback2_t *callback, void *callback_arg, - int flags); - -/* - * Perform a syncronization operation on the given map. - */ -void _bus_dmamap_sync(bus_dma_tag_t, bus_dmamap_t, bus_dmasync_op_t); -#define bus_dmamap_sync(dmat, dmamap, op) \ - if ((dmamap) != NULL) \ - _bus_dmamap_sync(dmat, dmamap, op) - -/* - * Release the mapping held by map. - */ -void _bus_dmamap_unload(bus_dma_tag_t dmat, bus_dmamap_t map); -#define bus_dmamap_unload(dmat, dmamap) \ - if ((dmamap) != NULL) \ - _bus_dmamap_unload(dmat, dmamap) + * Stream accesses are the same as normal accesses on i386; there are no + * supported bus systems with an endianess different from the host one. + */ +#define bus_space_read_stream_1(t, h, o) bus_space_read_1((t), (h), (o)) +#define bus_space_read_stream_2(t, h, o) bus_space_read_2((t), (h), (o)) +#define bus_space_read_stream_4(t, h, o) bus_space_read_4((t), (h), (o)) + +#define bus_space_read_multi_stream_1(t, h, o, a, c) \ + bus_space_read_multi_1((t), (h), (o), (a), (c)) +#define bus_space_read_multi_stream_2(t, h, o, a, c) \ + bus_space_read_multi_2((t), (h), (o), (a), (c)) +#define bus_space_read_multi_stream_4(t, h, o, a, c) \ + bus_space_read_multi_4((t), (h), (o), (a), (c)) + +#define bus_space_write_stream_1(t, h, o, v) \ + bus_space_write_1((t), (h), (o), (v)) +#define bus_space_write_stream_2(t, h, o, v) \ + bus_space_write_2((t), (h), (o), (v)) +#define bus_space_write_stream_4(t, h, o, v) \ + bus_space_write_4((t), (h), (o), (v)) + +#define bus_space_write_multi_stream_1(t, h, o, a, c) \ + bus_space_write_multi_1((t), (h), (o), (a), (c)) +#define bus_space_write_multi_stream_2(t, h, o, a, c) \ + bus_space_write_multi_2((t), (h), (o), (a), (c)) +#define bus_space_write_multi_stream_4(t, h, o, a, c) \ + bus_space_write_multi_4((t), (h), (o), (a), (c)) + +#define bus_space_set_multi_stream_1(t, h, o, v, c) \ + bus_space_set_multi_1((t), (h), (o), (v), (c)) +#define bus_space_set_multi_stream_2(t, h, o, v, c) \ + bus_space_set_multi_2((t), (h), (o), (v), (c)) +#define bus_space_set_multi_stream_4(t, h, o, v, c) \ + bus_space_set_multi_4((t), (h), (o), (v), (c)) + +#define bus_space_read_region_stream_1(t, h, o, a, c) \ + bus_space_read_region_1((t), (h), (o), (a), (c)) +#define bus_space_read_region_stream_2(t, h, o, a, c) \ + bus_space_read_region_2((t), (h), (o), (a), (c)) +#define bus_space_read_region_stream_4(t, h, o, a, c) \ + bus_space_read_region_4((t), (h), (o), (a), (c)) + +#define bus_space_write_region_stream_1(t, h, o, a, c) \ + bus_space_write_region_1((t), (h), (o), (a), (c)) +#define bus_space_write_region_stream_2(t, h, o, a, c) \ + bus_space_write_region_2((t), (h), (o), (a), (c)) +#define bus_space_write_region_stream_4(t, h, o, a, c) \ + bus_space_write_region_4((t), (h), (o), (a), (c)) + +#define bus_space_set_region_stream_1(t, h, o, v, c) \ + bus_space_set_region_1((t), (h), (o), (v), (c)) +#define bus_space_set_region_stream_2(t, h, o, v, c) \ + bus_space_set_region_2((t), (h), (o), (v), (c)) +#define bus_space_set_region_stream_4(t, h, o, v, c) \ + bus_space_set_region_4((t), (h), (o), (v), (c)) + +#define bus_space_copy_region_stream_1(t, h1, o1, h2, o2, c) \ + bus_space_copy_region_1((t), (h1), (o1), (h2), (o2), (c)) +#define bus_space_copy_region_stream_2(t, h1, o1, h2, o2, c) \ + bus_space_copy_region_2((t), (h1), (o1), (h2), (o2), (c)) +#define bus_space_copy_region_stream_4(t, h1, o1, h2, o2, c) \ + bus_space_copy_region_4((t), (h1), (o1), (h2), (o2), (c)) #endif /* _MACHINE_BUS_DMA_H_ */ diff --git a/sys/cpu/i386/misc/in_cksum2.s b/sys/cpu/i386/misc/in_cksum2.s index c609963eb0..f850935059 100644 --- a/sys/cpu/i386/misc/in_cksum2.s +++ b/sys/cpu/i386/misc/in_cksum2.s @@ -31,12 +31,10 @@ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $DragonFly: src/sys/cpu/i386/misc/in_cksum2.s,v 1.4 2005/11/02 08:33:25 dillon Exp $ + * $DragonFly: src/sys/cpu/i386/misc/in_cksum2.s,v 1.5 2006/10/25 20:55:51 dillon Exp $ */ #include /* miscellaneous asm macros */ -#include -#include #include "assym.s" diff --git a/sys/dev/acpica5/Osd/OsdDebug.c b/sys/dev/acpica5/Osd/OsdDebug.c index 6219b1c260..076cd7bdfc 100644 --- a/sys/dev/acpica5/Osd/OsdDebug.c +++ b/sys/dev/acpica5/Osd/OsdDebug.c @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/acpica/Osd/OsdDebug.c,v 1.9 2004/09/02 04:28:05 njl Exp $ - * $DragonFly: src/sys/dev/acpica5/Osd/OsdDebug.c,v 1.3 2006/07/05 15:43:50 y0netan1 Exp $ + * $DragonFly: src/sys/dev/acpica5/Osd/OsdDebug.c,v 1.4 2006/10/25 20:55:52 dillon Exp $ */ /* @@ -36,7 +36,6 @@ #include #include #include -#include #include #include diff --git a/sys/dev/acpica5/Osd/OsdHardware.c b/sys/dev/acpica5/Osd/OsdHardware.c index 5e7d4fc80c..d455a48b71 100644 --- a/sys/dev/acpica5/Osd/OsdHardware.c +++ b/sys/dev/acpica5/Osd/OsdHardware.c @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/acpica/Osd/OsdHardware.c,v 1.13 2004/04/14 03:39:08 njl Exp $ - * $DragonFly: src/sys/dev/acpica5/Osd/OsdHardware.c,v 1.2 2004/06/27 08:52:42 dillon Exp $ + * $DragonFly: src/sys/dev/acpica5/Osd/OsdHardware.c,v 1.3 2006/10/25 20:55:52 dillon Exp $ */ /* @@ -34,8 +34,7 @@ #include "acpi.h" -#include -#include +#include #include #include diff --git a/sys/dev/acpica5/Osd/OsdInterrupt.c b/sys/dev/acpica5/Osd/OsdInterrupt.c index 040e79e272..6709cf59d3 100644 --- a/sys/dev/acpica5/Osd/OsdInterrupt.c +++ b/sys/dev/acpica5/Osd/OsdInterrupt.c @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/acpica/Osd/OsdInterrupt.c,v 1.17 2004/04/14 03:41:06 njl Exp $ - * $DragonFly: src/sys/dev/acpica5/Osd/OsdInterrupt.c,v 1.6 2005/10/12 17:35:49 dillon Exp $ + * $DragonFly: src/sys/dev/acpica5/Osd/OsdInterrupt.c,v 1.7 2006/10/25 20:55:52 dillon Exp $ */ /* @@ -35,8 +35,6 @@ #include #include #include -#include -#include #include #include diff --git a/sys/dev/acpica5/acpi.c b/sys/dev/acpica5/acpi.c index 21de53e76a..bad5be7288 100644 --- a/sys/dev/acpica5/acpi.c +++ b/sys/dev/acpica5/acpi.c @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.157 2004/06/05 09:56:04 njl Exp $ - * $DragonFly: src/sys/dev/acpica5/acpi.c,v 1.23 2006/09/10 06:05:35 y0netan1 Exp $ + * $DragonFly: src/sys/dev/acpica5/acpi.c,v 1.24 2006/10/25 20:55:52 dillon Exp $ */ #include "opt_acpi.h" @@ -46,13 +46,12 @@ #include #include #include +#include + #include #include #include -#include -#include -#include #include #include "acpi.h" diff --git a/sys/dev/acpica5/acpi_acad.c b/sys/dev/acpica5/acpi_acad.c index 6e7b31b2af..541ab46337 100644 --- a/sys/dev/acpica5/acpi_acad.c +++ b/sys/dev/acpica5/acpi_acad.c @@ -24,15 +24,13 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/acpica/acpi_acad.c,v 1.26 2004/05/30 20:08:23 phk Exp $ - * $DragonFly: src/sys/dev/acpica5/acpi_acad.c,v 1.5 2005/03/12 14:33:40 y0netan1 Exp $ + * $DragonFly: src/sys/dev/acpica5/acpi_acad.c,v 1.6 2006/10/25 20:55:52 dillon Exp $ */ #include "opt_acpi.h" #include #include #include - -#include #include #include #include diff --git a/sys/dev/acpica5/acpi_cmbat.c b/sys/dev/acpica5/acpi_cmbat.c index ced57aa6df..d6f2df8f9e 100644 --- a/sys/dev/acpica5/acpi_cmbat.c +++ b/sys/dev/acpica5/acpi_cmbat.c @@ -26,7 +26,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/acpica/acpi_cmbat.c,v 1.29 2004/05/30 20:08:23 phk Exp $ - * $DragonFly: src/sys/dev/acpica5/acpi_cmbat.c,v 1.8 2006/09/05 03:48:09 dillon Exp $ + * $DragonFly: src/sys/dev/acpica5/acpi_cmbat.c,v 1.9 2006/10/25 20:55:52 dillon Exp $ */ #include "opt_acpi.h" @@ -35,8 +35,6 @@ #include #include #include - -#include #include #include diff --git a/sys/dev/acpica5/acpi_cpu.c b/sys/dev/acpica5/acpi_cpu.c index fc27670c27..5c18be2e18 100644 --- a/sys/dev/acpica5/acpi_cpu.c +++ b/sys/dev/acpica5/acpi_cpu.c @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/acpica/acpi_cpu.c,v 1.41 2004/06/24 00:38:51 njl Exp $ - * $DragonFly: src/sys/dev/acpica5/acpi_cpu.c,v 1.14 2006/09/05 03:48:09 dillon Exp $ + * $DragonFly: src/sys/dev/acpica5/acpi_cpu.c,v 1.15 2006/10/25 20:55:52 dillon Exp $ */ #include "opt_acpi.h" @@ -41,7 +41,6 @@ #include #include -#include #include #include #include diff --git a/sys/dev/acpica5/acpi_ec.c b/sys/dev/acpica5/acpi_ec.c index 64da0c1ff0..616202b7e1 100644 --- a/sys/dev/acpica5/acpi_ec.c +++ b/sys/dev/acpica5/acpi_ec.c @@ -26,7 +26,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/acpica/acpi_ec.c,v 1.51 2004/05/30 20:08:23 phk Exp $ - * $DragonFly: src/sys/dev/acpica5/acpi_ec.c,v 1.8 2006/09/05 00:55:36 dillon Exp $ + * $DragonFly: src/sys/dev/acpica5/acpi_ec.c,v 1.9 2006/10/25 20:55:52 dillon Exp $ */ /****************************************************************************** * @@ -138,7 +138,7 @@ *****************************************************************************/ /* * $FreeBSD: src/sys/dev/acpica/acpi_ec.c,v 1.51 2004/05/30 20:08:23 phk Exp $ - * $DragonFly: src/sys/dev/acpica5/acpi_ec.c,v 1.8 2006/09/05 00:55:36 dillon Exp $ + * $DragonFly: src/sys/dev/acpica5/acpi_ec.c,v 1.9 2006/10/25 20:55:52 dillon Exp $ * */ @@ -150,9 +150,6 @@ #include #include #include - -#include -#include #include #include "acpi.h" diff --git a/sys/dev/acpica5/acpi_package.c b/sys/dev/acpica5/acpi_package.c index 0ddd8287bd..30c704f741 100644 --- a/sys/dev/acpica5/acpi_package.c +++ b/sys/dev/acpica5/acpi_package.c @@ -24,17 +24,13 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/acpica/acpi_package.c,v 1.3 2004/04/09 06:40:03 njl Exp $ - * $DragonFly: src/sys/dev/acpica5/acpi_package.c,v 1.2 2004/06/27 08:52:39 dillon Exp $ + * $DragonFly: src/sys/dev/acpica5/acpi_package.c,v 1.3 2006/10/25 20:55:52 dillon Exp $ */ #include #include #include #include - -#include -#include -#include #include #include "acpi.h" diff --git a/sys/dev/acpica5/acpi_resource.c b/sys/dev/acpica5/acpi_resource.c index f466e81d4c..bbfb40b7cc 100644 --- a/sys/dev/acpica5/acpi_resource.c +++ b/sys/dev/acpica5/acpi_resource.c @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/acpica/acpi_resource.c,v 1.24 2004/05/30 20:08:23 phk Exp $ - * $DragonFly: src/sys/dev/acpica5/acpi_resource.c,v 1.3 2004/07/05 00:07:35 dillon Exp $ + * $DragonFly: src/sys/dev/acpica5/acpi_resource.c,v 1.4 2006/10/25 20:55:52 dillon Exp $ */ #include "opt_acpi.h" @@ -33,9 +33,6 @@ #include #include #include - -#include -#include #include #include "acpi.h" diff --git a/sys/dev/acpica5/acpi_timer.c b/sys/dev/acpica5/acpi_timer.c index 95ee6fb523..f7d772fab8 100644 --- a/sys/dev/acpica5/acpi_timer.c +++ b/sys/dev/acpica5/acpi_timer.c @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/acpica/acpi_timer.c,v 1.33 2004/05/30 20:08:23 phk Exp $ - * $DragonFly: src/sys/dev/acpica5/acpi_timer.c,v 1.8 2005/12/11 01:54:07 swildner Exp $ + * $DragonFly: src/sys/dev/acpica5/acpi_timer.c,v 1.9 2006/10/25 20:55:52 dillon Exp $ */ #include "opt_acpi.h" #include @@ -34,11 +34,9 @@ #include #include #include +#include -#include -#include #include -#include #include #include "acpi.h" diff --git a/sys/dev/acpica5/acpivar.h b/sys/dev/acpica5/acpivar.h index d26af4a123..aa94b9bcc3 100644 --- a/sys/dev/acpica5/acpivar.h +++ b/sys/dev/acpica5/acpivar.h @@ -26,7 +26,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/acpica/acpivar.h,v 1.69 2004/05/28 07:15:55 njl Exp $ - * $DragonFly: src/sys/dev/acpica5/acpivar.h,v 1.8 2006/09/10 01:26:33 dillon Exp $ + * $DragonFly: src/sys/dev/acpica5/acpivar.h,v 1.9 2006/10/25 20:55:52 dillon Exp $ */ #include "bus_if.h" @@ -36,9 +36,7 @@ #include #include #endif - -#include -#include +#include struct acpi_softc { device_t acpi_dev; diff --git a/sys/dev/agp/agp.c b/sys/dev/agp/agp.c index 39ef405070..1c8abbcc0e 100644 --- a/sys/dev/agp/agp.c +++ b/sys/dev/agp/agp.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/pci/agp.c,v 1.3.2.4 2002/08/11 19:58:12 alc Exp $ - * $DragonFly: src/sys/dev/agp/agp.c,v 1.24 2006/09/10 01:26:33 dillon Exp $ + * $DragonFly: src/sys/dev/agp/agp.c,v 1.25 2006/10/25 20:55:52 dillon Exp $ */ #include "opt_bus.h" @@ -41,6 +41,7 @@ #include #include #include +#include #include #include @@ -55,9 +56,6 @@ #include #include -#include -#include -#include MODULE_VERSION(agp, 1); diff --git a/sys/dev/agp/agp_amd.c b/sys/dev/agp/agp_amd.c index 9086e6b97a..701d31950d 100644 --- a/sys/dev/agp/agp_amd.c +++ b/sys/dev/agp/agp_amd.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/pci/agp_amd.c,v 1.3.2.4 2002/04/25 23:41:36 cokane Exp $ - * $DragonFly: src/sys/dev/agp/agp_amd.c,v 1.7 2006/09/05 03:48:09 dillon Exp $ + * $DragonFly: src/sys/dev/agp/agp_amd.c,v 1.8 2006/10/25 20:55:52 dillon Exp $ */ #include "opt_bus.h" @@ -36,6 +36,7 @@ #include #include #include +#include #include #include @@ -46,9 +47,6 @@ #include #include #include -#include -#include -#include MALLOC_DECLARE(M_AGP); diff --git a/sys/dev/agp/agp_i810.c b/sys/dev/agp/agp_i810.c index 9e98b3f660..fdff12e318 100644 --- a/sys/dev/agp/agp_i810.c +++ b/sys/dev/agp/agp_i810.c @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/pci/agp_i810.c,v 1.1.2.5 2002/09/15 08:45:41 anholt Exp $ - * $DragonFly: src/sys/dev/agp/agp_i810.c,v 1.9 2006/09/05 00:55:36 dillon Exp $ + * $DragonFly: src/sys/dev/agp/agp_i810.c,v 1.10 2006/10/25 20:55:52 dillon Exp $ */ /* @@ -41,6 +41,7 @@ #include #include #include +#include #include #include @@ -53,10 +54,6 @@ #include #include -#include -#include -#include - MALLOC_DECLARE(M_AGP); #define READ1(off) bus_space_read_1(sc->bst, sc->bsh, off) diff --git a/sys/dev/agp/agp_nvidia.c b/sys/dev/agp/agp_nvidia.c index 57cb47a40b..112b8f104e 100644 --- a/sys/dev/agp/agp_nvidia.c +++ b/sys/dev/agp/agp_nvidia.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * Based on FreeBSD v1.2. - * $DragonFly: src/sys/dev/agp/agp_nvidia.c,v 1.3 2004/07/04 00:24:52 dillon Exp $ + * $DragonFly: src/sys/dev/agp/agp_nvidia.c,v 1.4 2006/10/25 20:55:52 dillon Exp $ */ /* @@ -41,6 +41,7 @@ #include #include #include +#include #include #include @@ -51,10 +52,6 @@ #include #include -#include -#include -#include - #define NVIDIA_VENDORID 0x10de #define NVIDIA_DEVICEID_NFORCE 0x01a4 #define NVIDIA_DEVICEID_NFORCE2 0x01e0 diff --git a/sys/dev/crypto/hifn/hifn7751.c b/sys/dev/crypto/hifn/hifn7751.c index ce2345b064..cf00925dcb 100644 --- a/sys/dev/crypto/hifn/hifn7751.c +++ b/sys/dev/crypto/hifn/hifn7751.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/hifn/hifn7751.c,v 1.5.2.5 2003/06/04 17:56:59 sam Exp $ */ -/* $DragonFly: src/sys/dev/crypto/hifn/hifn7751.c,v 1.11 2006/09/05 00:55:36 dillon Exp $ */ +/* $DragonFly: src/sys/dev/crypto/hifn/hifn7751.c,v 1.12 2006/10/25 20:55:52 dillon Exp $ */ /* $OpenBSD: hifn7751.c,v 1.120 2002/05/17 00:33:34 deraadt Exp $ */ /* @@ -55,19 +55,16 @@ #include #include #include +#include +#include +#include +#include #include #include #include -#include -#include -#include -#include -#include - #include -#include #include #include diff --git a/sys/dev/crypto/ubsec/ubsec.c b/sys/dev/crypto/ubsec/ubsec.c index 80ece49efd..6ffea027cf 100644 --- a/sys/dev/crypto/ubsec/ubsec.c +++ b/sys/dev/crypto/ubsec/ubsec.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/ubsec/ubsec.c,v 1.6.2.12 2003/06/04 17:56:59 sam Exp $ */ -/* $DragonFly: src/sys/dev/crypto/ubsec/ubsec.c,v 1.11 2006/09/05 03:48:09 dillon Exp $ */ +/* $DragonFly: src/sys/dev/crypto/ubsec/ubsec.c,v 1.12 2006/10/25 20:55:52 dillon Exp $ */ /* $OpenBSD: ubsec.c,v 1.115 2002/09/24 18:33:26 jason Exp $ */ /* @@ -56,22 +56,20 @@ #include #include #include +#include +#include +#include +#include +#include #include #include #include -#include -#include -#include -#include -#include #include #include #include -#include -#include #include #include diff --git a/sys/dev/disk/advansys/adv_eisa.c b/sys/dev/disk/advansys/adv_eisa.c index c90de6e2fe..ccf97d3835 100644 --- a/sys/dev/disk/advansys/adv_eisa.c +++ b/sys/dev/disk/advansys/adv_eisa.c @@ -33,7 +33,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/advansys/adv_eisa.c,v 1.9.2.1 2000/04/14 13:32:44 nyan Exp $ - * $DragonFly: src/sys/dev/disk/advansys/adv_eisa.c,v 1.5 2005/10/12 17:35:49 dillon Exp $ + * $DragonFly: src/sys/dev/disk/advansys/adv_eisa.c,v 1.6 2006/10/25 20:55:52 dillon Exp $ */ #include @@ -41,10 +41,6 @@ #include #include #include - -#include -#include -#include #include #include diff --git a/sys/dev/disk/advansys/adv_isa.c b/sys/dev/disk/advansys/adv_isa.c index b8233da092..a0f3c23086 100644 --- a/sys/dev/disk/advansys/adv_isa.c +++ b/sys/dev/disk/advansys/adv_isa.c @@ -45,16 +45,12 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/advansys/adv_isa.c,v 1.14.2.5 2002/01/06 21:21:42 dwmalone Exp $ - * $DragonFly: src/sys/dev/disk/advansys/adv_isa.c,v 1.5 2005/10/12 17:35:49 dillon Exp $ + * $DragonFly: src/sys/dev/disk/advansys/adv_isa.c,v 1.6 2006/10/25 20:55:52 dillon Exp $ */ #include #include #include - -#include -#include -#include #include #include diff --git a/sys/dev/disk/advansys/adv_pci.c b/sys/dev/disk/advansys/adv_pci.c index f191edf5b6..a784debb1b 100644 --- a/sys/dev/disk/advansys/adv_pci.c +++ b/sys/dev/disk/advansys/adv_pci.c @@ -58,16 +58,12 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/advansys/adv_pci.c,v 1.11.2.3 2001/06/02 04:38:10 nyan Exp $ - * $DragonFly: src/sys/dev/disk/advansys/adv_pci.c,v 1.5 2005/10/12 17:35:49 dillon Exp $ + * $DragonFly: src/sys/dev/disk/advansys/adv_pci.c,v 1.6 2006/10/25 20:55:52 dillon Exp $ */ #include #include #include - -#include -#include -#include #include #include diff --git a/sys/dev/disk/advansys/advansys.c b/sys/dev/disk/advansys/advansys.c index 1e2a6bbe57..1ce1255f27 100644 --- a/sys/dev/disk/advansys/advansys.c +++ b/sys/dev/disk/advansys/advansys.c @@ -33,7 +33,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/advansys/advansys.c,v 1.14.2.4 2002/01/06 21:21:42 dwmalone Exp $ - * $DragonFly: src/sys/dev/disk/advansys/advansys.c,v 1.8 2006/09/05 00:55:37 dillon Exp $ + * $DragonFly: src/sys/dev/disk/advansys/advansys.c,v 1.9 2006/10/25 20:55:52 dillon Exp $ */ /* * Ported from: @@ -53,10 +53,6 @@ #include #include #include - -#include -#include -#include #include #include diff --git a/sys/dev/disk/advansys/advlib.c b/sys/dev/disk/advansys/advlib.c index 74d5b0c67f..4a32140d23 100644 --- a/sys/dev/disk/advansys/advlib.c +++ b/sys/dev/disk/advansys/advlib.c @@ -29,7 +29,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/advansys/advlib.c,v 1.15.2.1 2000/04/14 13:32:49 nyan Exp $ - * $DragonFly: src/sys/dev/disk/advansys/advlib.c,v 1.6 2005/06/03 16:57:12 eirikn Exp $ + * $DragonFly: src/sys/dev/disk/advansys/advlib.c,v 1.7 2006/10/25 20:55:52 dillon Exp $ */ /* * Ported from: @@ -48,14 +48,11 @@ #include #include #include - -#include -#include -#include -#include #include #include +#include + #include #include #include diff --git a/sys/dev/disk/advansys/adw_pci.c b/sys/dev/disk/advansys/adw_pci.c index a8c090966d..20dece6c24 100644 --- a/sys/dev/disk/advansys/adw_pci.c +++ b/sys/dev/disk/advansys/adw_pci.c @@ -33,7 +33,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/advansys/adw_pci.c,v 1.12.2.1 2000/08/02 22:22:40 peter Exp $ - * $DragonFly: src/sys/dev/disk/advansys/adw_pci.c,v 1.3 2003/08/07 21:16:50 dillon Exp $ + * $DragonFly: src/sys/dev/disk/advansys/adw_pci.c,v 1.4 2006/10/25 20:55:52 dillon Exp $ */ #include @@ -41,11 +41,6 @@ #include #include #include - -#include -#include -#include - #include #include diff --git a/sys/dev/disk/advansys/adwcam.c b/sys/dev/disk/advansys/adwcam.c index 779ff6ee93..03f2ef9298 100644 --- a/sys/dev/disk/advansys/adwcam.c +++ b/sys/dev/disk/advansys/adwcam.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/advansys/adwcam.c,v 1.7.2.2 2001/03/05 13:08:55 obrien Exp $ - * $DragonFly: src/sys/dev/disk/advansys/adwcam.c,v 1.12 2006/09/05 00:55:37 dillon Exp $ + * $DragonFly: src/sys/dev/disk/advansys/adwcam.c,v 1.13 2006/10/25 20:55:52 dillon Exp $ */ /* * Ported from: @@ -53,11 +53,7 @@ #include #include -#include -#include -#include #include -#include #include diff --git a/sys/dev/disk/advansys/adwlib.c b/sys/dev/disk/advansys/adwlib.c index 826e68c607..46341179a0 100644 --- a/sys/dev/disk/advansys/adwlib.c +++ b/sys/dev/disk/advansys/adwlib.c @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/advansys/adwlib.c,v 1.6.2.1 2000/04/14 13:32:50 nyan Exp $ - * $DragonFly: src/sys/dev/disk/advansys/adwlib.c,v 1.4 2005/06/03 16:57:12 eirikn Exp $ + * $DragonFly: src/sys/dev/disk/advansys/adwlib.c,v 1.5 2006/10/25 20:55:52 dillon Exp $ */ /* * Ported from: @@ -50,9 +50,6 @@ #include #include -#include -#include -#include #include #include diff --git a/sys/dev/disk/aha/aha.c b/sys/dev/disk/aha/aha.c index 93876f7410..e430034b41 100644 --- a/sys/dev/disk/aha/aha.c +++ b/sys/dev/disk/aha/aha.c @@ -56,7 +56,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/aha/aha.c,v 1.34.2.1 2000/08/02 22:24:39 peter Exp $ - * $DragonFly: src/sys/dev/disk/aha/aha.c,v 1.13 2006/09/05 00:55:37 dillon Exp $ + * $DragonFly: src/sys/dev/disk/aha/aha.c,v 1.14 2006/10/25 20:55:53 dillon Exp $ */ #include @@ -67,8 +67,6 @@ #include #include -#include -#include #include #include diff --git a/sys/dev/disk/aha/aha_isa.c b/sys/dev/disk/aha/aha_isa.c index 456f677810..32dead1b6a 100644 --- a/sys/dev/disk/aha/aha_isa.c +++ b/sys/dev/disk/aha/aha_isa.c @@ -29,16 +29,12 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/aha/aha_isa.c,v 1.17.2.1 2000/08/02 22:24:40 peter Exp $ - * $DragonFly: src/sys/dev/disk/aha/aha_isa.c,v 1.8 2005/10/28 03:25:39 dillon Exp $ + * $DragonFly: src/sys/dev/disk/aha/aha_isa.c,v 1.9 2006/10/25 20:55:53 dillon Exp $ */ #include #include #include - -#include -#include -#include #include #include #include diff --git a/sys/dev/disk/ahb/ahb.c b/sys/dev/disk/ahb/ahb.c index 1ec93f88d8..9df5635a1f 100644 --- a/sys/dev/disk/ahb/ahb.c +++ b/sys/dev/disk/ahb/ahb.c @@ -26,7 +26,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/ahb/ahb.c,v 1.18.2.3 2001/03/05 13:08:55 obrien Exp $ - * $DragonFly: src/sys/dev/disk/ahb/ahb.c,v 1.12 2006/09/05 00:55:37 dillon Exp $ + * $DragonFly: src/sys/dev/disk/ahb/ahb.c,v 1.13 2006/10/25 20:55:53 dillon Exp $ */ #include @@ -35,13 +35,10 @@ #include #include #include +#include #include -#include -#include #include -#include -#include #include #include diff --git a/sys/dev/disk/aic/aic.c b/sys/dev/disk/aic/aic.c index 1946406b8f..8f6b3b15e2 100644 --- a/sys/dev/disk/aic/aic.c +++ b/sys/dev/disk/aic/aic.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/aic/aic.c,v 1.8 2000/01/14 23:42:35 imp Exp $ - * $DragonFly: src/sys/dev/disk/aic/aic.c,v 1.7 2005/06/16 15:38:36 joerg Exp $ + * $DragonFly: src/sys/dev/disk/aic/aic.c,v 1.8 2006/10/25 20:55:53 dillon Exp $ */ #include @@ -33,11 +33,9 @@ #include #include #include -#include #include +#include -#include -#include #include #include diff --git a/sys/dev/disk/aic/aic_isa.c b/sys/dev/disk/aic/aic_isa.c index 80c0a40fe1..8fd1bfd794 100644 --- a/sys/dev/disk/aic/aic_isa.c +++ b/sys/dev/disk/aic/aic_isa.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/aic/aic_isa.c,v 1.3 2000/01/14 23:42:35 imp Exp $ - * $DragonFly: src/sys/dev/disk/aic/aic_isa.c,v 1.6 2005/10/12 17:35:49 dillon Exp $ + * $DragonFly: src/sys/dev/disk/aic/aic_isa.c,v 1.7 2006/10/25 20:55:53 dillon Exp $ */ #include @@ -32,12 +32,8 @@ #include #include #include - -#include -#include -#include #include - + #include #include "aic6360reg.h" #include "aicvar.h" diff --git a/sys/dev/disk/aic/aic_pccard.c b/sys/dev/disk/aic/aic_pccard.c index f2af429eed..268978adb8 100644 --- a/sys/dev/disk/aic/aic_pccard.c +++ b/sys/dev/disk/aic/aic_pccard.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/aic/aic_pccard.c,v 1.1 2000/01/14 23:42:36 imp Exp $ - * $DragonFly: src/sys/dev/disk/aic/aic_pccard.c,v 1.7 2005/10/12 17:35:49 dillon Exp $ + * $DragonFly: src/sys/dev/disk/aic/aic_pccard.c,v 1.8 2006/10/25 20:55:53 dillon Exp $ */ #include @@ -32,10 +32,6 @@ #include #include #include - -#include -#include -#include #include #include "aic6360reg.h" diff --git a/sys/dev/disk/aic7xxx/aic79xx_osm.h b/sys/dev/disk/aic7xxx/aic79xx_osm.h index 8f36deb4a9..f00453fb6e 100644 --- a/sys/dev/disk/aic7xxx/aic79xx_osm.h +++ b/sys/dev/disk/aic7xxx/aic79xx_osm.h @@ -33,7 +33,7 @@ * $Id: //depot/aic7xxx/freebsd/dev/aic7xxx/aic79xx_osm.h#20 $ * * $FreeBSD: src/sys/dev/aic7xxx/aic79xx_osm.h,v 1.4.2.3 2003/06/10 03:26:07 gibbs Exp $ - * $DragonFly: src/sys/dev/disk/aic7xxx/aic79xx_osm.h,v 1.6 2005/06/03 16:57:13 eirikn Exp $ + * $DragonFly: src/sys/dev/disk/aic7xxx/aic79xx_osm.h,v 1.7 2006/10/25 20:55:53 dillon Exp $ */ #ifndef _AIC79XX_FREEBSD_H_ @@ -54,12 +54,8 @@ #include #define AHD_PCI_CONFIG 1 -#include -#include -#include #include #include -#include #include diff --git a/sys/dev/disk/aic7xxx/aic7xxx_osm.h b/sys/dev/disk/aic7xxx/aic7xxx_osm.h index 7d968cc579..ec20f74245 100644 --- a/sys/dev/disk/aic7xxx/aic7xxx_osm.h +++ b/sys/dev/disk/aic7xxx/aic7xxx_osm.h @@ -32,7 +32,7 @@ * $Id: //depot/aic7xxx/freebsd/dev/aic7xxx/aic7xxx_osm.h#15 $ * * $FreeBSD: src/sys/dev/aic7xxx/aic7xxx_osm.h,v 1.14.2.6 2003/06/10 03:26:09 gibbs Exp $ - * $DragonFly: src/sys/dev/disk/aic7xxx/aic7xxx_osm.h,v 1.7 2005/08/25 23:37:35 dillon Exp $ + * $DragonFly: src/sys/dev/disk/aic7xxx/aic7xxx_osm.h,v 1.8 2006/10/25 20:55:53 dillon Exp $ */ #ifndef _AIC7XXX_FREEBSD_H_ @@ -50,6 +50,7 @@ #include #include #include +#include #include #if defined(__DragonFly__) || __FreeBSD_version < 500000 @@ -60,15 +61,9 @@ #if NPCI > 0 #define AHC_PCI_CONFIG 1 -#include #endif -#include -#include #include #include -#include - -#include #if NPCI > 0 #include diff --git a/sys/dev/disk/amd/amd.c b/sys/dev/disk/amd/amd.c index e0677ee9cd..cfa2c3d35e 100644 --- a/sys/dev/disk/amd/amd.c +++ b/sys/dev/disk/amd/amd.c @@ -31,7 +31,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ********************************************************************* * $FreeBSD: src/sys/pci/amd.c,v 1.3.2.2 2001/06/02 04:32:50 nyan Exp $ - * $DragonFly: src/sys/dev/disk/amd/amd.c,v 1.10 2006/08/03 16:40:46 swildner Exp $ + * $DragonFly: src/sys/dev/disk/amd/amd.c,v 1.11 2006/10/25 20:55:53 dillon Exp $ */ /* @@ -52,23 +52,19 @@ /* #define AMD_DEBUG_SCSI_PHASE */ #include - #include +#include #include #include #include -#include +#include +#include #include #include #include -#include -#include #include -#include -#include -#include #include #include diff --git a/sys/dev/disk/ata/ata-all.c b/sys/dev/disk/ata/ata-all.c index a513bf3fee..f5762eb58a 100644 --- a/sys/dev/disk/ata/ata-all.c +++ b/sys/dev/disk/ata/ata-all.c @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/ata/ata-all.c,v 1.50.2.45 2003/03/12 14:47:12 sos Exp $ - * $DragonFly: src/sys/dev/disk/ata/ata-all.c,v 1.31 2006/10/12 04:02:37 y0netan1 Exp $ + * $DragonFly: src/sys/dev/disk/ata/ata-all.c,v 1.32 2006/10/25 20:55:53 dillon Exp $ */ #include "opt_ata.h" @@ -49,11 +49,11 @@ #include #include #include +#include + #include -#include -#include #include -#include + #include "ata-all.h" #include "ata-disk.h" #include "ata-raid.h" diff --git a/sys/dev/disk/ata/ata-card.c b/sys/dev/disk/ata/ata-card.c index ad67e98ccf..6d8263d552 100644 --- a/sys/dev/disk/ata/ata-card.c +++ b/sys/dev/disk/ata/ata-card.c @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/ata/ata-card.c,v 1.4.2.1 2002/03/18 08:37:33 sos Exp $ - * $DragonFly: src/sys/dev/disk/ata/ata-card.c,v 1.5 2004/02/19 19:44:06 joerg Exp $ + * $DragonFly: src/sys/dev/disk/ata/ata-card.c,v 1.6 2006/10/25 20:55:53 dillon Exp $ */ #include @@ -35,10 +35,9 @@ #include #include #include -#include -#include -#include #include + +#include #include "ata-all.h" #include diff --git a/sys/dev/disk/ata/ata-disk.c b/sys/dev/disk/ata/ata-disk.c index 6825fa3349..0d7df6e0b2 100644 --- a/sys/dev/disk/ata/ata-disk.c +++ b/sys/dev/disk/ata/ata-disk.c @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/ata/ata-disk.c,v 1.60.2.24 2003/01/30 07:19:59 sos Exp $ - * $DragonFly: src/sys/dev/disk/ata/ata-disk.c,v 1.31 2006/09/10 01:26:33 dillon Exp $ + * $DragonFly: src/sys/dev/disk/ata/ata-disk.c,v 1.32 2006/10/25 20:55:53 dillon Exp $ */ #include "opt_ata.h" @@ -43,18 +43,20 @@ #include #include #include +#include +#include +#include +#include + #include #include + #include -#include #include -#include + #include "ata-all.h" #include "ata-disk.h" #include "ata-raid.h" -#include -#include -#include /* device structures */ static d_open_t adopen; diff --git a/sys/dev/disk/ata/ata-dma.c b/sys/dev/disk/ata/ata-dma.c index c6c89b93f2..71e69797df 100644 --- a/sys/dev/disk/ata/ata-dma.c +++ b/sys/dev/disk/ata/ata-dma.c @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/ata/ata-dma.c,v 1.35.2.31 2003/05/07 16:46:11 jhb Exp $ - * $DragonFly: src/sys/dev/disk/ata/ata-dma.c,v 1.28 2006/03/28 22:18:59 dillon Exp $ + * $DragonFly: src/sys/dev/disk/ata/ata-dma.c,v 1.29 2006/10/25 20:55:53 dillon Exp $ */ #include @@ -38,11 +38,12 @@ #include #include #include +#include + #include #include + #include -#include -#include #include "ata-all.h" /* prototypes */ diff --git a/sys/dev/disk/ata/ata-isa.c b/sys/dev/disk/ata/ata-isa.c index 887e9a8b97..4900117b6d 100644 --- a/sys/dev/disk/ata/ata-isa.c +++ b/sys/dev/disk/ata/ata-isa.c @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/ata/ata-isa.c,v 1.4.2.1 2002/03/18 08:37:33 sos Exp $ - * $DragonFly: src/sys/dev/disk/ata/ata-isa.c,v 1.9 2006/10/12 04:02:37 y0netan1 Exp $ + * $DragonFly: src/sys/dev/disk/ata/ata-isa.c,v 1.10 2006/10/25 20:55:53 dillon Exp $ */ #include @@ -39,10 +39,10 @@ #include #include #include -#include -#include -#include #include + +#include + #include #include "ata-all.h" diff --git a/sys/dev/disk/ata/ata-pci.c b/sys/dev/disk/ata/ata-pci.c index 2a066ba93e..cda54d843e 100644 --- a/sys/dev/disk/ata/ata-pci.c +++ b/sys/dev/disk/ata/ata-pci.c @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/ata/ata-pci.c,v 1.32.2.15 2003/06/06 13:27:05 fjoe Exp $ - * $DragonFly: src/sys/dev/disk/ata/ata-pci.c,v 1.24 2006/10/12 04:02:37 y0netan1 Exp $ + * $DragonFly: src/sys/dev/disk/ata/ata-pci.c,v 1.25 2006/10/25 20:55:53 dillon Exp $ */ #include @@ -39,11 +39,11 @@ #include #include #include +#include + #include -#include -#include #include -#include + #include #include #include "ata-all.h" diff --git a/sys/dev/disk/ata/ata-raid.c b/sys/dev/disk/ata/ata-raid.c index 9211788fe7..8ed684deb0 100644 --- a/sys/dev/disk/ata/ata-raid.c +++ b/sys/dev/disk/ata/ata-raid.c @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/ata/ata-raid.c,v 1.3.2.19 2003/01/30 07:19:59 sos Exp $ - * $DragonFly: src/sys/dev/disk/ata/ata-raid.c,v 1.23 2006/09/10 01:26:33 dillon Exp $ + * $DragonFly: src/sys/dev/disk/ata/ata-raid.c,v 1.24 2006/10/25 20:55:53 dillon Exp $ */ #include "opt_ata.h" @@ -41,15 +41,15 @@ #include #include #include -#include #include -#include "ata-all.h" -#include "ata-disk.h" -#include "ata-raid.h" #include #include #include +#include "ata-all.h" +#include "ata-disk.h" +#include "ata-raid.h" + /* device structures */ static d_open_t aropen; static d_strategy_t arstrategy; diff --git a/sys/dev/disk/ata/atapi-all.c b/sys/dev/disk/ata/atapi-all.c index b8a13cfe18..abcc3315c6 100644 --- a/sys/dev/disk/ata/atapi-all.c +++ b/sys/dev/disk/ata/atapi-all.c @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/ata/atapi-all.c,v 1.46.2.18 2002/10/31 23:10:33 thomas Exp $ - * $DragonFly: src/sys/dev/disk/ata/atapi-all.c,v 1.17 2006/09/05 00:55:37 dillon Exp $ + * $DragonFly: src/sys/dev/disk/ata/atapi-all.c,v 1.18 2006/10/25 20:55:53 dillon Exp $ */ #include "opt_ata.h" @@ -43,10 +43,11 @@ #include #include #include -#include -#include #include #include + +#include + #include "ata-all.h" #include "atapi-all.h" diff --git a/sys/dev/disk/ata/atapi-cam.c b/sys/dev/disk/ata/atapi-cam.c index dcb675066f..a2db5ca10c 100644 --- a/sys/dev/disk/ata/atapi-cam.c +++ b/sys/dev/disk/ata/atapi-cam.c @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/ata/atapi-cam.c,v 1.10.2.3 2003/05/21 09:24:55 thomas Exp $ - * $DragonFly: src/sys/dev/disk/ata/atapi-cam.c,v 1.9 2006/09/05 00:55:37 dillon Exp $ + * $DragonFly: src/sys/dev/disk/ata/atapi-cam.c,v 1.10 2006/10/25 20:55:53 dillon Exp $ */ #include @@ -37,7 +37,6 @@ #include #include #include -#include #include #include diff --git a/sys/dev/disk/ata/atapi-cd.c b/sys/dev/disk/ata/atapi-cd.c index 3866b83a89..4c7e9c2000 100644 --- a/sys/dev/disk/ata/atapi-cd.c +++ b/sys/dev/disk/ata/atapi-cd.c @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/ata/atapi-cd.c,v 1.48.2.20 2002/11/25 05:30:31 njl Exp $ - * $DragonFly: src/sys/dev/disk/ata/atapi-cd.c,v 1.25 2006/09/10 01:26:33 dillon Exp $ + * $DragonFly: src/sys/dev/disk/ata/atapi-cd.c,v 1.26 2006/10/25 20:55:53 dillon Exp $ */ #include "opt_ata.h" @@ -46,9 +46,9 @@ #include #include #include -#include #include #include + #include "ata-all.h" #include "atapi-all.h" #include "atapi-cd.h" diff --git a/sys/dev/disk/ata/atapi-fd.c b/sys/dev/disk/ata/atapi-fd.c index fb35ac1cea..79ca89dc60 100644 --- a/sys/dev/disk/ata/atapi-fd.c +++ b/sys/dev/disk/ata/atapi-fd.c @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/ata/atapi-fd.c,v 1.44.2.9 2002/07/31 11:19:26 sos Exp $ - * $DragonFly: src/sys/dev/disk/ata/atapi-fd.c,v 1.18 2006/09/10 01:26:33 dillon Exp $ + * $DragonFly: src/sys/dev/disk/ata/atapi-fd.c,v 1.19 2006/10/25 20:55:53 dillon Exp $ */ #include @@ -40,10 +40,10 @@ #include #include #include -#include #include #include #include + #include "ata-all.h" #include "atapi-all.h" #include "atapi-fd.h" diff --git a/sys/dev/disk/ata/atapi-tape.c b/sys/dev/disk/ata/atapi-tape.c index d946d060d4..2fb6a138c6 100644 --- a/sys/dev/disk/ata/atapi-tape.c +++ b/sys/dev/disk/ata/atapi-tape.c @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/ata/atapi-tape.c,v 1.36.2.12 2002/07/31 11:19:26 sos Exp $ - * $DragonFly: src/sys/dev/disk/ata/atapi-tape.c,v 1.18 2006/09/10 01:26:33 dillon Exp $ + * $DragonFly: src/sys/dev/disk/ata/atapi-tape.c,v 1.19 2006/10/25 20:55:53 dillon Exp $ */ #include "opt_ata.h" @@ -41,10 +41,10 @@ #include #include #include -#include #include #include #include + #include "ata-all.h" #include "atapi-all.h" #include "atapi-tape.h" diff --git a/sys/dev/disk/buslogic/bt.c b/sys/dev/disk/buslogic/bt.c index 9a3bd4e2bd..2a5f3251d9 100644 --- a/sys/dev/disk/buslogic/bt.c +++ b/sys/dev/disk/buslogic/bt.c @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/buslogic/bt.c,v 1.25.2.1 2000/08/02 22:32:26 peter Exp $ - * $DragonFly: src/sys/dev/disk/buslogic/bt.c,v 1.12 2006/09/05 00:55:37 dillon Exp $ + * $DragonFly: src/sys/dev/disk/buslogic/bt.c,v 1.13 2006/10/25 20:55:53 dillon Exp $ */ /* @@ -48,29 +48,16 @@ #include #include #include +#include #include -/* - * XXX It appears that BusLogic PCI adapters go out to lunch if you - * attempt to perform memory mapped I/O. - */ -#if 0 -#include "use_pci.h" -#if NPCI > 0 -#include -#endif -#endif -#include -#include #include -#include #include #include #include #include #include - #include #include diff --git a/sys/dev/disk/buslogic/bt_eisa.c b/sys/dev/disk/buslogic/bt_eisa.c index fcb120dbda..3c153c6f84 100644 --- a/sys/dev/disk/buslogic/bt_eisa.c +++ b/sys/dev/disk/buslogic/bt_eisa.c @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/buslogic/bt_eisa.c,v 1.12 2000/01/29 14:27:26 peter Exp $ - * $DragonFly: src/sys/dev/disk/buslogic/bt_eisa.c,v 1.3 2003/08/07 21:16:52 dillon Exp $ + * $DragonFly: src/sys/dev/disk/buslogic/bt_eisa.c,v 1.4 2006/10/25 20:55:53 dillon Exp $ */ #include @@ -35,10 +35,6 @@ #include #include #include - -#include -#include -#include #include #include diff --git a/sys/dev/disk/buslogic/bt_isa.c b/sys/dev/disk/buslogic/bt_isa.c index 825dee5e95..8941faeb82 100644 --- a/sys/dev/disk/buslogic/bt_isa.c +++ b/sys/dev/disk/buslogic/bt_isa.c @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/buslogic/bt_isa.c,v 1.18 1999/10/12 21:35:43 dfr Exp $ - * $DragonFly: src/sys/dev/disk/buslogic/bt_isa.c,v 1.3 2003/08/07 21:16:52 dillon Exp $ + * $DragonFly: src/sys/dev/disk/buslogic/bt_isa.c,v 1.4 2006/10/25 20:55:53 dillon Exp $ */ #include @@ -35,10 +35,6 @@ #include #include #include - -#include -#include -#include #include #include diff --git a/sys/dev/disk/buslogic/bt_pci.c b/sys/dev/disk/buslogic/bt_pci.c index 5024cff11e..a2ca56bed2 100644 --- a/sys/dev/disk/buslogic/bt_pci.c +++ b/sys/dev/disk/buslogic/bt_pci.c @@ -27,24 +27,19 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/buslogic/bt_pci.c,v 1.11 2000/01/17 12:38:00 nyan Exp $ - * $DragonFly: src/sys/dev/disk/buslogic/bt_pci.c,v 1.4 2005/06/03 21:56:23 swildner Exp $ + * $DragonFly: src/sys/dev/disk/buslogic/bt_pci.c,v 1.5 2006/10/25 20:55:53 dillon Exp $ */ #include #include #include #include +#include +#include #include #include -#include -#include -#include -#include -#include -#include - #include "btreg.h" #define BT_PCI_IOADDR PCIR_MAPS diff --git a/sys/dev/disk/fd/fd.c b/sys/dev/disk/fd/fd.c index d09db190cf..3769a1e3af 100644 --- a/sys/dev/disk/fd/fd.c +++ b/sys/dev/disk/fd/fd.c @@ -51,7 +51,7 @@ * * from: @(#)fd.c 7.4 (Berkeley) 5/25/91 * $FreeBSD: src/sys/isa/fd.c,v 1.176.2.8 2002/05/15 21:56:14 joerg Exp $ - * $DragonFly: src/sys/dev/disk/fd/fd.c,v 1.33 2006/09/10 01:26:33 dillon Exp $ + * $DragonFly: src/sys/dev/disk/fd/fd.c,v 1.34 2006/10/25 20:55:53 dillon Exp $ * */ @@ -73,17 +73,13 @@ #include #include #include - #include -#include #include - #include #include #include #include -#include #include #include diff --git a/sys/dev/disk/fd/fd_pccard.c b/sys/dev/disk/fd/fd_pccard.c index a56e1d4e5f..f153bbc45e 100644 --- a/sys/dev/disk/fd/fd_pccard.c +++ b/sys/dev/disk/fd/fd_pccard.c @@ -49,7 +49,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $DragonFly: src/sys/dev/disk/fd/fd_pccard.c,v 1.2 2004/02/19 15:48:26 joerg Exp $ + * $DragonFly: src/sys/dev/disk/fd/fd_pccard.c,v 1.3 2006/10/25 20:55:53 dillon Exp $ */ #include @@ -58,7 +58,6 @@ #include #include #include -#include #include "fdc.h" #include "fdreg.h" diff --git a/sys/dev/disk/isp/isp_freebsd.h b/sys/dev/disk/isp/isp_freebsd.h index 0c314183a7..896e8360ef 100644 --- a/sys/dev/disk/isp/isp_freebsd.h +++ b/sys/dev/disk/isp/isp_freebsd.h @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/isp/isp_freebsd.h,v 1.26.2.17 2002/10/11 17:35:11 mjacob Exp $ */ -/* $DragonFly: src/sys/dev/disk/isp/isp_freebsd.h,v 1.6 2005/06/06 22:51:54 corecode Exp $ */ +/* $DragonFly: src/sys/dev/disk/isp/isp_freebsd.h,v 1.7 2006/10/25 20:55:53 dillon Exp $ */ /* * Qlogic ISP SCSI Host Adapter FreeBSD Wrapper Definitions * Copyright (c) 1997, 1998, 1999, 2000, 2001, 2002 by Matthew Jacob @@ -40,9 +40,6 @@ #include #include -#include -#include -#include #include #include diff --git a/sys/dev/disk/isp/isp_pci.c b/sys/dev/disk/isp/isp_pci.c index 55a371347e..17dca27916 100644 --- a/sys/dev/disk/isp/isp_pci.c +++ b/sys/dev/disk/isp/isp_pci.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/isp/isp_pci.c,v 1.78.2.4 2002/10/11 18:50:53 mjacob Exp $ */ -/* $DragonFly: src/sys/dev/disk/isp/isp_pci.c,v 1.10 2006/09/05 00:55:37 dillon Exp $ */ +/* $DragonFly: src/sys/dev/disk/isp/isp_pci.c,v 1.11 2006/10/25 20:55:53 dillon Exp $ */ /* * PCI specific probe and attach routines for Qlogic ISP SCSI adapters. * FreeBSD Version. @@ -33,17 +33,12 @@ #include #include #include +#include +#include #include #include -#include -#include -#include -#include -#include -#include - #include "isp_freebsd.h" static u_int16_t isp_pci_rd_reg(struct ispsoftc *, int); diff --git a/sys/dev/disk/mpt/mpt_freebsd.h b/sys/dev/disk/mpt/mpt_freebsd.h index f21cdf25ea..5a6670f783 100644 --- a/sys/dev/disk/mpt/mpt_freebsd.h +++ b/sys/dev/disk/mpt/mpt_freebsd.h @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/mpt/mpt_freebsd.h,v 1.3.2.3 2002/09/24 21:37:25 mjacob Exp $ */ -/* $DragonFly: src/sys/dev/disk/mpt/mpt_freebsd.h,v 1.9 2006/01/25 19:56:25 dillon Exp $ */ +/* $DragonFly: src/sys/dev/disk/mpt/mpt_freebsd.h,v 1.10 2006/10/25 20:55:53 dillon Exp $ */ /* * LSI MPT Host Adapter FreeBSD Wrapper Definitions (CAM version) * @@ -52,9 +52,6 @@ #include #include -#include -#include -#include #include #include diff --git a/sys/dev/disk/mpt/mpt_pci.c b/sys/dev/disk/mpt/mpt_pci.c index 9651c55eb9..f44b10a5ac 100644 --- a/sys/dev/disk/mpt/mpt_pci.c +++ b/sys/dev/disk/mpt/mpt_pci.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/mpt/mpt_pci.c,v 1.3.2.3 2002/09/24 21:37:25 mjacob Exp $ */ -/* $DragonFly: src/sys/dev/disk/mpt/mpt_pci.c,v 1.8 2006/09/05 00:55:37 dillon Exp $ */ +/* $DragonFly: src/sys/dev/disk/mpt/mpt_pci.c,v 1.9 2006/10/25 20:55:53 dillon Exp $ */ /* * PCI specific probe and attach routines for LSI '909 FC adapters. * FreeBSD Version. @@ -37,18 +37,13 @@ #include #include #include +#include +#include #include #include #include -#include -#include -#include -#include -#include -#include - #include "mpt_freebsd.h" #ifndef PCIM_CMD_SERRESPEN diff --git a/sys/dev/disk/ncr/ncr.c b/sys/dev/disk/ncr/ncr.c index 9ef3d357f7..dd921c7d90 100644 --- a/sys/dev/disk/ncr/ncr.c +++ b/sys/dev/disk/ncr/ncr.c @@ -1,7 +1,7 @@ /************************************************************************** ** ** $FreeBSD: src/sys/pci/ncr.c,v 1.155.2.3 2001/03/05 13:09:10 obrien Exp $ -** $DragonFly: src/sys/dev/disk/ncr/ncr.c,v 1.14 2006/09/05 00:55:38 dillon Exp $ +** $DragonFly: src/sys/dev/disk/ncr/ncr.c,v 1.15 2006/10/25 20:55:53 dillon Exp $ ** ** Device driver for the NCR 53C8XX PCI-SCSI-Controller Family. ** @@ -184,8 +184,6 @@ #include #include #include -#include -#include #include #include #include diff --git a/sys/dev/disk/ncv/ncr53c500.c b/sys/dev/disk/ncv/ncr53c500.c index ad45bbd7ce..d9e1d9b992 100644 --- a/sys/dev/disk/ncv/ncr53c500.c +++ b/sys/dev/disk/ncv/ncr53c500.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/ncv/ncr53c500.c,v 1.1.2.4 2001/12/17 13:30:18 non Exp $ */ -/* $DragonFly: src/sys/dev/disk/ncv/ncr53c500.c,v 1.9 2005/12/11 01:54:07 swildner Exp $ */ +/* $DragonFly: src/sys/dev/disk/ncv/ncr53c500.c,v 1.10 2006/10/25 20:55:53 dillon Exp $ */ /* $NecBSD: ncr53c500.c,v 1.30.12.3 2001/06/26 07:31:41 honda Exp $ */ /* $NetBSD$ */ @@ -46,35 +46,11 @@ #include #include #include +#include #include -#ifdef __NetBSD__ -#include -#include -#include - -#include -#include -#include -#include - -#include -#include - -#include - -#include -#include -#include - -#include -#endif /* __NetBSD__ */ - -#ifdef __DragonFly__ #include #include -#include -#include #include #include @@ -86,7 +62,6 @@ #include "ncr53c500var.h" #include "ncr53c500hwtab.h" -#endif /* __DragonFly__ */ #define NCV_MAX_DATA_SIZE (64 * 1024) #define NCV_DELAY_MAX (2 * 1000 * 1000) diff --git a/sys/dev/disk/ncv/ncr53c500_pccard.c b/sys/dev/disk/ncv/ncr53c500_pccard.c index e29edc6e6f..94bf76c014 100644 --- a/sys/dev/disk/ncv/ncr53c500_pccard.c +++ b/sys/dev/disk/ncv/ncr53c500_pccard.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/ncv/ncr53c500_pccard.c,v 1.2.2.5 2001/12/17 13:30:18 non Exp $ */ -/* $DragonFly: src/sys/dev/disk/ncv/ncr53c500_pccard.c,v 1.10 2005/10/12 17:35:50 dillon Exp $ */ +/* $DragonFly: src/sys/dev/disk/ncv/ncr53c500_pccard.c,v 1.11 2006/10/25 20:55:53 dillon Exp $ */ /* $NecBSD: ncr53c500_pisa.c,v 1.28 1998/11/26 01:59:11 honda Exp $ */ /* $NetBSD$ */ @@ -45,12 +45,11 @@ #include #include #include +#include #include #include -#include -#include #include #include diff --git a/sys/dev/disk/nsp/nsp.c b/sys/dev/disk/nsp/nsp.c index 0c6d46f625..438a6fab77 100644 --- a/sys/dev/disk/nsp/nsp.c +++ b/sys/dev/disk/nsp/nsp.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/nsp/nsp.c,v 1.1.2.6 2001/12/17 13:30:18 non Exp $ */ -/* $DragonFly: src/sys/dev/disk/nsp/nsp.c,v 1.8 2005/12/11 01:54:07 swildner Exp $ */ +/* $DragonFly: src/sys/dev/disk/nsp/nsp.c,v 1.9 2006/10/25 20:55:54 dillon Exp $ */ /* $NecBSD: nsp.c,v 1.21.12.6 2001/06/29 06:27:52 honda Exp $ */ /* $NetBSD$ */ @@ -45,47 +45,21 @@ #include #include #include -#if defined(__FreeBSD__) && __FreeBSD_version > 500001 -#include -#endif /* __ FreeBSD__ */ #include #include #include #include +#include #include -#ifdef __NetBSD__ -#include -#include -#include - -#include -#include -#include -#include - -#include -#include - -#include -#include -#include -#endif /* __NetBSD__ */ - -#ifdef __DragonFly__ #include #include -#include -#include -#include - #include #include #include #include "nspreg.h" #include "nspvar.h" -#endif /* __DragonFly__ */ /*************************************************** * USER SETTINGS diff --git a/sys/dev/disk/nsp/nsp_pccard.c b/sys/dev/disk/nsp/nsp_pccard.c index ebddbb4e90..d498b43f13 100644 --- a/sys/dev/disk/nsp/nsp_pccard.c +++ b/sys/dev/disk/nsp/nsp_pccard.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/nsp/nsp_pccard.c,v 1.2.2.6 2001/12/17 13:30:19 non Exp $ */ -/* $DragonFly: src/sys/dev/disk/nsp/nsp_pccard.c,v 1.8 2005/10/12 17:35:50 dillon Exp $ */ +/* $DragonFly: src/sys/dev/disk/nsp/nsp_pccard.c,v 1.9 2006/10/25 20:55:54 dillon Exp $ */ /* $NecBSD: nsp_pisa.c,v 1.4 1999/04/15 01:35:54 kmatsuda Exp $ */ /* $NetBSD$ */ @@ -39,18 +39,15 @@ #include #include #include -#if defined(__FreeBSD__) && __FreeBSD_version >= 500001 -#include -#endif #include #include #include #include +#include #include #include -#include #include #include diff --git a/sys/dev/disk/sbp/sbp.c b/sys/dev/disk/sbp/sbp.c index b72fa30506..51b80c8032 100644 --- a/sys/dev/disk/sbp/sbp.c +++ b/sys/dev/disk/sbp/sbp.c @@ -32,7 +32,7 @@ * POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/firewire/sbp.c,v 1.74 2004/01/08 14:58:09 simokawa Exp $ - * $DragonFly: src/sys/dev/disk/sbp/sbp.c,v 1.19 2006/10/19 19:00:47 swildner Exp $ + * $DragonFly: src/sys/dev/disk/sbp/sbp.c,v 1.20 2006/10/25 20:55:54 dillon Exp $ * */ @@ -43,19 +43,11 @@ #include #include #include -#include #include -#if defined(__FreeBSD__) && __FreeBSD_version >= 501102 -#include -#include -#endif -#if defined(__DragonFly__) || __FreeBSD_version < 500106 #include /* for struct devstat */ -#endif #include -#ifdef __DragonFly__ #include #include #include @@ -69,15 +61,6 @@ #include #include #include "sbp.h" -#else -#include -#include -#include -#include -#include -#include -#include -#endif #define ccb_sdev_ptr spriv_ptr0 #define ccb_sbp_ptr spriv_ptr1 diff --git a/sys/dev/disk/stg/tmc18c30.c b/sys/dev/disk/stg/tmc18c30.c index c851fff032..d8c3714aae 100644 --- a/sys/dev/disk/stg/tmc18c30.c +++ b/sys/dev/disk/stg/tmc18c30.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/stg/tmc18c30.c,v 1.1.2.5 2001/12/17 13:30:19 non Exp $ */ -/* $DragonFly: src/sys/dev/disk/stg/tmc18c30.c,v 1.10 2005/12/11 01:54:07 swildner Exp $ */ +/* $DragonFly: src/sys/dev/disk/stg/tmc18c30.c,v 1.11 2006/10/25 20:55:54 dillon Exp $ */ /* $NecBSD: tmc18c30.c,v 1.28.12.3 2001/06/19 04:35:48 honda Exp $ */ /* $NetBSD$ */ @@ -48,31 +48,11 @@ #include #include #include +#include #include -#ifdef __NetBSD__ -#include -#include -#include - -#include -#include -#include -#include - -#include -#include - -#include -#include -#include -#endif /* __NetBSD__ */ - -#ifdef __DragonFly__ #include #include -#include -#include #include #include @@ -80,7 +60,6 @@ #include #include "tmc18c30reg.h" #include "tmc18c30var.h" -#endif /* __DragonFly__ */ /*************************************************** * USER SETTINGS diff --git a/sys/dev/disk/stg/tmc18c30_isa.c b/sys/dev/disk/stg/tmc18c30_isa.c index a9d66d09a8..1ecc2aa4e1 100644 --- a/sys/dev/disk/stg/tmc18c30_isa.c +++ b/sys/dev/disk/stg/tmc18c30_isa.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/stg/tmc18c30_isa.c,v 1.2.2.4 2001/09/04 04:45:23 non Exp $ */ -/* $DragonFly: src/sys/dev/disk/stg/tmc18c30_isa.c,v 1.8 2005/10/12 17:35:50 dillon Exp $ */ +/* $DragonFly: src/sys/dev/disk/stg/tmc18c30_isa.c,v 1.9 2006/10/25 20:55:54 dillon Exp $ */ /* $NecBSD: tmc18c30_pisa.c,v 1.22 1998/11/26 01:59:21 honda Exp $ */ /* $NetBSD$ */ @@ -50,21 +50,16 @@ #include #include #include +#include +#include #include #include -#include -#include -#include -#include - #include #include -#include - #include #include #include diff --git a/sys/dev/disk/stg/tmc18c30_pccard.c b/sys/dev/disk/stg/tmc18c30_pccard.c index 2671b3dfed..4884b3f49f 100644 --- a/sys/dev/disk/stg/tmc18c30_pccard.c +++ b/sys/dev/disk/stg/tmc18c30_pccard.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/stg/tmc18c30_pccard.c,v 1.2.2.6 2001/12/17 13:30:19 non Exp $ */ -/* $DragonFly: src/sys/dev/disk/stg/tmc18c30_pccard.c,v 1.9 2005/10/12 17:35:50 dillon Exp $ */ +/* $DragonFly: src/sys/dev/disk/stg/tmc18c30_pccard.c,v 1.10 2006/10/25 20:55:54 dillon Exp $ */ /* $NecBSD: tmc18c30_pisa.c,v 1.22 1998/11/26 01:59:21 honda Exp $ */ /* $NetBSD$ */ @@ -44,6 +44,7 @@ #include #include #include +#include #include #include #include @@ -51,8 +52,6 @@ #include -#include -#include #include #include diff --git a/sys/dev/disk/sym/sym_hipd.c b/sys/dev/disk/sym/sym_hipd.c index ed96926ed9..643241c069 100644 --- a/sys/dev/disk/sym/sym_hipd.c +++ b/sys/dev/disk/sym/sym_hipd.c @@ -56,7 +56,7 @@ */ /* $FreeBSD: src/sys/dev/sym/sym_hipd.c,v 1.6.2.12 2001/12/02 19:01:10 groudier Exp $ */ -/* $DragonFly: src/sys/dev/disk/sym/sym_hipd.c,v 1.17 2006/09/05 00:55:38 dillon Exp $ */ +/* $DragonFly: src/sys/dev/disk/sym/sym_hipd.c,v 1.18 2006/10/25 20:55:54 dillon Exp $ */ #define SYM_DRIVER_NAME "sym-1.6.5-20000902" @@ -93,6 +93,7 @@ #ifdef FreeBSD_Bus_Io_Abstraction #include #include +#include #endif #include @@ -101,23 +102,6 @@ #include #include -#ifdef FreeBSD_Bus_Space_Abstraction -#include -/* - * 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 -#endif -#endif -#include - -#ifdef FreeBSD_Bus_Io_Abstraction -#include -#include -#endif #include #include diff --git a/sys/dev/disk/trm/trm.c b/sys/dev/disk/trm/trm.c index c722e34858..b3542ecbfb 100644 --- a/sys/dev/disk/trm/trm.c +++ b/sys/dev/disk/trm/trm.c @@ -45,7 +45,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/trm/trm.c,v 1.2.2.2 2002/12/19 20:34:45 cognet Exp $ - * $DragonFly: src/sys/dev/disk/trm/trm.c,v 1.12 2006/09/05 03:48:10 dillon Exp $ + * $DragonFly: src/sys/dev/disk/trm/trm.c,v 1.13 2006/10/25 20:55:54 dillon Exp $ */ /* @@ -76,9 +76,6 @@ #include #include -#include -#include -#include #include #include diff --git a/sys/dev/drm/drm_os_freebsd.h b/sys/dev/drm/drm_os_freebsd.h index bdb76489dd..a71f8b5c35 100644 --- a/sys/dev/drm/drm_os_freebsd.h +++ b/sys/dev/drm/drm_os_freebsd.h @@ -1,6 +1,6 @@ /* * $FreeBSD: src/sys/dev/drm/drm_os_freebsd.h,v 1.10.2.1 2003/04/26 07:05:28 anholt Exp $ - * $DragonFly: src/sys/dev/drm/Attic/drm_os_freebsd.h,v 1.20 2006/09/10 01:26:34 dillon Exp $ + * $DragonFly: src/sys/dev/drm/Attic/drm_os_freebsd.h,v 1.21 2006/10/25 20:55:54 dillon Exp $ */ #include #include @@ -27,8 +27,6 @@ #include #include #include -#include -#include #include #include #include diff --git a/sys/dev/misc/atkbd/atkbd_isa.c b/sys/dev/misc/atkbd/atkbd_isa.c index 8417b7c93a..7319ab1b20 100644 --- a/sys/dev/misc/atkbd/atkbd_isa.c +++ b/sys/dev/misc/atkbd/atkbd_isa.c @@ -24,7 +24,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/isa/atkbd_isa.c,v 1.7.2.3 2001/08/01 10:42:28 yokota Exp $ - * $DragonFly: src/sys/dev/misc/atkbd/atkbd_isa.c,v 1.5 2005/10/12 17:35:50 dillon Exp $ + * $DragonFly: src/sys/dev/misc/atkbd/atkbd_isa.c,v 1.6 2006/10/25 20:55:54 dillon Exp $ */ #include "opt_kbd.h" @@ -33,9 +33,6 @@ #include #include #include - -#include -#include #include #include diff --git a/sys/dev/misc/atkbdc_layer/atkbdc_isa.c b/sys/dev/misc/atkbdc_layer/atkbdc_isa.c index 8a45dad054..93a46fed41 100644 --- a/sys/dev/misc/atkbdc_layer/atkbdc_isa.c +++ b/sys/dev/misc/atkbdc_layer/atkbdc_isa.c @@ -24,7 +24,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/isa/atkbdc_isa.c,v 1.14.2.1 2000/03/31 12:52:05 yokota Exp $ - * $DragonFly: src/sys/dev/misc/atkbdc_layer/atkbdc_isa.c,v 1.5 2006/09/05 00:55:38 dillon Exp $ + * $DragonFly: src/sys/dev/misc/atkbdc_layer/atkbdc_isa.c,v 1.6 2006/10/25 20:55:54 dillon Exp $ */ #include "opt_kbd.h" @@ -34,9 +34,6 @@ #include #include #include -#include -#include -#include #include #include diff --git a/sys/dev/misc/dcons/dcons/Makefile b/sys/dev/misc/dcons/dcons/Makefile index 2fe99569eb..c421bfdb06 100644 --- a/sys/dev/misc/dcons/dcons/Makefile +++ b/sys/dev/misc/dcons/dcons/Makefile @@ -1,12 +1,13 @@ # $Id: Makefile,v 1.6 2003/10/24 15:41:26 simokawa Exp $ # $FreeBSD: src/sys/modules/dcons/Makefile,v 1.2 2004/07/13 09:37:49 simokawa Exp $ -# $DragonFly: src/sys/dev/misc/dcons/dcons/Makefile,v 1.4 2005/02/18 11:41:42 corecode Exp $ +# $DragonFly: src/sys/dev/misc/dcons/dcons/Makefile,v 1.5 2006/10/25 20:55:54 dillon Exp $ .PATH: ${.CURDIR}/.. KMOD = dcons SRCS = dcons.c dcons_os.c SRCS += dcons.h dcons_os.h opt_dcons.h opt_ddb.h opt_comconsole.h +SRCS += device_if.h bus_if.h .if !defined(BUILDING_WITH_KERNEL) opt_ddb.h: diff --git a/sys/dev/misc/dcons/dcons_crom.c b/sys/dev/misc/dcons/dcons_crom.c index 99b85e566f..6666585f83 100644 --- a/sys/dev/misc/dcons/dcons_crom.c +++ b/sys/dev/misc/dcons/dcons_crom.c @@ -33,7 +33,7 @@ * * $Id: dcons_crom.c,v 1.8 2003/10/23 15:47:21 simokawa Exp $ * $FreeBSD: src/sys/dev/dcons/dcons_crom.c,v 1.5 2004/10/13 05:38:42 simokawa Exp $ - * $DragonFly: src/sys/dev/misc/dcons/dcons_crom.c,v 1.3 2005/10/28 03:25:44 dillon Exp $ + * $DragonFly: src/sys/dev/misc/dcons/dcons_crom.c,v 1.4 2006/10/25 20:55:54 dillon Exp $ */ #include @@ -43,9 +43,7 @@ #include #include #include - #include -#include #ifdef __DragonFly__ #include diff --git a/sys/dev/misc/dcons/dcons_os.c b/sys/dev/misc/dcons/dcons_os.c index 8f88f24422..0bf531d673 100644 --- a/sys/dev/misc/dcons/dcons_os.c +++ b/sys/dev/misc/dcons/dcons_os.c @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/dcons/dcons_os.c,v 1.4 2004/10/24 12:41:04 simokawa Exp $ - * $DragonFly: src/sys/dev/misc/dcons/dcons_os.c,v 1.6 2006/09/10 01:26:34 dillon Exp $ + * $DragonFly: src/sys/dev/misc/dcons/dcons_os.c,v 1.7 2006/10/25 20:55:54 dillon Exp $ */ #include @@ -52,16 +52,10 @@ #include #include #include +#include -#include - -#ifdef __DragonFly__ #include "dcons.h" #include "dcons_os.h" -#else -#include -#include -#endif #include #include diff --git a/sys/dev/misc/joy/joy.c b/sys/dev/misc/joy/joy.c index a6ed9e5e19..abfcf1825c 100644 --- a/sys/dev/misc/joy/joy.c +++ b/sys/dev/misc/joy/joy.c @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/isa/joy.c,v 1.38.2.1 2001/09/01 05:55:31 murray Exp $ - * $DragonFly: src/sys/dev/misc/joy/joy.c,v 1.10 2006/09/10 01:26:34 dillon Exp $ + * $DragonFly: src/sys/dev/misc/joy/joy.c,v 1.11 2006/10/25 20:55:54 dillon Exp $ */ #include @@ -37,8 +37,6 @@ #include #include #include -#include -#include #include #include #include diff --git a/sys/dev/misc/kbd/atkbd.c b/sys/dev/misc/kbd/atkbd.c index f67d6efa53..2b7359e021 100644 --- a/sys/dev/misc/kbd/atkbd.c +++ b/sys/dev/misc/kbd/atkbd.c @@ -24,7 +24,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/kbd/atkbd.c,v 1.25.2.4 2002/04/08 19:21:38 asmodai Exp $ - * $DragonFly: src/sys/dev/misc/kbd/atkbd.c,v 1.11 2006/09/05 00:55:38 dillon Exp $ + * $DragonFly: src/sys/dev/misc/kbd/atkbd.c,v 1.12 2006/10/25 20:55:54 dillon Exp $ */ #include "opt_kbd.h" @@ -38,9 +38,6 @@ #include #include -#include -#include - #ifdef __i386__ #include #include diff --git a/sys/dev/misc/kbd/atkbdc.c b/sys/dev/misc/kbd/atkbdc.c index 08924235ab..145afb5e77 100644 --- a/sys/dev/misc/kbd/atkbdc.c +++ b/sys/dev/misc/kbd/atkbdc.c @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/kbd/atkbdc.c,v 1.5.2.2 2002/03/31 11:02:02 murray Exp $ - * $DragonFly: src/sys/dev/misc/kbd/atkbdc.c,v 1.7 2006/09/05 00:55:38 dillon Exp $ + * $DragonFly: src/sys/dev/misc/kbd/atkbdc.c,v 1.8 2006/10/25 20:55:54 dillon Exp $ * from kbdio.c,v 1.13 1998/09/25 11:55:46 yokota Exp */ @@ -40,9 +40,6 @@ #include #include #include -#include -#include -#include #include #include diff --git a/sys/dev/misc/lpt/lpt.c b/sys/dev/misc/lpt/lpt.c index 3786ef1ef4..fdbd679a27 100644 --- a/sys/dev/misc/lpt/lpt.c +++ b/sys/dev/misc/lpt/lpt.c @@ -49,7 +49,7 @@ * From Id: lpt.c,v 1.55.2.1 1996/11/12 09:08:38 phk Exp * From Id: nlpt.c,v 1.14 1999/02/08 13:55:43 des Exp * $FreeBSD: src/sys/dev/ppbus/lpt.c,v 1.15.2.3 2000/07/07 00:30:40 obrien Exp $ - * $DragonFly: src/sys/dev/misc/lpt/lpt.c,v 1.17 2006/09/10 01:26:34 dillon Exp $ + * $DragonFly: src/sys/dev/misc/lpt/lpt.c,v 1.18 2006/10/25 20:55:54 dillon Exp $ */ /* @@ -75,11 +75,9 @@ #include #include #include +#include #include -#include -#include -#include #include "lptio.h" #include diff --git a/sys/dev/misc/mse/mse.c b/sys/dev/misc/mse/mse.c index bdcf895a02..99e8345b70 100644 --- a/sys/dev/misc/mse/mse.c +++ b/sys/dev/misc/mse/mse.c @@ -12,7 +12,7 @@ * without express or implied warranty. * * $FreeBSD: src/sys/i386/isa/mse.c,v 1.49.2.1 2000/03/20 13:58:47 yokota Exp $ - * $DragonFly: src/sys/dev/misc/mse/mse.c,v 1.18 2006/09/10 01:26:34 dillon Exp $ + * $DragonFly: src/sys/dev/misc/mse/mse.c,v 1.19 2006/10/25 20:55:54 dillon Exp $ */ /* * Driver for the Logitech and ATI Inport Bus mice for use with 386bsd and @@ -53,15 +53,12 @@ #include #include #include -#include #include +#include +#include -#include -#include #include #include -#include -#include #include diff --git a/sys/dev/misc/musycc/musycc.c b/sys/dev/misc/musycc/musycc.c index 5cddf9bd4f..ab171f474d 100644 --- a/sys/dev/misc/musycc/musycc.c +++ b/sys/dev/misc/musycc/musycc.c @@ -7,7 +7,7 @@ * ---------------------------------------------------------------------------- * * $FreeBSD: src/sys/dev/musycc/musycc.c,v 1.17.2.3 2001/03/13 22:05:36 phk Exp $ - * $DragonFly: src/sys/dev/misc/musycc/musycc.c,v 1.7 2005/10/12 17:35:50 dillon Exp $ + * $DragonFly: src/sys/dev/misc/musycc/musycc.c,v 1.8 2006/10/25 20:55:54 dillon Exp $ * * * @@ -48,14 +48,14 @@ #include #include #include -#include -#include #include -#include + +#include + #include #include -#include "pci_if.h" +#include "pci_if.h" #include #include diff --git a/sys/dev/misc/orm/orm.c b/sys/dev/misc/orm/orm.c index 06b15c1b3b..12ba1c417a 100644 --- a/sys/dev/misc/orm/orm.c +++ b/sys/dev/misc/orm/orm.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/isa/orm.c,v 1.1.2.1 2001/06/19 05:48:29 imp Exp $ - * $DragonFly: src/sys/dev/misc/orm/orm.c,v 1.5 2005/10/30 04:41:15 dillon Exp $ + * $DragonFly: src/sys/dev/misc/orm/orm.c,v 1.6 2006/10/25 20:55:54 dillon Exp $ */ /* @@ -36,12 +36,8 @@ #include #include #include - #include #include - -#include -#include #include #include diff --git a/sys/dev/misc/pcfclock/pcfclock.c b/sys/dev/misc/pcfclock/pcfclock.c index 8047759527..a353ec8476 100644 --- a/sys/dev/misc/pcfclock/pcfclock.c +++ b/sys/dev/misc/pcfclock/pcfclock.c @@ -22,7 +22,7 @@ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/ppbus/pcfclock.c,v 1.3.2.1 2000/05/24 00:20:57 n_hibma Exp $ - * $DragonFly: src/sys/dev/misc/pcfclock/pcfclock.c,v 1.10 2006/09/10 01:26:34 dillon Exp $ + * $DragonFly: src/sys/dev/misc/pcfclock/pcfclock.c,v 1.11 2006/10/25 20:55:55 dillon Exp $ * */ @@ -39,8 +39,6 @@ #include #include -#include -#include #include /* for DELAY */ #include diff --git a/sys/dev/misc/ppc/ppc.c b/sys/dev/misc/ppc/ppc.c index 29e2c8fdd3..8370133964 100644 --- a/sys/dev/misc/ppc/ppc.c +++ b/sys/dev/misc/ppc/ppc.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/isa/ppc.c,v 1.26.2.5 2001/10/02 05:21:45 nsouch Exp $ - * $DragonFly: src/sys/dev/misc/ppc/ppc.c,v 1.12 2006/04/30 17:22:16 dillon Exp $ + * $DragonFly: src/sys/dev/misc/ppc/ppc.c,v 1.13 2006/10/25 20:55:55 dillon Exp $ * */ @@ -35,15 +35,13 @@ #include #include #include +#include #include #include #include #include -#include -#include #include -#include #include #include diff --git a/sys/dev/misc/ppi/ppi.c b/sys/dev/misc/ppi/ppi.c index e8b289a65c..d5bbcd4e8e 100644 --- a/sys/dev/misc/ppi/ppi.c +++ b/sys/dev/misc/ppi/ppi.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/ppbus/ppi.c,v 1.21.2.3 2000/08/07 18:24:43 peter Exp $ - * $DragonFly: src/sys/dev/misc/ppi/ppi.c,v 1.13 2006/09/10 01:26:34 dillon Exp $ + * $DragonFly: src/sys/dev/misc/ppi/ppi.c,v 1.14 2006/10/25 20:55:55 dillon Exp $ * */ #include "opt_ppb_1284.h" @@ -38,11 +38,9 @@ #include #include #include +#include #include -#include -#include -#include #include #include diff --git a/sys/dev/misc/pps/pps.c b/sys/dev/misc/pps/pps.c index 27384eb412..86484dc9c3 100644 --- a/sys/dev/misc/pps/pps.c +++ b/sys/dev/misc/pps/pps.c @@ -7,7 +7,7 @@ * ---------------------------------------------------------------------------- * * $FreeBSD: src/sys/dev/ppbus/pps.c,v 1.24.2.1 2000/05/24 00:20:57 n_hibma Exp $ - * $DragonFly: src/sys/dev/misc/pps/pps.c,v 1.16 2006/09/10 01:26:34 dillon Exp $ + * $DragonFly: src/sys/dev/misc/pps/pps.c,v 1.17 2006/10/25 20:55:55 dillon Exp $ * * This driver implements a draft-mogul-pps-api-02.txt PPS source. * @@ -26,14 +26,13 @@ #include #include #include -#include -#include #include #include -#include "ppbus_if.h" #include +#include "ppbus_if.h" + #define PPS_NAME "pps" /* our official name */ struct pps_data { diff --git a/sys/dev/misc/psm/psm.c b/sys/dev/misc/psm/psm.c index 98d1754316..59ef9c53d0 100644 --- a/sys/dev/misc/psm/psm.c +++ b/sys/dev/misc/psm/psm.c @@ -21,7 +21,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/isa/psm.c,v 1.23.2.7 2003/11/12 04:26:26 mikeh Exp $ - * $DragonFly: src/sys/dev/misc/psm/psm.c,v 1.20 2006/09/10 01:26:34 dillon Exp $ + * $DragonFly: src/sys/dev/misc/psm/psm.c,v 1.21 2006/10/25 20:55:55 dillon Exp $ */ /* @@ -74,7 +74,6 @@ #include #include #include -#include #include #include #include @@ -84,7 +83,6 @@ #include #include #include -#include #include #include diff --git a/sys/dev/misc/puc/puc.c b/sys/dev/misc/puc/puc.c index 475999dfd5..a9f55e21db 100644 --- a/sys/dev/misc/puc/puc.c +++ b/sys/dev/misc/puc/puc.c @@ -1,7 +1,7 @@ /* * $NetBSD: puc.c,v 1.7 2000/07/29 17:43:38 jlam Exp $ * $FreeBSD: src/sys/dev/puc/puc.c,v 1.3.2.5 2003/04/04 08:42:17 sobomax Exp $ - * $DragonFly: src/sys/dev/misc/puc/puc.c,v 1.9 2006/09/05 00:55:38 dillon Exp $ + * $DragonFly: src/sys/dev/misc/puc/puc.c,v 1.10 2006/10/25 20:55:55 dillon Exp $ */ /*- @@ -88,9 +88,6 @@ #include #include #include - -#include -#include #include #include diff --git a/sys/dev/misc/spic/spic.c b/sys/dev/misc/spic/spic.c index 6e129efecb..cc2872b51a 100644 --- a/sys/dev/misc/spic/spic.c +++ b/sys/dev/misc/spic/spic.c @@ -48,20 +48,15 @@ * also provided sample code upon which this driver was based. * * $FreeBSD: src/sys/i386/isa/spic.c,v 1.4.2.1 2002/04/15 00:52:12 will Exp $ - * $DragonFly: src/sys/dev/misc/spic/spic.c,v 1.14 2006/07/28 02:17:36 dillon Exp $ + * $DragonFly: src/sys/dev/misc/spic/spic.c,v 1.15 2006/10/25 20:55:55 dillon Exp $ */ #include #include #include #include -#include #include -#include -#include #include -#include -#include #include #include #include @@ -72,6 +67,11 @@ #include #include +#include + +#include +#include + #include "spicreg.h" static int spic_pollrate; diff --git a/sys/dev/misc/syscons/scgfbrndr.c b/sys/dev/misc/syscons/scgfbrndr.c index 7b22167842..3d40f8c13b 100644 --- a/sys/dev/misc/syscons/scgfbrndr.c +++ b/sys/dev/misc/syscons/scgfbrndr.c @@ -26,7 +26,7 @@ * Copyright (c) 2000 Andrew Miklic * * $FreeBSD: src/sys/dev/syscons/scgfbrndr.c,v 1.14.2.1 2001/11/01 08:33:15 obrien Exp $ - * $DragonFly: src/sys/dev/misc/syscons/scgfbrndr.c,v 1.5 2006/02/19 09:16:26 swildner Exp $ + * $DragonFly: src/sys/dev/misc/syscons/scgfbrndr.c,v 1.6 2006/10/25 20:55:55 dillon Exp $ */ #include "opt_syscons.h" @@ -37,8 +37,7 @@ #include #include #include - -#include +#include #include #include "syscons.h" diff --git a/sys/dev/misc/xrpu/xrpu.c b/sys/dev/misc/xrpu/xrpu.c index 7af6b6af71..d2d7b90c3e 100644 --- a/sys/dev/misc/xrpu/xrpu.c +++ b/sys/dev/misc/xrpu/xrpu.c @@ -7,7 +7,7 @@ * ---------------------------------------------------------------------------- * * $FreeBSD: src/sys/pci/xrpu.c,v 1.19.2.1 2000/08/02 22:19:57 peter Exp $ - * $DragonFly: src/sys/dev/misc/xrpu/Attic/xrpu.c,v 1.11 2006/09/10 01:26:35 dillon Exp $ + * $DragonFly: src/sys/dev/misc/xrpu/Attic/xrpu.c,v 1.12 2006/10/25 20:55:55 dillon Exp $ * * A very simple device driver for PCI cards based on Xilinx 6200 series * FPGA/RPU devices. Current Functionality is to allow you to open and @@ -27,11 +27,11 @@ #include #include #include -#include #include -#include + #include #include + #include "pci_if.h" /* diff --git a/sys/dev/netif/acx/acx100.c b/sys/dev/netif/acx/acx100.c index ed8cb2667c..ba9edfc736 100644 --- a/sys/dev/netif/acx/acx100.c +++ b/sys/dev/netif/acx/acx100.c @@ -31,7 +31,7 @@ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $DragonFly: src/sys/dev/netif/acx/acx100.c,v 1.4 2006/09/01 15:13:15 sephe Exp $ + * $DragonFly: src/sys/dev/netif/acx/acx100.c,v 1.5 2006/10/25 20:55:55 dillon Exp $ */ #include @@ -41,9 +41,6 @@ #include #include -#include -#include - #include #include #include diff --git a/sys/dev/netif/acx/acx111.c b/sys/dev/netif/acx/acx111.c index 70fe9f38cb..482b1c897d 100644 --- a/sys/dev/netif/acx/acx111.c +++ b/sys/dev/netif/acx/acx111.c @@ -31,7 +31,7 @@ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $DragonFly: src/sys/dev/netif/acx/acx111.c,v 1.5 2006/10/21 08:37:04 sephe Exp $ + * $DragonFly: src/sys/dev/netif/acx/acx111.c,v 1.6 2006/10/25 20:55:55 dillon Exp $ */ #include @@ -41,9 +41,6 @@ #include #include -#include -#include - #include #include #include diff --git a/sys/dev/netif/acx/acxcmd.c b/sys/dev/netif/acx/acxcmd.c index caef1a4740..248cdef7ff 100644 --- a/sys/dev/netif/acx/acxcmd.c +++ b/sys/dev/netif/acx/acxcmd.c @@ -31,7 +31,7 @@ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $DragonFly: src/sys/dev/netif/acx/acxcmd.c,v 1.2 2006/05/18 13:51:45 sephe Exp $ + * $DragonFly: src/sys/dev/netif/acx/acxcmd.c,v 1.3 2006/10/25 20:55:55 dillon Exp $ */ #include @@ -42,9 +42,6 @@ #include #include -#include -#include - #include #include #include diff --git a/sys/dev/netif/acx/if_acx.c b/sys/dev/netif/acx/if_acx.c index 2bc06e4a40..ec10d507a8 100644 --- a/sys/dev/netif/acx/if_acx.c +++ b/sys/dev/netif/acx/if_acx.c @@ -31,7 +31,7 @@ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $DragonFly: src/sys/dev/netif/acx/if_acx.c,v 1.7 2006/09/05 00:55:39 dillon Exp $ + * $DragonFly: src/sys/dev/netif/acx/if_acx.c,v 1.8 2006/10/25 20:55:55 dillon Exp $ */ /* @@ -84,9 +84,6 @@ #include #include -#include -#include - #include #include #include diff --git a/sys/dev/netif/an/if_an.c b/sys/dev/netif/an/if_an.c index 03cea55a65..ef37a1149f 100644 --- a/sys/dev/netif/an/if_an.c +++ b/sys/dev/netif/an/if_an.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/an/if_an.c,v 1.2.2.13 2003/02/11 03:32:48 ambrisko Exp $ - * $DragonFly: src/sys/dev/netif/an/if_an.c,v 1.38 2006/09/05 00:55:39 dillon Exp $ + * $DragonFly: src/sys/dev/netif/an/if_an.c,v 1.39 2006/10/25 20:55:55 dillon Exp $ */ /* @@ -105,9 +105,7 @@ #include #include #include -#include #include -#include #include #include diff --git a/sys/dev/netif/an/if_an_isa.c b/sys/dev/netif/an/if_an_isa.c index 24b6c942b1..95b8ae20f7 100644 --- a/sys/dev/netif/an/if_an_isa.c +++ b/sys/dev/netif/an/if_an_isa.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/an/if_an_isa.c,v 1.1.2.5 2003/02/01 03:25:12 ambrisko Exp $ - * $DragonFly: src/sys/dev/netif/an/if_an_isa.c,v 1.15 2005/12/11 01:54:08 swildner Exp $ + * $DragonFly: src/sys/dev/netif/an/if_an_isa.c,v 1.16 2006/10/25 20:55:55 dillon Exp $ */ /* @@ -55,9 +55,7 @@ #include #include -#include #include -#include #include #include diff --git a/sys/dev/netif/an/if_an_pccard.c b/sys/dev/netif/an/if_an_pccard.c index 17ae603446..194bbf9ae6 100644 --- a/sys/dev/netif/an/if_an_pccard.c +++ b/sys/dev/netif/an/if_an_pccard.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/an/if_an_pccard.c,v 1.1.2.6 2003/02/01 03:25:12 ambrisko Exp $ - * $DragonFly: src/sys/dev/netif/an/if_an_pccard.c,v 1.14 2005/11/28 17:13:38 dillon Exp $ + * $DragonFly: src/sys/dev/netif/an/if_an_pccard.c,v 1.15 2006/10/25 20:55:55 dillon Exp $ */ /* @@ -54,9 +54,7 @@ #include #include -#include #include -#include #include #include diff --git a/sys/dev/netif/an/if_an_pci.c b/sys/dev/netif/an/if_an_pci.c index 564a4894e0..07d77db18f 100644 --- a/sys/dev/netif/an/if_an_pci.c +++ b/sys/dev/netif/an/if_an_pci.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/an/if_an_pci.c,v 1.2.2.8 2003/02/11 03:32:48 ambrisko Exp $ - * $DragonFly: src/sys/dev/netif/an/if_an_pci.c,v 1.19 2005/12/11 01:54:08 swildner Exp $ + * $DragonFly: src/sys/dev/netif/an/if_an_pci.c,v 1.20 2006/10/25 20:55:55 dillon Exp $ */ /* @@ -69,9 +69,7 @@ #include #include -#include #include -#include #include #include diff --git a/sys/dev/netif/ar/if_ar.c b/sys/dev/netif/ar/if_ar.c index fd6f852bc2..6174d868d4 100644 --- a/sys/dev/netif/ar/if_ar.c +++ b/sys/dev/netif/ar/if_ar.c @@ -26,7 +26,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/ar/if_ar.c,v 1.66 2005/01/06 01:42:28 imp Exp $ - * $DragonFly: src/sys/dev/netif/ar/if_ar.c,v 1.18 2005/11/28 17:13:39 dillon Exp $ + * $DragonFly: src/sys/dev/netif/ar/if_ar.c,v 1.19 2006/10/25 20:55:55 dillon Exp $ */ /* @@ -57,12 +57,7 @@ #include #include #include -#include -#include -#include -#include #include - #include #include diff --git a/sys/dev/netif/ar/if_ar_isa.c b/sys/dev/netif/ar/if_ar_isa.c index a65b49b305..91e610a9aa 100644 --- a/sys/dev/netif/ar/if_ar_isa.c +++ b/sys/dev/netif/ar/if_ar_isa.c @@ -26,7 +26,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/ar/if_ar_isa.c,v 1.54 2005/01/06 01:42:28 imp Exp $ - * $DragonFly: src/sys/dev/netif/ar/if_ar_isa.c,v 1.4 2005/02/08 14:31:16 joerg Exp $ + * $DragonFly: src/sys/dev/netif/ar/if_ar_isa.c,v 1.5 2006/10/25 20:55:55 dillon Exp $ */ /* @@ -50,10 +50,6 @@ #include #include #include -#include -#include -#include -#include #include #include diff --git a/sys/dev/netif/ar/if_ar_pci.c b/sys/dev/netif/ar/if_ar_pci.c index 7e0fc0a102..7d59b909ce 100644 --- a/sys/dev/netif/ar/if_ar_pci.c +++ b/sys/dev/netif/ar/if_ar_pci.c @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/ar/if_ar_pci.c,v 1.11 2004/05/30 20:08:26 phk Exp $ - * $DragonFly: src/sys/dev/netif/ar/if_ar_pci.c,v 1.5 2006/08/01 18:00:54 swildner Exp $ + * $DragonFly: src/sys/dev/netif/ar/if_ar_pci.c,v 1.6 2006/10/25 20:55:55 dillon Exp $ */ #include @@ -36,10 +36,6 @@ #include #include #include -#include -#include -#include -#include #include #include diff --git a/sys/dev/netif/ath/ath/if_ath.c b/sys/dev/netif/ath/ath/if_ath.c index 5cbf61cc52..5bc460496e 100644 --- a/sys/dev/netif/ath/ath/if_ath.c +++ b/sys/dev/netif/ath/ath/if_ath.c @@ -34,7 +34,7 @@ * THE POSSIBILITY OF SUCH DAMAGES. * * $FreeBSD: src/sys/dev/ath/if_ath.c,v 1.94.2.17 2006/04/19 16:14:47 sam Exp $ - * $DragonFly: src/sys/dev/netif/ath/ath/if_ath.c,v 1.3 2006/09/05 00:55:39 dillon Exp $ + * $DragonFly: src/sys/dev/netif/ath/ath/if_ath.c,v 1.4 2006/10/25 20:55:55 dillon Exp $ */ /* @@ -60,9 +60,6 @@ #include #include #include - -#include -#include #include #include diff --git a/sys/dev/netif/ath/ath/if_ath_pci.c b/sys/dev/netif/ath/ath/if_ath_pci.c index a4ea4e3ea2..38678c804b 100644 --- a/sys/dev/netif/ath/ath/if_ath_pci.c +++ b/sys/dev/netif/ath/ath/if_ath_pci.c @@ -34,7 +34,7 @@ * THE POSSIBILITY OF SUCH DAMAGES. * * $FreeBSD: src/sys/dev/ath/if_ath_pci.c,v 1.12 2005/03/05 19:06:12 imp Exp $ - * $DragonFly: src/sys/dev/netif/ath/ath/if_ath_pci.c,v 1.1 2006/07/13 09:15:22 sephe Exp $ + * $DragonFly: src/sys/dev/netif/ath/ath/if_ath_pci.c,v 1.2 2006/10/25 20:55:55 dillon Exp $ */ /* @@ -47,9 +47,6 @@ #include #include #include - -#include -#include #include #include diff --git a/sys/dev/netif/ath/rate_amrr/amrr.c b/sys/dev/netif/ath/rate_amrr/amrr.c index affef791d8..2f0bd992f3 100644 --- a/sys/dev/netif/ath/rate_amrr/amrr.c +++ b/sys/dev/netif/ath/rate_amrr/amrr.c @@ -35,7 +35,7 @@ * THE POSSIBILITY OF SUCH DAMAGES. * * $FreeBSD: src/sys/dev/ath/ath_rate/amrr/amrr.c,v 1.8.2.3 2006/02/24 19:51:11 sam Exp $ - * $DragonFly: src/sys/dev/netif/ath/rate_amrr/amrr.c,v 1.2 2006/09/05 00:55:39 dillon Exp $ + * $DragonFly: src/sys/dev/netif/ath/rate_amrr/amrr.c,v 1.3 2006/10/25 20:55:55 dillon Exp $ */ /* @@ -53,9 +53,6 @@ #include #include #include - -#include -#include #include #include diff --git a/sys/dev/netif/ath/rate_onoe/onoe.c b/sys/dev/netif/ath/rate_onoe/onoe.c index b63213eb1f..daf91279e2 100644 --- a/sys/dev/netif/ath/rate_onoe/onoe.c +++ b/sys/dev/netif/ath/rate_onoe/onoe.c @@ -34,7 +34,7 @@ * THE POSSIBILITY OF SUCH DAMAGES. * * $FreeBSD: src/sys/dev/ath/ath_rate/onoe/onoe.c,v 1.8.2.3 2006/02/24 19:51:11 sam Exp $ - * $DragonFly: src/sys/dev/netif/ath/rate_onoe/onoe.c,v 1.2 2006/09/05 00:55:39 dillon Exp $ + * $DragonFly: src/sys/dev/netif/ath/rate_onoe/onoe.c,v 1.3 2006/10/25 20:55:55 dillon Exp $ */ /* @@ -49,9 +49,6 @@ #include #include #include - -#include -#include #include #include diff --git a/sys/dev/netif/ath/rate_sample/sample.c b/sys/dev/netif/ath/rate_sample/sample.c index 5e3503cb06..4f9de29ec9 100644 --- a/sys/dev/netif/ath/rate_sample/sample.c +++ b/sys/dev/netif/ath/rate_sample/sample.c @@ -34,7 +34,7 @@ * THE POSSIBILITY OF SUCH DAMAGES. * * $FreeBSD: src/sys/dev/ath/ath_rate/sample/sample.c,v 1.8.2.3 2006/03/14 23:22:27 sam Exp $ - * $DragonFly: src/sys/dev/netif/ath/rate_sample/sample.c,v 1.3 2006/09/05 00:55:39 dillon Exp $ + * $DragonFly: src/sys/dev/netif/ath/rate_sample/sample.c,v 1.4 2006/10/25 20:55:55 dillon Exp $ */ /* @@ -48,9 +48,6 @@ #include #include #include - -#include -#include #include #include diff --git a/sys/dev/netif/aue/if_aue.c b/sys/dev/netif/aue/if_aue.c index dc4d5b5f7e..4c6cd23713 100644 --- a/sys/dev/netif/aue/if_aue.c +++ b/sys/dev/netif/aue/if_aue.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/usb/if_aue.c,v 1.78 2003/12/17 14:23:07 sanpei Exp $ - * $DragonFly: src/sys/dev/netif/aue/if_aue.c,v 1.30 2006/09/05 00:55:39 dillon Exp $ + * $DragonFly: src/sys/dev/netif/aue/if_aue.c,v 1.31 2006/10/25 20:55:56 dillon Exp $ */ /* @@ -69,6 +69,7 @@ #include #include #include +#include #include #include @@ -76,12 +77,8 @@ #include #include #include - #include -#include -#include - #include #include #include diff --git a/sys/dev/netif/awi/am79c930.c b/sys/dev/netif/awi/am79c930.c index 4ba4e42f1f..5ae15cec03 100644 --- a/sys/dev/netif/awi/am79c930.c +++ b/sys/dev/netif/awi/am79c930.c @@ -1,6 +1,6 @@ /* $NetBSD: am79c930.c,v 1.5 2000/03/23 13:57:58 onoe Exp $ */ /* $FreeBSD: src/sys/dev/awi/am79c930.c,v 1.2.2.1 2000/12/07 04:09:39 imp Exp $ */ -/* $DragonFly: src/sys/dev/netif/awi/Attic/am79c930.c,v 1.7 2006/08/06 12:49:04 swildner Exp $ */ +/* $DragonFly: src/sys/dev/netif/awi/Attic/am79c930.c,v 1.8 2006/10/25 20:55:56 dillon Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -64,9 +64,9 @@ #include #include +#include #include -#include #include #include diff --git a/sys/dev/netif/awi/awi.c b/sys/dev/netif/awi/awi.c index 81be53d3d4..5378e1f271 100644 --- a/sys/dev/netif/awi/awi.c +++ b/sys/dev/netif/awi/awi.c @@ -35,7 +35,7 @@ * * $NetBSD: awi.c,v 1.26 2000/07/21 04:48:55 onoe Exp $ * $FreeBSD: src/sys/dev/awi/awi.c,v 1.10.2.2 2003/01/23 21:06:42 sam Exp $ - * $DragonFly: src/sys/dev/netif/awi/Attic/awi.c,v 1.27 2006/09/05 00:55:39 dillon Exp $ + * $DragonFly: src/sys/dev/netif/awi/Attic/awi.c,v 1.28 2006/10/25 20:55:56 dillon Exp $ */ /* * Driver for AMD 802.11 firmware. @@ -122,7 +122,6 @@ #include #include -#include #include #include diff --git a/sys/dev/netif/awi/awi_wep.c b/sys/dev/netif/awi/awi_wep.c index d47e2d17ea..a53b64741e 100644 --- a/sys/dev/netif/awi/awi_wep.c +++ b/sys/dev/netif/awi/awi_wep.c @@ -1,6 +1,6 @@ /* $NetBSD: awi_wep.c,v 1.4 2000/08/14 11:28:03 onoe Exp $ */ /* $FreeBSD: src/sys/dev/awi/awi_wep.c,v 1.3.2.2 2003/01/23 21:06:42 sam Exp $ */ -/* $DragonFly: src/sys/dev/netif/awi/Attic/awi_wep.c,v 1.16 2006/09/05 00:55:39 dillon Exp $ */ +/* $DragonFly: src/sys/dev/netif/awi/Attic/awi_wep.c,v 1.17 2006/10/25 20:55:56 dillon Exp $ */ /* * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -71,7 +71,6 @@ #include #include -#include #include #include diff --git a/sys/dev/netif/awi/awi_wicfg.c b/sys/dev/netif/awi/awi_wicfg.c index c587dcf180..0d782e4f18 100644 --- a/sys/dev/netif/awi/awi_wicfg.c +++ b/sys/dev/netif/awi/awi_wicfg.c @@ -1,6 +1,6 @@ /* $NetBSD: awi_wicfg.c,v 1.3 2000/07/06 17:22:25 onoe Exp $ */ /* $FreeBSD: src/sys/dev/awi/awi_wicfg.c,v 1.3.2.2 2002/06/18 08:06:15 jhay Exp $ */ -/* $DragonFly: src/sys/dev/netif/awi/Attic/awi_wicfg.c,v 1.10 2006/08/06 12:49:04 swildner Exp $ */ +/* $DragonFly: src/sys/dev/netif/awi/Attic/awi_wicfg.c,v 1.11 2006/10/25 20:55:56 dillon Exp $ */ /* * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -62,7 +62,6 @@ #include #include -#include #include #include diff --git a/sys/dev/netif/awi/if_awi_pccard.c b/sys/dev/netif/awi/if_awi_pccard.c index d00ad409c6..9ee05cd9cd 100644 --- a/sys/dev/netif/awi/if_awi_pccard.c +++ b/sys/dev/netif/awi/if_awi_pccard.c @@ -23,19 +23,15 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/awi/if_awi_pccard.c,v 1.5.2.1 2000/12/07 04:09:39 imp Exp $ - * $DragonFly: src/sys/dev/netif/awi/Attic/if_awi_pccard.c,v 1.16 2006/01/20 12:25:28 sephe Exp $ + * $DragonFly: src/sys/dev/netif/awi/Attic/if_awi_pccard.c,v 1.17 2006/10/25 20:55:56 dillon Exp $ */ #include #include #include #include - #include #include - -#include -#include #include #include diff --git a/sys/dev/netif/axe/if_axe.c b/sys/dev/netif/axe/if_axe.c index a2b2b64808..6e726f5b08 100644 --- a/sys/dev/netif/axe/if_axe.c +++ b/sys/dev/netif/axe/if_axe.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/usb/if_axe.c,v 1.10 2003/12/08 07:54:14 obrien Exp $ - * $DragonFly: src/sys/dev/netif/axe/if_axe.c,v 1.20 2006/09/05 00:55:39 dillon Exp $ + * $DragonFly: src/sys/dev/netif/axe/if_axe.c,v 1.21 2006/10/25 20:55:56 dillon Exp $ */ /* * ASIX Electronics AX88172 USB 2.0 ethernet driver. Used in the @@ -73,6 +73,7 @@ #include #include #include +#include #include #include @@ -84,9 +85,6 @@ #include -#include -#include - #include #include #include diff --git a/sys/dev/netif/bfe/if_bfe.c b/sys/dev/netif/bfe/if_bfe.c index 8b9bc759e8..d7badf443e 100644 --- a/sys/dev/netif/bfe/if_bfe.c +++ b/sys/dev/netif/bfe/if_bfe.c @@ -29,7 +29,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/bfe/if_bfe.c 1.4.4.7 2004/03/02 08:41:33 julian Exp v - * $DragonFly: src/sys/dev/netif/bfe/if_bfe.c,v 1.29 2006/06/24 06:31:30 sephe Exp $ + * $DragonFly: src/sys/dev/netif/bfe/if_bfe.c,v 1.30 2006/10/25 20:55:56 dillon Exp $ */ #include @@ -40,6 +40,8 @@ #include #include #include +#include +#include #include #include @@ -58,12 +60,6 @@ #include #include -#include -#include -#include -#include -#include - #include #include #include diff --git a/sys/dev/netif/bge/if_bge.c b/sys/dev/netif/bge/if_bge.c index 2d6a0f1642..ac79ff1103 100644 --- a/sys/dev/netif/bge/if_bge.c +++ b/sys/dev/netif/bge/if_bge.c @@ -31,7 +31,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/bge/if_bge.c,v 1.3.2.29 2003/12/01 21:06:59 ambrisko Exp $ - * $DragonFly: src/sys/dev/netif/bge/if_bge.c,v 1.55 2006/09/05 00:55:39 dillon Exp $ + * $DragonFly: src/sys/dev/netif/bge/if_bge.c,v 1.56 2006/10/25 20:55:56 dillon Exp $ * */ @@ -101,7 +101,6 @@ #include /* for vtophys */ #include /* for vtophys */ -#include #include #include diff --git a/sys/dev/netif/cm/if_cm_isa.c b/sys/dev/netif/cm/if_cm_isa.c index 17a1a756e9..1af61884cf 100644 --- a/sys/dev/netif/cm/if_cm_isa.c +++ b/sys/dev/netif/cm/if_cm_isa.c @@ -1,6 +1,6 @@ /* $NetBSD: if_bah_zbus.c,v 1.6 2000/01/23 21:06:12 aymeric Exp $ */ /* $FreeBSD: src/sys/dev/cm/if_cm_isa.c,v 1.1.2.1 2002/02/13 22:33:41 fjoe Exp $ */ -/* $DragonFly: src/sys/dev/netif/cm/Attic/if_cm_isa.c,v 1.15 2006/08/06 12:49:04 swildner Exp $ */ +/* $DragonFly: src/sys/dev/netif/cm/Attic/if_cm_isa.c,v 1.16 2006/10/25 20:55:56 dillon Exp $ */ /*- * Copyright (c) 1994, 1995, 1998 The NetBSD Foundation, Inc. @@ -42,12 +42,9 @@ #include #include #include -#include - #include #include - -#include +#include #include #include diff --git a/sys/dev/netif/cm/smc90cx6.c b/sys/dev/netif/cm/smc90cx6.c index 5c24aa718a..2a6791b1ee 100644 --- a/sys/dev/netif/cm/smc90cx6.c +++ b/sys/dev/netif/cm/smc90cx6.c @@ -1,6 +1,6 @@ /* $NetBSD: smc90cx6.c,v 1.38 2001/07/07 15:57:53 thorpej Exp $ */ /* $FreeBSD: src/sys/dev/cm/smc90cx6.c,v 1.1.2.3 2003/02/05 18:42:14 fjoe Exp $ */ -/* $DragonFly: src/sys/dev/netif/cm/Attic/smc90cx6.c,v 1.21 2006/08/06 12:49:04 swildner Exp $ */ +/* $DragonFly: src/sys/dev/netif/cm/Attic/smc90cx6.c,v 1.22 2006/10/25 20:55:56 dillon Exp $ */ /*- * Copyright (c) 1994, 1995, 1998 The NetBSD Foundation, Inc. @@ -54,12 +54,9 @@ #include #include #include -#include #include - -#include #include -#include +#include #include #include diff --git a/sys/dev/netif/cs/if_cs.c b/sys/dev/netif/cs/if_cs.c index 798ea254f4..030732f0b2 100644 --- a/sys/dev/netif/cs/if_cs.c +++ b/sys/dev/netif/cs/if_cs.c @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/cs/if_cs.c,v 1.19.2.1 2001/01/25 20:13:48 imp Exp $ - * $DragonFly: src/sys/dev/netif/cs/if_cs.c,v 1.26 2006/09/05 00:55:39 dillon Exp $ + * $DragonFly: src/sys/dev/netif/cs/if_cs.c,v 1.27 2006/10/25 20:55:56 dillon Exp $ */ /* @@ -46,13 +46,11 @@ #include #include #include -#include - #include #include -#include #include -#include +#include + #include #include diff --git a/sys/dev/netif/cs/if_cs_isa.c b/sys/dev/netif/cs/if_cs_isa.c index b9c0e44dc5..bb06055447 100644 --- a/sys/dev/netif/cs/if_cs_isa.c +++ b/sys/dev/netif/cs/if_cs_isa.c @@ -25,19 +25,15 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/cs/if_cs_isa.c,v 1.1.2.1 2001/01/25 20:13:48 imp Exp $ - * $DragonFly: src/sys/dev/netif/cs/if_cs_isa.c,v 1.7 2005/09/02 12:51:00 sephe Exp $ + * $DragonFly: src/sys/dev/netif/cs/if_cs_isa.c,v 1.8 2006/10/25 20:55:56 dillon Exp $ */ #include #include #include - #include #include -#include -#include - #include #include #include diff --git a/sys/dev/netif/cs/if_cs_pccard.c b/sys/dev/netif/cs/if_cs_pccard.c index 6bc5195b98..4e1c50c2b5 100644 --- a/sys/dev/netif/cs/if_cs_pccard.c +++ b/sys/dev/netif/cs/if_cs_pccard.c @@ -23,20 +23,16 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/cs/if_cs_pccard.c,v 1.1.2.1 2001/01/25 20:13:48 imp Exp $ - * $DragonFly: src/sys/dev/netif/cs/if_cs_pccard.c,v 1.7 2005/09/02 12:51:00 sephe Exp $ + * $DragonFly: src/sys/dev/netif/cs/if_cs_pccard.c,v 1.8 2006/10/25 20:55:56 dillon Exp $ */ #include #include #include #include - #include #include -#include -#include - #include #include #include diff --git a/sys/dev/netif/cue/if_cue.c b/sys/dev/netif/cue/if_cue.c index a6735b63f6..4639b3020d 100644 --- a/sys/dev/netif/cue/if_cue.c +++ b/sys/dev/netif/cue/if_cue.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/usb/if_cue.c,v 1.45 2003/12/08 07:54:14 obrien Exp $ - * $DragonFly: src/sys/dev/netif/cue/if_cue.c,v 1.25 2006/09/05 00:55:39 dillon Exp $ + * $DragonFly: src/sys/dev/netif/cue/if_cue.c,v 1.26 2006/10/25 20:55:56 dillon Exp $ */ /* @@ -58,18 +58,15 @@ #include #include #include +#include #include #include #include #include #include - #include -#include -#include - #include #include #include diff --git a/sys/dev/netif/dc/if_dc.c b/sys/dev/netif/dc/if_dc.c index 4d463aec30..eb0247123f 100644 --- a/sys/dev/netif/dc/if_dc.c +++ b/sys/dev/netif/dc/if_dc.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/pci/if_dc.c,v 1.9.2.45 2003/06/08 14:31:53 mux Exp $ - * $DragonFly: src/sys/dev/netif/dc/if_dc.c,v 1.52 2006/10/10 11:34:55 sephe Exp $ + * $DragonFly: src/sys/dev/netif/dc/if_dc.c,v 1.53 2006/10/25 20:55:56 dillon Exp $ */ /* @@ -100,6 +100,8 @@ #include #include #include +#include +#include #include #include @@ -115,12 +117,6 @@ #include /* for vtophys */ #include /* for vtophys */ -#include -#include -#include -#include -#include -#include #include "../mii_layer/mii.h" #include "../mii_layer/miivar.h" diff --git a/sys/dev/netif/de/if_de.c b/sys/dev/netif/de/if_de.c index 0aa7f16004..5602d8af9d 100644 --- a/sys/dev/netif/de/if_de.c +++ b/sys/dev/netif/de/if_de.c @@ -1,7 +1,7 @@ /* $NetBSD: if_de.c,v 1.86 1999/06/01 19:17:59 thorpej Exp $ */ /* $FreeBSD: src/sys/pci/if_de.c,v 1.123.2.4 2000/08/04 23:25:09 peter Exp $ */ -/* $DragonFly: src/sys/dev/netif/de/if_de.c,v 1.45 2006/09/05 03:48:10 dillon Exp $ */ +/* $DragonFly: src/sys/dev/netif/de/if_de.c,v 1.46 2006/10/25 20:55:56 dillon Exp $ */ /*- * Copyright (c) 1994-1997 Matt Thomas (matt@3am-software.com) @@ -48,11 +48,9 @@ #include #include #include -#include -#include -#include #include #include +#include #include "opt_inet.h" #include "opt_ipx.h" diff --git a/sys/dev/netif/ed/if_ed.c b/sys/dev/netif/ed/if_ed.c index 32f22cccfe..56e601b979 100644 --- a/sys/dev/netif/ed/if_ed.c +++ b/sys/dev/netif/ed/if_ed.c @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/ed/if_ed.c,v 1.224 2003/12/08 07:54:12 obrien Exp $ - * $DragonFly: src/sys/dev/netif/ed/if_ed.c,v 1.31 2006/08/06 12:49:05 swildner Exp $ + * $DragonFly: src/sys/dev/netif/ed/if_ed.c,v 1.32 2006/10/25 20:55:56 dillon Exp $ */ /* @@ -47,14 +47,10 @@ #include #include #include -#include - #include #include - -#include #include -#include +#include #include #include diff --git a/sys/dev/netif/ed/if_ed_isa.c b/sys/dev/netif/ed/if_ed_isa.c index 20e6f61b88..78d5fdbbb0 100644 --- a/sys/dev/netif/ed/if_ed_isa.c +++ b/sys/dev/netif/ed/if_ed_isa.c @@ -25,17 +25,15 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/ed/if_ed_isa.c,v 1.15 2003/10/31 18:31:58 brooks Exp $ - * $DragonFly: src/sys/dev/netif/ed/if_ed_isa.c,v 1.14 2005/12/31 14:07:59 sephe Exp $ + * $DragonFly: src/sys/dev/netif/ed/if_ed_isa.c,v 1.15 2006/10/25 20:55:56 dillon Exp $ */ #include #include #include #include - #include #include -#include #include #include diff --git a/sys/dev/netif/ed/if_ed_pccard.c b/sys/dev/netif/ed/if_ed_pccard.c index 0a55b290ea..b0c8581e49 100644 --- a/sys/dev/netif/ed/if_ed_pccard.c +++ b/sys/dev/netif/ed/if_ed_pccard.c @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/ed/if_ed_pccard.c,v 1.55 2003/12/31 04:25:00 kato Exp $ - * $DragonFly: src/sys/dev/netif/ed/if_ed_pccard.c,v 1.16 2006/01/28 15:07:52 sephe Exp $ + * $DragonFly: src/sys/dev/netif/ed/if_ed_pccard.c,v 1.17 2006/10/25 20:55:56 dillon Exp $ */ #include "opt_ed.h" @@ -36,12 +36,9 @@ #include #include #include - #include #include -#include #include -#include #include #include diff --git a/sys/dev/netif/ed/if_ed_pci.c b/sys/dev/netif/ed/if_ed_pci.c index 35834072e4..8a1b3cfc66 100644 --- a/sys/dev/netif/ed/if_ed_pci.c +++ b/sys/dev/netif/ed/if_ed_pci.c @@ -18,20 +18,16 @@ * are met. * * $FreeBSD: src/sys/dev/ed/if_ed_pci.c,v 1.34 2003/10/31 18:31:58 brooks Exp $ - * $DragonFly: src/sys/dev/netif/ed/if_ed_pci.c,v 1.13 2006/09/30 21:10:19 swildner Exp $ + * $DragonFly: src/sys/dev/netif/ed/if_ed_pci.c,v 1.14 2006/10/25 20:55:56 dillon Exp $ */ #include #include #include #include - #include #include - -#include #include -#include #include #include diff --git a/sys/dev/netif/em/if_em.h b/sys/dev/netif/em/if_em.h index 3678a97ae0..cbc2808ada 100644 --- a/sys/dev/netif/em/if_em.h +++ b/sys/dev/netif/em/if_em.h @@ -32,7 +32,7 @@ POSSIBILITY OF SUCH DAMAGE. ***************************************************************************/ /*$FreeBSD: src/sys/dev/em/if_em.h,v 1.1.2.13 2003/06/09 21:43:41 pdeuskar Exp $*/ -/*$DragonFly: src/sys/dev/netif/em/if_em.h,v 1.16 2006/08/12 13:03:44 sephe Exp $*/ +/*$DragonFly: src/sys/dev/netif/em/if_em.h,v 1.17 2006/10/25 20:55:56 dillon Exp $*/ #ifndef _EM_H_DEFINED_ #define _EM_H_DEFINED_ @@ -48,6 +48,12 @@ POSSIBILITY OF SUCH DAMAGE. #include #include #include +#include +#include +#include +#include +#include +#include #include #include @@ -65,19 +71,13 @@ POSSIBILITY OF SUCH DAMAGE. #include #include -#include -#include -#include -#include #include #include + #include + #include #include -#include -#include -#include -#include #include diff --git a/sys/dev/netif/em/if_em_osdep.h b/sys/dev/netif/em/if_em_osdep.h index 49545f360f..6a331026ba 100644 --- a/sys/dev/netif/em/if_em_osdep.h +++ b/sys/dev/netif/em/if_em_osdep.h @@ -32,7 +32,7 @@ POSSIBILITY OF SUCH DAMAGE. ***************************************************************************/ /*$FreeBSD: src/sys/dev/em/if_em_osdep.h,v 1.1.2.11 2003/06/09 21:43:41 pdeuskar Exp $*/ -/*$DragonFly: src/sys/dev/netif/em/if_em_osdep.h,v 1.6 2006/08/12 13:03:44 sephe Exp $*/ +/*$DragonFly: src/sys/dev/netif/em/if_em_osdep.h,v 1.7 2006/10/25 20:55:56 dillon Exp $*/ #ifndef _FREEBSD_OS_H_ #define _FREEBSD_OS_H_ @@ -46,16 +46,15 @@ POSSIBILITY OF SUCH DAMAGE. #include #include #include -#include -#include -#include + #include #include + #include + #include #include - #define ASSERT(x) if(!(x)) panic("EM: x") /* The happy-fun DELAY macro is defined in /usr/src/sys/i386/include/clock.h */ diff --git a/sys/dev/netif/ep/if_ep.c b/sys/dev/netif/ep/if_ep.c index 0f121761ca..434df2897e 100644 --- a/sys/dev/netif/ep/if_ep.c +++ b/sys/dev/netif/ep/if_ep.c @@ -39,7 +39,7 @@ /* * $FreeBSD: src/sys/dev/ep/if_ep.c,v 1.95.2.3 2002/03/06 07:26:35 imp Exp $ - * $DragonFly: src/sys/dev/netif/ep/if_ep.c,v 1.24 2006/01/28 14:05:57 sephe Exp $ + * $DragonFly: src/sys/dev/netif/ep/if_ep.c,v 1.25 2006/10/25 20:55:56 dillon Exp $ * * Promiscuous mode added and interrupt logic slightly changed * to reduce the number of adapter failures. Transceiver select @@ -69,14 +69,10 @@ #include #include #include -#include - #include #include - -#include -#include #include +#include #include #include diff --git a/sys/dev/netif/ep/if_ep_eisa.c b/sys/dev/netif/ep/if_ep_eisa.c index 4d2596071c..0ff1fd2a47 100644 --- a/sys/dev/netif/ep/if_ep_eisa.c +++ b/sys/dev/netif/ep/if_ep_eisa.c @@ -20,19 +20,15 @@ * are met. * * $FreeBSD: src/sys/dev/ep/if_ep_eisa.c,v 1.18 2000/01/14 07:14:00 peter Exp $ - * $DragonFly: src/sys/dev/netif/ep/if_ep_eisa.c,v 1.11 2005/11/28 17:13:42 dillon Exp $ + * $DragonFly: src/sys/dev/netif/ep/if_ep_eisa.c,v 1.12 2006/10/25 20:55:56 dillon Exp $ */ #include #include #include #include - #include #include - -#include -#include #include #include diff --git a/sys/dev/netif/ep/if_ep_isa.c b/sys/dev/netif/ep/if_ep_isa.c index 674fe0666f..7d927d83e1 100644 --- a/sys/dev/netif/ep/if_ep_isa.c +++ b/sys/dev/netif/ep/if_ep_isa.c @@ -28,19 +28,15 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/ep/if_ep_isa.c,v 1.8.2.1 2000/12/16 03:47:57 nyan Exp $ - * $DragonFly: src/sys/dev/netif/ep/if_ep_isa.c,v 1.12 2006/08/06 12:49:05 swildner Exp $ + * $DragonFly: src/sys/dev/netif/ep/if_ep_isa.c,v 1.13 2006/10/25 20:55:56 dillon Exp $ */ #include #include #include #include - #include #include - -#include -#include #include #include diff --git a/sys/dev/netif/ep/if_ep_pccard.c b/sys/dev/netif/ep/if_ep_pccard.c index fa35fdf733..133fbdd65d 100644 --- a/sys/dev/netif/ep/if_ep_pccard.c +++ b/sys/dev/netif/ep/if_ep_pccard.c @@ -28,7 +28,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/ep/if_ep_pccard.c,v 1.12.2.2 2000/08/08 23:55:02 peter Exp $ - * $DragonFly: src/sys/dev/netif/ep/if_ep_pccard.c,v 1.10 2005/12/31 14:07:59 sephe Exp $ + * $DragonFly: src/sys/dev/netif/ep/if_ep_pccard.c,v 1.11 2006/10/25 20:55:56 dillon Exp $ */ /* @@ -41,12 +41,8 @@ #include #include #include - #include #include - -#include -#include #include #include diff --git a/sys/dev/netif/ex/if_ex.c b/sys/dev/netif/ex/if_ex.c index 74f29a3388..00d3379a6b 100644 --- a/sys/dev/netif/ex/if_ex.c +++ b/sys/dev/netif/ex/if_ex.c @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/ex/if_ex.c,v 1.26.2.3 2001/03/05 05:33:20 imp Exp $ - * $DragonFly: src/sys/dev/netif/ex/if_ex.c,v 1.22 2006/08/06 12:49:05 swildner Exp $ + * $DragonFly: src/sys/dev/netif/ex/if_ex.c,v 1.23 2006/10/25 20:55:57 dillon Exp $ * * MAINTAINER: Matthew N. Dodd * @@ -45,15 +45,11 @@ #include #include #include -#include - #include #include -#include - -#include -#include #include +#include +#include #include #include @@ -65,6 +61,7 @@ #include #include + #include diff --git a/sys/dev/netif/ex/if_ex_isa.c b/sys/dev/netif/ex/if_ex_isa.c index 130ad9d8d2..3f55ec17ce 100644 --- a/sys/dev/netif/ex/if_ex_isa.c +++ b/sys/dev/netif/ex/if_ex_isa.c @@ -24,28 +24,24 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/ex/if_ex_isa.c,v 1.3.2.1 2001/03/05 05:33:20 imp Exp $ - * $DragonFly: src/sys/dev/netif/ex/if_ex_isa.c,v 1.11 2005/11/28 17:13:42 dillon Exp $ + * $DragonFly: src/sys/dev/netif/ex/if_ex_isa.c,v 1.12 2006/10/25 20:55:57 dillon Exp $ */ #include #include #include #include - #include #include +#include #include -#include -#include #include -#include #include #include #include - #include #include diff --git a/sys/dev/netif/ex/if_ex_pccard.c b/sys/dev/netif/ex/if_ex_pccard.c index c6dd281feb..7f4603fe46 100644 --- a/sys/dev/netif/ex/if_ex_pccard.c +++ b/sys/dev/netif/ex/if_ex_pccard.c @@ -24,21 +24,17 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/ex/if_ex_pccard.c,v 1.2.2.1 2001/03/05 05:33:20 imp Exp $ - * $DragonFly: src/sys/dev/netif/ex/if_ex_pccard.c,v 1.11 2005/12/31 14:07:59 sephe Exp $ + * $DragonFly: src/sys/dev/netif/ex/if_ex_pccard.c,v 1.12 2006/10/25 20:55:57 dillon Exp $ */ #include #include #include #include - #include #include -#include - -#include -#include #include +#include #include #include diff --git a/sys/dev/netif/fe/if_fe.c b/sys/dev/netif/fe/if_fe.c index 56101cca07..b9501570c7 100644 --- a/sys/dev/netif/fe/if_fe.c +++ b/sys/dev/netif/fe/if_fe.c @@ -22,7 +22,7 @@ /* * $FreeBSD: src/sys/dev/fe/if_fe.c,v 1.65.2.1 2000/09/22 10:01:47 nyan Exp $ - * $DragonFly: src/sys/dev/netif/fe/if_fe.c,v 1.25 2006/10/23 21:50:32 dillon Exp $ + * $DragonFly: src/sys/dev/netif/fe/if_fe.c,v 1.26 2006/10/25 20:55:57 dillon Exp $ * * Device driver for Fujitsu MB86960A/MB86965A based Ethernet cards. * Contributed by M. Sekiguchi. @@ -81,12 +81,9 @@ #include #include #include -#include - #include -#include #include -#include +#include #include #include diff --git a/sys/dev/netif/fe/if_fe_isa.c b/sys/dev/netif/fe/if_fe_isa.c index 2decaf513e..c88f316cf4 100644 --- a/sys/dev/netif/fe/if_fe_isa.c +++ b/sys/dev/netif/fe/if_fe_isa.c @@ -20,7 +20,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/fe/if_fe_isa.c,v 1.2.2.1 2000/09/22 10:01:47 nyan Exp $ - * $DragonFly: src/sys/dev/netif/fe/if_fe_isa.c,v 1.5 2006/10/23 21:50:32 dillon Exp $ + * $DragonFly: src/sys/dev/netif/fe/if_fe_isa.c,v 1.6 2006/10/25 20:55:57 dillon Exp $ */ #include "opt_fe.h" @@ -32,11 +32,9 @@ #include #include #include -#include - #include -#include -#include + +#include #include #include diff --git a/sys/dev/netif/fe/if_fe_pccard.c b/sys/dev/netif/fe/if_fe_pccard.c index 78d20b3cd2..c3c4fc7371 100644 --- a/sys/dev/netif/fe/if_fe_pccard.c +++ b/sys/dev/netif/fe/if_fe_pccard.c @@ -20,7 +20,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/fe/if_fe_pccard.c,v 1.2.2.1 2000/09/22 10:01:47 nyan Exp $ - * $DragonFly: src/sys/dev/netif/fe/if_fe_pccard.c,v 1.10 2006/10/23 21:50:32 dillon Exp $ + * $DragonFly: src/sys/dev/netif/fe/if_fe_pccard.c,v 1.11 2006/10/25 20:55:57 dillon Exp $ */ #include "opt_fe.h" @@ -31,11 +31,8 @@ #include #include #include -#include - #include -#include -#include +#include #include #include diff --git a/sys/dev/netif/fea/if_fea.c b/sys/dev/netif/fea/if_fea.c index 4ed42e8bfa..89a3aae3fb 100644 --- a/sys/dev/netif/fea/if_fea.c +++ b/sys/dev/netif/fea/if_fea.c @@ -22,7 +22,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/pdq/if_fea.c,v 1.19 2000/01/14 07:14:03 peter Exp $ - * $DragonFly: src/sys/dev/netif/fea/Attic/if_fea.c,v 1.12 2006/08/06 12:49:05 swildner Exp $ + * $DragonFly: src/sys/dev/netif/fea/Attic/if_fea.c,v 1.13 2006/10/25 20:55:57 dillon Exp $ */ /* @@ -42,10 +42,10 @@ #include #include -#include -#include #include + #include + #include #include diff --git a/sys/dev/netif/fwe/if_fwe.c b/sys/dev/netif/fwe/if_fwe.c index 7a68b327ca..1b5a2a782c 100644 --- a/sys/dev/netif/fwe/if_fwe.c +++ b/sys/dev/netif/fwe/if_fwe.c @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/firewire/if_fwe.c,v 1.27 2004/01/08 14:58:09 simokawa Exp $ - * $DragonFly: src/sys/dev/netif/fwe/if_fwe.c,v 1.26 2006/09/05 03:48:10 dillon Exp $ + * $DragonFly: src/sys/dev/netif/fwe/if_fwe.c,v 1.27 2006/10/25 20:55:57 dillon Exp $ */ #include "opt_inet.h" @@ -50,7 +50,6 @@ #include #include #include -#include #include #include diff --git a/sys/dev/netif/fxp/if_fxp.c b/sys/dev/netif/fxp/if_fxp.c index 52f0347a68..eb546d368f 100644 --- a/sys/dev/netif/fxp/if_fxp.c +++ b/sys/dev/netif/fxp/if_fxp.c @@ -26,7 +26,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.110.2.30 2003/06/12 16:47:05 mux Exp $ - * $DragonFly: src/sys/dev/netif/fxp/if_fxp.c,v 1.46 2006/09/23 01:59:16 sephe Exp $ + * $DragonFly: src/sys/dev/netif/fxp/if_fxp.c,v 1.47 2006/10/25 20:55:57 dillon Exp $ */ /* @@ -57,9 +57,7 @@ #include #include #include -#include #include -#include #include #include diff --git a/sys/dev/netif/gx/if_gx.c b/sys/dev/netif/gx/if_gx.c index ea3c2dfbb2..0d89d27405 100644 --- a/sys/dev/netif/gx/if_gx.c +++ b/sys/dev/netif/gx/if_gx.c @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/gx/if_gx.c,v 1.2.2.3 2001/12/14 19:51:39 jlemon Exp $ - * $DragonFly: src/sys/dev/netif/gx/Attic/if_gx.c,v 1.24 2006/08/01 18:03:53 swildner Exp $ + * $DragonFly: src/sys/dev/netif/gx/Attic/if_gx.c,v 1.25 2006/10/25 20:55:57 dillon Exp $ */ #include @@ -39,7 +39,8 @@ #include #include #include - +#include +#include #include #include @@ -62,11 +63,6 @@ #include /* for vtophys */ #include /* for vtophys */ #include /* for DELAY */ -#include -#include -#include -#include -#include #include #include diff --git a/sys/dev/netif/ipw/if_ipw.c b/sys/dev/netif/ipw/if_ipw.c index ec686fc7dc..6618ef1dd5 100644 --- a/sys/dev/netif/ipw/if_ipw.c +++ b/sys/dev/netif/ipw/if_ipw.c @@ -27,7 +27,7 @@ * * $Id: if_ipw.c,v 1.7.2.1 2005/01/13 20:01:03 damien Exp $ * $FreeBSD: src/sys/dev/ipw/if_ipw.c,v 1.7.2.4 2006/01/29 15:13:01 damien Exp $ - * $DragonFly: src/sys/dev/netif/ipw/Attic/if_ipw.c,v 1.16 2006/09/05 00:55:40 dillon Exp $ + * $DragonFly: src/sys/dev/netif/ipw/Attic/if_ipw.c,v 1.17 2006/10/25 20:55:57 dillon Exp $ */ /*- @@ -49,12 +49,10 @@ #include #include #include +#include #include -#include -#include #include -#include #include #include diff --git a/sys/dev/netif/iwi/if_iwi.c b/sys/dev/netif/iwi/if_iwi.c index edb8ba310f..416f7f4ff3 100644 --- a/sys/dev/netif/iwi/if_iwi.c +++ b/sys/dev/netif/iwi/if_iwi.c @@ -29,7 +29,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/iwi/if_iwi.c,v 1.8.2.6 2006/02/23 02:06:46 sam Exp $ - * $DragonFly: src/sys/dev/netif/iwi/if_iwi.c,v 1.15 2006/09/05 00:55:40 dillon Exp $ + * $DragonFly: src/sys/dev/netif/iwi/if_iwi.c,v 1.16 2006/10/25 20:55:57 dillon Exp $ */ /*- @@ -47,15 +47,12 @@ #include #include #include -#include #include #include #include -#include - -#include -#include +#include #include +#include #include #include diff --git a/sys/dev/netif/kue/if_kue.c b/sys/dev/netif/kue/if_kue.c index 69e8c9ddf5..50545a8d6e 100644 --- a/sys/dev/netif/kue/if_kue.c +++ b/sys/dev/netif/kue/if_kue.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/usb/if_kue.c,v 1.17.2.9 2003/04/13 02:39:25 murray Exp $ - * $DragonFly: src/sys/dev/netif/kue/if_kue.c,v 1.21 2006/09/05 03:48:10 dillon Exp $ + * $DragonFly: src/sys/dev/netif/kue/if_kue.c,v 1.22 2006/10/25 20:55:57 dillon Exp $ */ /* @@ -72,6 +72,7 @@ #include #include #include +#include #include #include @@ -79,14 +80,9 @@ #include #include #include - #include -#include -#include -#if defined(__DragonFly__) || __FreeBSD_version < 500000 #include -#endif #include #include diff --git a/sys/dev/netif/lge/if_lge.c b/sys/dev/netif/lge/if_lge.c index a19f547894..19c3b67798 100644 --- a/sys/dev/netif/lge/if_lge.c +++ b/sys/dev/netif/lge/if_lge.c @@ -31,7 +31,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/lge/if_lge.c,v 1.5.2.2 2001/12/14 19:49:23 jlemon Exp $ - * $DragonFly: src/sys/dev/netif/lge/if_lge.c,v 1.36 2006/08/01 18:05:02 swildner Exp $ + * $DragonFly: src/sys/dev/netif/lge/if_lge.c,v 1.37 2006/10/25 20:55:57 dillon Exp $ */ /* @@ -95,8 +95,6 @@ #include /* for vtophys */ #include /* for vtophys */ -#include -#include #include #include diff --git a/sys/dev/netif/lnc/am7990.c b/sys/dev/netif/lnc/am7990.c index ca37b7f0fb..290a0cb084 100644 --- a/sys/dev/netif/lnc/am7990.c +++ b/sys/dev/netif/lnc/am7990.c @@ -1,6 +1,6 @@ /* $NetBSD: am7990.c,v 1.68 2005/12/11 12:21:25 christos Exp $ */ /* $FreeBSD: src/sys/dev/le/am7990.c,v 1.3 2006/05/16 21:04:01 marius Exp $ */ -/* $DragonFly: src/sys/dev/netif/lnc/am7990.c,v 1.1 2006/07/07 14:16:29 sephe Exp $ */ +/* $DragonFly: src/sys/dev/netif/lnc/am7990.c,v 1.2 2006/10/25 20:55:57 dillon Exp $ */ /*- * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. @@ -78,6 +78,7 @@ #include #include #include +#include #include #include @@ -89,8 +90,6 @@ #include #include -#include - #include #include #include diff --git a/sys/dev/netif/lnc/am79900.c b/sys/dev/netif/lnc/am79900.c index a9635776a1..01cff9718c 100644 --- a/sys/dev/netif/lnc/am79900.c +++ b/sys/dev/netif/lnc/am79900.c @@ -1,6 +1,6 @@ /* $NetBSD: am79900.c,v 1.17 2005/12/24 20:27:29 perry Exp $ */ /* $FreeBSD: src/sys/dev/le/am79900.c,v 1.3 2006/05/16 21:04:01 marius Exp $ */ -/* $DragonFly: src/sys/dev/netif/lnc/am79900.c,v 1.1 2006/07/07 14:16:29 sephe Exp $ */ +/* $DragonFly: src/sys/dev/netif/lnc/am79900.c,v 1.2 2006/10/25 20:55:57 dillon Exp $ */ /*- @@ -118,6 +118,7 @@ #include #include #include +#include #include #include @@ -128,8 +129,6 @@ #include #include -#include - #include #include #include diff --git a/sys/dev/netif/lnc/if_lnc_isa.c b/sys/dev/netif/lnc/if_lnc_isa.c index 2883e39b02..5fdc07f628 100644 --- a/sys/dev/netif/lnc/if_lnc_isa.c +++ b/sys/dev/netif/lnc/if_lnc_isa.c @@ -1,6 +1,6 @@ /* $NetBSD: if_le_isa.c,v 1.41 2005/12/24 20:27:41 perry Exp $ */ /* $FreeBSD: src/sys/dev/le/if_le_isa.c,v 1.1 2006/05/17 21:25:22 marius Exp $ */ -/* $DragonFly: src/sys/dev/netif/lnc/if_lnc_isa.c,v 1.9 2006/07/07 14:16:29 sephe Exp $ */ +/* $DragonFly: src/sys/dev/netif/lnc/if_lnc_isa.c,v 1.10 2006/10/25 20:55:57 dillon Exp $ */ /*- * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. @@ -89,9 +89,6 @@ #include #include -#include -#include - #include #include diff --git a/sys/dev/netif/lnc/if_lnc_pci.c b/sys/dev/netif/lnc/if_lnc_pci.c index 0ec1800d4e..32857c401d 100644 --- a/sys/dev/netif/lnc/if_lnc_pci.c +++ b/sys/dev/netif/lnc/if_lnc_pci.c @@ -1,6 +1,6 @@ /* $NetBSD: if_le_pci.c,v 1.43 2005/12/11 12:22:49 christos Exp $ */ /* $FreeBSD: src/sys/dev/le/if_le_pci.c,v 1.4 2006/06/05 15:14:14 marius Exp $ */ -/* $DragonFly: src/sys/dev/netif/lnc/if_lnc_pci.c,v 1.10 2006/07/07 14:16:29 sephe Exp $ */ +/* $DragonFly: src/sys/dev/netif/lnc/if_lnc_pci.c,v 1.11 2006/10/25 20:55:57 dillon Exp $ */ /*- @@ -90,9 +90,6 @@ #include #include -#include -#include - #include #include diff --git a/sys/dev/netif/lnc/lance.c b/sys/dev/netif/lnc/lance.c index b8bfc2bc03..81c40609c2 100644 --- a/sys/dev/netif/lnc/lance.c +++ b/sys/dev/netif/lnc/lance.c @@ -1,6 +1,6 @@ /* $NetBSD: lance.c,v 1.34 2005/12/24 20:27:30 perry Exp $ */ /* $FreeBSD: src/sys/dev/le/lance.c,v 1.2 2006/05/16 21:04:01 marius Exp $ */ -/* $DragonFly: src/sys/dev/netif/lnc/lance.c,v 1.4 2006/10/10 00:04:10 hsu Exp $ */ +/* $DragonFly: src/sys/dev/netif/lnc/lance.c,v 1.5 2006/10/25 20:55:57 dillon Exp $ */ /*- @@ -91,8 +91,6 @@ #include #include -#include - #include #include diff --git a/sys/dev/netif/mii_layer/brgphy.c b/sys/dev/netif/mii_layer/brgphy.c index 7960d12dde..f4422cf6b8 100644 --- a/sys/dev/netif/mii_layer/brgphy.c +++ b/sys/dev/netif/mii_layer/brgphy.c @@ -32,7 +32,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/mii/brgphy.c,v 1.1.2.7 2003/05/11 18:00:55 ps Exp $ - * $DragonFly: src/sys/dev/netif/mii_layer/brgphy.c,v 1.13 2006/08/06 10:32:23 sephe Exp $ + * $DragonFly: src/sys/dev/netif/mii_layer/brgphy.c,v 1.14 2006/10/25 20:55:57 dillon Exp $ */ /* @@ -46,7 +46,6 @@ #include #include -#include #include #include diff --git a/sys/dev/netif/mii_layer/ciphy.c b/sys/dev/netif/mii_layer/ciphy.c index 6624c4a980..d1c3e4d590 100644 --- a/sys/dev/netif/mii_layer/ciphy.c +++ b/sys/dev/netif/mii_layer/ciphy.c @@ -32,7 +32,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/mii/ciphy.c,v 1.3 2005/09/30 19:39:27 imp Exp $ - * $DragonFly: src/sys/dev/netif/mii_layer/ciphy.c,v 1.2 2006/08/06 10:32:23 sephe Exp $ + * $DragonFly: src/sys/dev/netif/mii_layer/ciphy.c,v 1.3 2006/10/25 20:55:57 dillon Exp $ */ /* @@ -46,8 +46,6 @@ #include #include -#include - #include #include #include diff --git a/sys/dev/netif/mii_layer/dcphy.c b/sys/dev/netif/mii_layer/dcphy.c index c5950515b6..acec627e01 100644 --- a/sys/dev/netif/mii_layer/dcphy.c +++ b/sys/dev/netif/mii_layer/dcphy.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/mii/dcphy.c,v 1.2.2.2 2000/10/14 00:44:40 wpaul Exp $ - * $DragonFly: src/sys/dev/netif/mii_layer/dcphy.c,v 1.9 2006/08/06 10:32:23 sephe Exp $ + * $DragonFly: src/sys/dev/netif/mii_layer/dcphy.c,v 1.10 2006/10/25 20:55:57 dillon Exp $ */ /* @@ -58,12 +58,6 @@ #include "miivar.h" #include "miidevs.h" -#include -#include -#include -#include -#include - #include #include "../dc/if_dcreg.h" diff --git a/sys/dev/netif/mii_layer/pnphy.c b/sys/dev/netif/mii_layer/pnphy.c index a021775a24..4770e1f469 100644 --- a/sys/dev/netif/mii_layer/pnphy.c +++ b/sys/dev/netif/mii_layer/pnphy.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/mii/pnphy.c,v 1.1.2.1 2002/11/08 21:53:49 semenu Exp $ - * $DragonFly: src/sys/dev/netif/mii_layer/pnphy.c,v 1.10 2006/08/06 10:32:23 sephe Exp $ + * $DragonFly: src/sys/dev/netif/mii_layer/pnphy.c,v 1.11 2006/10/25 20:55:57 dillon Exp $ */ /* @@ -57,11 +57,6 @@ #include "miidevs.h" #include -#include -#include -#include -#include -#include #include "../dc/if_dcreg.h" diff --git a/sys/dev/netif/mii_layer/rgephy.c b/sys/dev/netif/mii_layer/rgephy.c index 70c016ed5c..3da89b3cd1 100644 --- a/sys/dev/netif/mii_layer/rgephy.c +++ b/sys/dev/netif/mii_layer/rgephy.c @@ -32,7 +32,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/mii/rgephy.c,v 1.7 2005/09/30 19:39:27 imp Exp $ - * $DragonFly: src/sys/dev/netif/mii_layer/rgephy.c,v 1.3 2006/08/19 09:33:37 sephe Exp $ + * $DragonFly: src/sys/dev/netif/mii_layer/rgephy.c,v 1.4 2006/10/25 20:55:57 dillon Exp $ */ /* @@ -46,7 +46,6 @@ #include #include -#include #include #include @@ -62,8 +61,6 @@ #include "miibus_if.h" -#include - static int rgephy_probe(device_t); static int rgephy_attach(device_t); diff --git a/sys/dev/netif/mii_layer/rlphy.c b/sys/dev/netif/mii_layer/rlphy.c index 4c0c64b3ca..f3c45d6fbc 100644 --- a/sys/dev/netif/mii_layer/rlphy.c +++ b/sys/dev/netif/mii_layer/rlphy.c @@ -32,7 +32,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/mii/rlphy.c,v 1.2.2.4 2002/11/08 21:53:49 semenu Exp $ - * $DragonFly: src/sys/dev/netif/mii_layer/rlphy.c,v 1.10 2006/08/06 10:32:23 sephe Exp $ + * $DragonFly: src/sys/dev/netif/mii_layer/rlphy.c,v 1.11 2006/10/25 20:55:57 dillon Exp $ */ /* @@ -53,7 +53,6 @@ #include "miivar.h" #include "miidevs.h" -#include #include "../rl/if_rlreg.h" #include "miibus_if.h" diff --git a/sys/dev/netif/mii_layer/tlphy.c b/sys/dev/netif/mii_layer/tlphy.c index 246d36901d..656c803b54 100644 --- a/sys/dev/netif/mii_layer/tlphy.c +++ b/sys/dev/netif/mii_layer/tlphy.c @@ -37,7 +37,7 @@ * POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/mii/tlphy.c,v 1.2.2.2 2001/07/29 22:48:37 kris Exp $ - * $DragonFly: src/sys/dev/netif/mii_layer/tlphy.c,v 1.10 2006/09/05 00:55:40 dillon Exp $ + * $DragonFly: src/sys/dev/netif/mii_layer/tlphy.c,v 1.11 2006/10/25 20:55:57 dillon Exp $ */ /* @@ -82,7 +82,6 @@ #include #include -#include #include #include diff --git a/sys/dev/netif/mn/if_mn.c b/sys/dev/netif/mn/if_mn.c index 8dbf82524a..6c43a412a8 100644 --- a/sys/dev/netif/mn/if_mn.c +++ b/sys/dev/netif/mn/if_mn.c @@ -22,7 +22,7 @@ * this gadget. * * $FreeBSD: src/sys/pci/if_mn.c,v 1.11.2.3 2001/01/23 12:47:09 phk Exp $ - * $DragonFly: src/sys/dev/netif/mn/if_mn.c,v 1.13 2006/09/05 03:48:10 dillon Exp $ + * $DragonFly: src/sys/dev/netif/mn/if_mn.c,v 1.14 2006/10/25 20:55:57 dillon Exp $ */ /* @@ -35,23 +35,20 @@ #define NG_MN_NODE_TYPE "mn" #include +#include #include #include #include #include -#include #include +#include #include #include #include "pci_if.h" -#include -#include #include -#include - #include #include diff --git a/sys/dev/netif/my/if_my.c b/sys/dev/netif/my/if_my.c index 322122ff70..88ce5f994b 100644 --- a/sys/dev/netif/my/if_my.c +++ b/sys/dev/netif/my/if_my.c @@ -26,7 +26,7 @@ * Written by: yen_cw@myson.com.tw available at: http://www.myson.com.tw/ * * $FreeBSD: src/sys/dev/my/if_my.c,v 1.2.2.4 2002/04/17 02:05:27 julian Exp $ - * $DragonFly: src/sys/dev/netif/my/if_my.c,v 1.25 2006/09/05 03:48:10 dillon Exp $ + * $DragonFly: src/sys/dev/netif/my/if_my.c,v 1.26 2006/10/25 20:55:58 dillon Exp $ * * Myson fast ethernet PCI NIC driver * @@ -43,6 +43,8 @@ #include #include #include +#include +#include #include @@ -57,12 +59,6 @@ #include /* for vtophys */ #include /* for vtophys */ #include /* for DELAY */ -#include -#include -#include -#include -#include -#include #include #include diff --git a/sys/dev/netif/ndis/if_ndis.c b/sys/dev/netif/ndis/if_ndis.c index cb5e576ea1..ba16cf97d2 100644 --- a/sys/dev/netif/ndis/if_ndis.c +++ b/sys/dev/netif/ndis/if_ndis.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/if_ndis/if_ndis.c,v 1.65 2004/07/07 17:46:30 wpaul Exp $ - * $DragonFly: src/sys/dev/netif/ndis/if_ndis.c,v 1.18 2006/09/13 06:59:24 swildner Exp $ + * $DragonFly: src/sys/dev/netif/ndis/if_ndis.c,v 1.19 2006/10/25 20:55:58 dillon Exp $ */ #include @@ -43,7 +43,10 @@ #include #include #include +#include +#include #include +#include #include #include @@ -55,13 +58,6 @@ #include -#include -#include -#include -#include -#include -#include - #include #include @@ -70,8 +66,6 @@ #include #include -#include - #include #include #include diff --git a/sys/dev/netif/ndis/if_ndis_pccard.c b/sys/dev/netif/ndis/if_ndis_pccard.c index 2a4e4e6ab8..4eb415d670 100644 --- a/sys/dev/netif/ndis/if_ndis_pccard.c +++ b/sys/dev/netif/ndis/if_ndis_pccard.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/if_ndis/if_ndis_pccard.c,v 1.6 2004/07/11 00:19:30 wpaul Exp $ - * $DragonFly: src/sys/dev/netif/ndis/if_ndis_pccard.c,v 1.5 2006/08/06 12:49:05 swildner Exp $ + * $DragonFly: src/sys/dev/netif/ndis/if_ndis_pccard.c,v 1.6 2006/10/25 20:55:58 dillon Exp $ */ #include @@ -42,16 +42,13 @@ #include #include #include +#include +#include #include #include #include -#include -#include -#include -#include - #include #include diff --git a/sys/dev/netif/ndis/if_ndis_pci.c b/sys/dev/netif/ndis/if_ndis_pci.c index 6b03eda977..9a3767a829 100644 --- a/sys/dev/netif/ndis/if_ndis_pci.c +++ b/sys/dev/netif/ndis/if_ndis_pci.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/if_ndis/if_ndis_pci.c,v 1.7 2004/07/11 00:19:30 wpaul Exp $ - * $DragonFly: src/sys/dev/netif/ndis/if_ndis_pci.c,v 1.4 2006/08/06 12:49:05 swildner Exp $ + * $DragonFly: src/sys/dev/netif/ndis/if_ndis_pci.c,v 1.5 2006/10/25 20:55:58 dillon Exp $ */ #include @@ -41,16 +41,13 @@ #include #include #include +#include +#include #include #include #include -#include -#include -#include -#include - #include #include diff --git a/sys/dev/netif/nfe/if_nfe.c b/sys/dev/netif/nfe/if_nfe.c index 9c7a5269a1..10126829e7 100644 --- a/sys/dev/netif/nfe/if_nfe.c +++ b/sys/dev/netif/nfe/if_nfe.c @@ -1,5 +1,5 @@ /* $OpenBSD: if_nfe.c,v 1.63 2006/06/17 18:00:43 brad Exp $ */ -/* $DragonFly: src/sys/dev/netif/nfe/if_nfe.c,v 1.3 2006/09/16 06:37:11 sephe Exp $ */ +/* $DragonFly: src/sys/dev/netif/nfe/if_nfe.c,v 1.4 2006/10/25 20:55:58 dillon Exp $ */ /* * Copyright (c) 2006 The DragonFly Project. All rights reserved. @@ -68,9 +68,6 @@ #include #include -#include -#include - #include #include #include diff --git a/sys/dev/netif/nge/if_nge.c b/sys/dev/netif/nge/if_nge.c index e2edf49383..2a9867dd0f 100644 --- a/sys/dev/netif/nge/if_nge.c +++ b/sys/dev/netif/nge/if_nge.c @@ -31,7 +31,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/nge/if_nge.c,v 1.13.2.13 2003/02/05 22:03:57 mbr Exp $ - * $DragonFly: src/sys/dev/netif/nge/if_nge.c,v 1.38 2006/08/01 18:05:43 swildner Exp $ + * $DragonFly: src/sys/dev/netif/nge/if_nge.c,v 1.39 2006/10/25 20:55:58 dillon Exp $ */ /* @@ -98,7 +98,8 @@ #include #include #include - +#include +#include #include #include @@ -114,10 +115,6 @@ #include /* for vtophys */ #include /* for vtophys */ -#include -#include -#include -#include #include #include diff --git a/sys/dev/netif/nv/if_nv.c b/sys/dev/netif/nv/if_nv.c index 4e8262bf41..002cdbc112 100644 --- a/sys/dev/netif/nv/if_nv.c +++ b/sys/dev/netif/nv/if_nv.c @@ -26,7 +26,7 @@ * * $Id: if_nv.c,v 1.20 2005/03/12 01:11:00 q Exp $ * $FreeBSD: src/sys/dev/nve/if_nve.c,v 1.20 2005/12/12 06:23:43 bz Exp $ - * $DragonFly: src/sys/dev/netif/nv/Attic/if_nv.c,v 1.27 2006/01/29 22:10:11 corecode Exp $ + * $DragonFly: src/sys/dev/netif/nv/Attic/if_nv.c,v 1.28 2006/10/25 20:55:58 dillon Exp $ */ /* @@ -88,6 +88,9 @@ #include #include #include +#include +#include +#include #include #include @@ -98,19 +101,11 @@ #include #include - #include -#include -#include -#include - #include /* for vtophys */ #include /* for vtophys */ #include /* for DELAY */ -#include -#include -#include #include #include diff --git a/sys/dev/netif/pcn/if_pcn.c b/sys/dev/netif/pcn/if_pcn.c index 055fb1063c..148edb48b1 100644 --- a/sys/dev/netif/pcn/if_pcn.c +++ b/sys/dev/netif/pcn/if_pcn.c @@ -31,7 +31,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/pci/if_pcn.c,v 1.5.2.10 2003/03/05 18:42:33 njl Exp $ - * $DragonFly: src/sys/dev/netif/pcn/if_pcn.c,v 1.30 2006/08/01 18:06:14 swildner Exp $ + * $DragonFly: src/sys/dev/netif/pcn/if_pcn.c,v 1.31 2006/10/25 20:55:58 dillon Exp $ */ /* @@ -64,6 +64,8 @@ #include #include #include +#include +#include #include #include @@ -77,13 +79,8 @@ #include /* for vtophys */ #include /* for vtophys */ + #include /* for DELAY */ -#include -#include -#include -#include -#include -#include #include "../mii_layer/mii.h" #include "../mii_layer/miivar.h" diff --git a/sys/dev/netif/pdq_layer/pdqvar.h b/sys/dev/netif/pdq_layer/pdqvar.h index 12c0627a9c..b68516369a 100644 --- a/sys/dev/netif/pdq_layer/pdqvar.h +++ b/sys/dev/netif/pdq_layer/pdqvar.h @@ -22,7 +22,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/pdq/pdqvar.h,v 1.3.2.1 2002/05/14 21:02:11 gallatin Exp $ - * $DragonFly: src/sys/dev/netif/pdq_layer/Attic/pdqvar.h,v 1.10 2006/09/05 03:48:10 dillon Exp $ + * $DragonFly: src/sys/dev/netif/pdq_layer/Attic/pdqvar.h,v 1.11 2006/10/25 20:55:58 dillon Exp $ * */ @@ -67,6 +67,8 @@ enum _pdq_type_t { #include #endif /* M_CAST */ #include +#include + #include #include @@ -96,12 +98,11 @@ enum _pdq_type_t { #define PDQ_OS_MEMFREE_CONTIG(p, n) kmem_free(kernel_map, (vm_offset_t) p, n) #endif /* __FreeBSD__ */ -#if defined(__DragonFly__) || defined(__FreeBSD__) #include #include -#include #include #include + typedef void ifnet_ret_t; typedef u_long ioctl_cmd_t; typedef enum { PDQ_BUS_EISA, PDQ_BUS_PCI } pdq_bus_t; @@ -109,49 +110,6 @@ typedef u_int16_t pdq_bus_ioport_t; typedef volatile pdq_uint32_t *pdq_bus_memaddr_t; typedef pdq_bus_memaddr_t pdq_bus_memoffset_t; -#elif defined(__bsdi__) -#include -typedef int ifnet_ret_t; -typedef int ioctl_cmd_t; -typedef enum { PDQ_BUS_EISA, PDQ_BUS_PCI } pdq_bus_t; -typedef u_int16_t pdq_bus_ioport_t; -typedef volatile pdq_uint32_t *pdq_bus_memaddr_t; -typedef pdq_bus_memaddr_t pdq_bus_memoffset_t; - - -#elif defined(__NetBSD__) -#include -#include -#define PDQ_OS_PTR_FMT "%p" -typedef void ifnet_ret_t; -typedef u_long ioctl_cmd_t; -typedef bus_chipset_tag_t pdq_bus_t; -typedef bus_io_handle_t pdq_bus_ioport_t; -#if defined(PDQ_IOMAPPED) -typedef bus_io_handle_t pdq_bus_memaddr_t; -#else -typedef bus_mem_handle_t pdq_bus_memaddr_t; -#endif -typedef pdq_uint32_t pdq_bus_memoffset_t; -#define PDQ_OS_IOMEM -#define PDQ_OS_IORD_32(t, base, offset) bus_io_read_4 (t, base, offset) -#define PDQ_OS_IOWR_32(t, base, offset, data) bus_io_write_4 (t, base, offset, data) -#define PDQ_OS_IORD_8(t, base, offset) bus_io_read_1 (t, base, offset) -#define PDQ_OS_IOWR_8(t, base, offset, data) bus_io_write_1 (t, base, offset, data) -#define PDQ_OS_MEMRD_32(t, base, offset) bus_mem_read_4(t, base, offset) -#define PDQ_OS_MEMWR_32(t, base, offset, data) bus_mem_write_4(t, base, offset, data) -#define PDQ_CSR_OFFSET(base, offset) (0 + (offset)*sizeof(pdq_uint32_t)) - -#if defined(PDQ_IOMAPPED) -#define PDQ_CSR_WRITE(csr, name, data) PDQ_OS_IOWR_32((csr)->csr_bus, (csr)->csr_base, (csr)->name, data) -#define PDQ_CSR_READ(csr, name) PDQ_OS_IORD_32((csr)->csr_bus, (csr)->csr_base, (csr)->name) -#else -#define PDQ_CSR_WRITE(csr, name, data) PDQ_OS_MEMWR_32((csr)->csr_bus, (csr)->csr_base, (csr)->name, data) -#define PDQ_CSR_READ(csr, name) PDQ_OS_MEMRD_32((csr)->csr_bus, (csr)->csr_base, (csr)->name) -#endif - -#endif - #if !defined(PDQ_OS_PTR_FMT) #define PDQ_OS_PTR_FMT "0x%x" #endif diff --git a/sys/dev/netif/plip/if_plip.c b/sys/dev/netif/plip/if_plip.c index eeae51a413..9628ce2b56 100644 --- a/sys/dev/netif/plip/if_plip.c +++ b/sys/dev/netif/plip/if_plip.c @@ -25,7 +25,7 @@ * * From Id: lpt.c,v 1.55.2.1 1996/11/12 09:08:38 phk Exp * $FreeBSD: src/sys/dev/ppbus/if_plip.c,v 1.19.2.1 2000/05/24 00:20:57 n_hibma Exp $ - * $DragonFly: src/sys/dev/netif/plip/if_plip.c,v 1.17 2006/09/05 00:55:40 dillon Exp $ + * $DragonFly: src/sys/dev/netif/plip/if_plip.c,v 1.18 2006/10/25 20:55:58 dillon Exp $ */ /* @@ -90,12 +90,10 @@ #include #include #include +#include #include #include -#include -#include -#include #include #include diff --git a/sys/dev/netif/ral/if_ral_pci.c b/sys/dev/netif/ral/if_ral_pci.c index faa4b68068..ca688c4f44 100644 --- a/sys/dev/netif/ral/if_ral_pci.c +++ b/sys/dev/netif/ral/if_ral_pci.c @@ -15,7 +15,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * * $FreeBSD: src/sys/dev/ral/if_ral_pci.c,v 1.4 2006/03/05 23:27:51 silby Exp $ - * $DragonFly: src/sys/dev/netif/ral/if_ral_pci.c,v 1.2 2006/08/01 18:06:44 swildner Exp $ + * $DragonFly: src/sys/dev/netif/ral/if_ral_pci.c,v 1.3 2006/10/25 20:55:58 dillon Exp $ */ /* @@ -32,11 +32,8 @@ #include #include #include -#include - -#include -#include #include +#include #include #include diff --git a/sys/dev/netif/ral/rt2560.c b/sys/dev/netif/ral/rt2560.c index 27d1795dfe..05b3971812 100644 --- a/sys/dev/netif/ral/rt2560.c +++ b/sys/dev/netif/ral/rt2560.c @@ -15,7 +15,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * * $FreeBSD: src/sys/dev/ral/rt2560.c,v 1.3 2006/03/21 21:15:43 damien Exp $ - * $DragonFly: src/sys/dev/netif/ral/rt2560.c,v 1.2 2006/09/05 00:55:40 dillon Exp $ + * $DragonFly: src/sys/dev/netif/ral/rt2560.c,v 1.3 2006/10/25 20:55:58 dillon Exp $ */ /* @@ -33,13 +33,11 @@ #include #include #include +#include #include #include -#include -#include #include -#include #include #include diff --git a/sys/dev/netif/ral/rt2661.c b/sys/dev/netif/ral/rt2661.c index 632617cf82..a4b30b5157 100644 --- a/sys/dev/netif/ral/rt2661.c +++ b/sys/dev/netif/ral/rt2661.c @@ -15,7 +15,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * * $FreeBSD: src/sys/dev/ral/rt2661.c,v 1.4 2006/03/21 21:15:43 damien Exp $ - * $DragonFly: src/sys/dev/netif/ral/rt2661.c,v 1.3 2006/09/05 00:55:40 dillon Exp $ + * $DragonFly: src/sys/dev/netif/ral/rt2661.c,v 1.4 2006/10/25 20:55:58 dillon Exp $ */ /* @@ -33,12 +33,10 @@ #include #include #include +#include #include -#include -#include #include -#include #include #include diff --git a/sys/dev/netif/ray/if_ray.c b/sys/dev/netif/ray/if_ray.c index be95a794b4..c4a458c67a 100644 --- a/sys/dev/netif/ray/if_ray.c +++ b/sys/dev/netif/ray/if_ray.c @@ -29,7 +29,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/ray/if_ray.c,v 1.47.2.4 2001/08/14 22:54:05 dmlb Exp $ - * $DragonFly: src/sys/dev/netif/ray/Attic/if_ray.c,v 1.29 2006/08/06 12:49:06 swildner Exp $ + * $DragonFly: src/sys/dev/netif/ray/Attic/if_ray.c,v 1.30 2006/10/25 20:55:58 dillon Exp $ * */ @@ -247,17 +247,14 @@ #include #include #include - -#include -#include -#include #include #include - #include #include #include +#include + #include #include #include diff --git a/sys/dev/netif/re/if_re.c b/sys/dev/netif/re/if_re.c index 4e8e3270e6..21d7f791c4 100644 --- a/sys/dev/netif/re/if_re.c +++ b/sys/dev/netif/re/if_re.c @@ -33,7 +33,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/re/if_re.c,v 1.25 2004/06/09 14:34:01 naddy Exp $ - * $DragonFly: src/sys/dev/netif/re/if_re.c,v 1.26 2006/10/16 14:15:51 sephe Exp $ + * $DragonFly: src/sys/dev/netif/re/if_re.c,v 1.27 2006/10/25 20:55:58 dillon Exp $ */ /* @@ -123,6 +123,8 @@ #include #include #include +#include +#include #include #include @@ -136,13 +138,6 @@ #include -#include -#include -#include -#include -#include -#include - #include #include diff --git a/sys/dev/netif/rl/if_rl.c b/sys/dev/netif/rl/if_rl.c index 855e4cae53..7a0d1431c9 100644 --- a/sys/dev/netif/rl/if_rl.c +++ b/sys/dev/netif/rl/if_rl.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/pci/if_rl.c,v 1.38.2.16 2003/03/05 18:42:33 njl Exp $ - * $DragonFly: src/sys/dev/netif/rl/if_rl.c,v 1.33 2006/10/07 02:57:30 sephe Exp $ + * $DragonFly: src/sys/dev/netif/rl/if_rl.c,v 1.34 2006/10/25 20:55:58 dillon Exp $ */ /* @@ -96,6 +96,8 @@ #include #include #include +#include +#include #include #include @@ -107,13 +109,6 @@ #include -#include -#include -#include -#include -#include -#include - #include #include diff --git a/sys/dev/netif/rtw/if_rtw_pci.c b/sys/dev/netif/rtw/if_rtw_pci.c index 5eafccdf79..fc0e85b283 100644 --- a/sys/dev/netif/rtw/if_rtw_pci.c +++ b/sys/dev/netif/rtw/if_rtw_pci.c @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * $NetBSD: if_rtw_pci.c,v 1.4 2005/12/04 17:44:02 christos Exp $ - * $DragonFly: src/sys/dev/netif/rtw/if_rtw_pci.c,v 1.1 2006/09/03 07:37:58 sephe Exp $ + * $DragonFly: src/sys/dev/netif/rtw/if_rtw_pci.c,v 1.2 2006/10/25 20:55:58 dillon Exp $ */ /* @@ -82,9 +82,6 @@ #include #include -#include -#include - #include #include #include diff --git a/sys/dev/netif/rtw/rtw.c b/sys/dev/netif/rtw/rtw.c index 898d40909b..d7270f15ca 100644 --- a/sys/dev/netif/rtw/rtw.c +++ b/sys/dev/netif/rtw/rtw.c @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * $NetBSD: rtw.c,v 1.72 2006/03/28 00:48:10 dyoung Exp $ - * $DragonFly: src/sys/dev/netif/rtw/rtw.c,v 1.2 2006/09/05 00:55:41 dillon Exp $ + * $DragonFly: src/sys/dev/netif/rtw/rtw.c,v 1.3 2006/10/25 20:55:58 dillon Exp $ */ /* @@ -80,9 +80,6 @@ #include #include -#include -#include - #include #include #include diff --git a/sys/dev/netif/rtw/rtwphy.c b/sys/dev/netif/rtw/rtwphy.c index 33745be2ed..7c1547413e 100644 --- a/sys/dev/netif/rtw/rtwphy.c +++ b/sys/dev/netif/rtw/rtwphy.c @@ -29,7 +29,7 @@ * OF SUCH DAMAGE. * * $NetBSD: rtwphy.c,v 1.9 2006/03/08 00:24:06 dyoung Exp $ - * $DragonFly: src/sys/dev/netif/rtw/rtwphy.c,v 1.2 2006/09/05 00:55:41 dillon Exp $ + * $DragonFly: src/sys/dev/netif/rtw/rtwphy.c,v 1.3 2006/10/25 20:55:58 dillon Exp $ */ /* @@ -41,8 +41,6 @@ #include #include -#include - #include #include #include diff --git a/sys/dev/netif/rtw/rtwphyio.c b/sys/dev/netif/rtw/rtwphyio.c index b60cbe3616..9bace43a2e 100644 --- a/sys/dev/netif/rtw/rtwphyio.c +++ b/sys/dev/netif/rtw/rtwphyio.c @@ -29,7 +29,7 @@ * OF SUCH DAMAGE. * * $NetBSD: rtwphyio.c,v 1.11 2006/03/08 00:24:06 dyoung Exp $ - * $DragonFly: src/sys/dev/netif/rtw/rtwphyio.c,v 1.1 2006/09/03 07:37:58 sephe Exp $ + * $DragonFly: src/sys/dev/netif/rtw/rtwphyio.c,v 1.2 2006/10/25 20:55:58 dillon Exp $ */ /* @@ -41,8 +41,6 @@ #include #include -#include - #include #include #include diff --git a/sys/dev/netif/rtw/smc93cx6.c b/sys/dev/netif/rtw/smc93cx6.c index d8e3b171bc..dbfcecb1d9 100644 --- a/sys/dev/netif/rtw/smc93cx6.c +++ b/sys/dev/netif/rtw/smc93cx6.c @@ -20,7 +20,7 @@ * * $FreeBSD: src/sys/dev/aic7xxx/93cx6.c,v 1.5 2000/01/07 23:08:17 gibbs Exp $ * $NetBSD: smc93cx6.c,v 1.12 2005/12/11 12:21:28 christos Exp $ - * $DragonFly: src/sys/dev/netif/rtw/smc93cx6.c,v 1.1 2006/09/03 07:37:58 sephe Exp $ + * $DragonFly: src/sys/dev/netif/rtw/smc93cx6.c,v 1.2 2006/10/25 20:55:58 dillon Exp $ */ /* @@ -61,10 +61,7 @@ #include #include - -#include -#include -#include +#include #include "smc93cx6var.h" diff --git a/sys/dev/netif/rue/if_rue.c b/sys/dev/netif/rue/if_rue.c index 6d25e8dcef..cc35efade0 100644 --- a/sys/dev/netif/rue/if_rue.c +++ b/sys/dev/netif/rue/if_rue.c @@ -55,7 +55,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/usb/if_rue.c,v 1.14 2004/06/09 14:34:03 naddy Exp $ - * $DragonFly: src/sys/dev/netif/rue/if_rue.c,v 1.6 2006/09/05 00:55:41 dillon Exp $ + * $DragonFly: src/sys/dev/netif/rue/if_rue.c,v 1.7 2006/10/25 20:55:58 dillon Exp $ */ /* @@ -73,6 +73,7 @@ #include #include #include +#include #include #include @@ -83,9 +84,6 @@ #include -#include -#include - #include #include #include diff --git a/sys/dev/netif/sbni/if_sbni.c b/sys/dev/netif/sbni/if_sbni.c index 6671485252..dffd41d2d0 100644 --- a/sys/dev/netif/sbni/if_sbni.c +++ b/sys/dev/netif/sbni/if_sbni.c @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/sbni/if_sbni.c,v 1.1.2.4 2002/08/11 09:32:00 fjoe Exp $ - * $DragonFly: src/sys/dev/netif/sbni/if_sbni.c,v 1.23 2005/11/28 17:13:43 dillon Exp $ + * $DragonFly: src/sys/dev/netif/sbni/if_sbni.c,v 1.24 2006/10/25 20:55:58 dillon Exp $ */ /* @@ -70,11 +70,9 @@ #include #include #include -#include - -#include +#include #include -#include +#include #include #include diff --git a/sys/dev/netif/sbni/if_sbni_pci.c b/sys/dev/netif/sbni/if_sbni_pci.c index 7990f266da..e7eec004be 100644 --- a/sys/dev/netif/sbni/if_sbni_pci.c +++ b/sys/dev/netif/sbni/if_sbni_pci.c @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/sbni/if_sbni_pci.c,v 1.6 2002/09/28 20:59:59 phk Exp $ - * $DragonFly: src/sys/dev/netif/sbni/if_sbni_pci.c,v 1.12 2006/09/05 03:48:10 dillon Exp $ + * $DragonFly: src/sys/dev/netif/sbni/if_sbni_pci.c,v 1.13 2006/10/25 20:55:58 dillon Exp $ */ @@ -35,8 +35,6 @@ #include #include #include -#include -#include #include #include diff --git a/sys/dev/netif/sbsh/if_sbsh.c b/sys/dev/netif/sbsh/if_sbsh.c index 6664c404ab..aa9993ee2e 100644 --- a/sys/dev/netif/sbsh/if_sbsh.c +++ b/sys/dev/netif/sbsh/if_sbsh.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/sbsh/if_sbsh.c,v 1.3.2.1 2003/04/15 18:15:07 fjoe Exp $ - * $DragonFly: src/sys/dev/netif/sbsh/if_sbsh.c,v 1.23 2005/12/31 14:08:00 sephe Exp $ + * $DragonFly: src/sys/dev/netif/sbsh/if_sbsh.c,v 1.24 2006/10/25 20:55:58 dillon Exp $ */ #include @@ -37,6 +37,8 @@ #include #include #include +#include +#include #include #include @@ -49,10 +51,6 @@ #include #include -#include -#include -#include -#include #include #include diff --git a/sys/dev/netif/sf/if_sf.c b/sys/dev/netif/sf/if_sf.c index ffc95de316..8111fd60f3 100644 --- a/sys/dev/netif/sf/if_sf.c +++ b/sys/dev/netif/sf/if_sf.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/pci/if_sf.c,v 1.18.2.8 2001/12/16 15:46:07 luigi Exp $ - * $DragonFly: src/sys/dev/netif/sf/if_sf.c,v 1.28 2006/08/01 18:08:24 swildner Exp $ + * $DragonFly: src/sys/dev/netif/sf/if_sf.c,v 1.29 2006/10/25 20:55:59 dillon Exp $ */ /* @@ -88,7 +88,8 @@ #include #include #include - +#include +#include #include #include @@ -102,13 +103,8 @@ #include /* for vtophys */ #include /* for vtophys */ + #include /* for DELAY */ -#include -#include -#include -#include -#include -#include #include "../mii_layer/mii.h" #include "../mii_layer/miivar.h" diff --git a/sys/dev/netif/sis/if_sis.c b/sys/dev/netif/sis/if_sis.c index afc13c58fd..3386bda966 100644 --- a/sys/dev/netif/sis/if_sis.c +++ b/sys/dev/netif/sis/if_sis.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/pci/if_sis.c,v 1.13.4.24 2003/03/05 18:42:33 njl Exp $ - * $DragonFly: src/sys/dev/netif/sis/if_sis.c,v 1.35 2006/09/05 00:55:41 dillon Exp $ + * $DragonFly: src/sys/dev/netif/sis/if_sis.c,v 1.36 2006/10/25 20:55:59 dillon Exp $ */ /* @@ -70,6 +70,8 @@ #include #include #include +#include +#include #include #include @@ -82,13 +84,6 @@ #include -#include -#include -#include -#include -#include -#include - #include #include diff --git a/sys/dev/netif/sk/if_sk.c b/sys/dev/netif/sk/if_sk.c index 43c0c11315..039ac27635 100644 --- a/sys/dev/netif/sk/if_sk.c +++ b/sys/dev/netif/sk/if_sk.c @@ -31,7 +31,7 @@ * * $OpenBSD: if_sk.c,v 1.33 2003/08/12 05:23:06 nate Exp $ * $FreeBSD: src/sys/pci/if_sk.c,v 1.19.2.9 2003/03/05 18:42:34 njl Exp $ - * $DragonFly: src/sys/dev/netif/sk/if_sk.c,v 1.47 2006/10/16 14:22:38 sephe Exp $ + * $DragonFly: src/sys/dev/netif/sk/if_sk.c,v 1.48 2006/10/25 20:55:59 dillon Exp $ */ /* @@ -95,6 +95,8 @@ #include #include #include +#include +#include #include #include @@ -108,10 +110,6 @@ #include /* for vtophys */ #include /* for vtophys */ -#include -#include -#include -#include #include #include diff --git a/sys/dev/netif/sn/if_sn.c b/sys/dev/netif/sn/if_sn.c index 197b46bb3d..6ee8ec4585 100644 --- a/sys/dev/netif/sn/if_sn.c +++ b/sys/dev/netif/sn/if_sn.c @@ -29,7 +29,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/sn/if_sn.c,v 1.7.2.3 2001/02/04 04:38:38 toshi Exp $ - * $DragonFly: src/sys/dev/netif/sn/if_sn.c,v 1.25 2005/12/31 14:08:00 sephe Exp $ + * $DragonFly: src/sys/dev/netif/sn/if_sn.c,v 1.26 2006/10/25 20:55:59 dillon Exp $ */ /* @@ -92,14 +92,10 @@ #include #include #include -#include - #include #include - -#include -#include #include +#include #include #include diff --git a/sys/dev/netif/sn/if_sn_isa.c b/sys/dev/netif/sn/if_sn_isa.c index 2cb960b02b..e3950dd7f9 100644 --- a/sys/dev/netif/sn/if_sn_isa.c +++ b/sys/dev/netif/sn/if_sn_isa.c @@ -28,19 +28,15 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/sn/if_sn_isa.c,v 1.3.2.1 2001/01/25 19:38:18 imp Exp $ - * $DragonFly: src/sys/dev/netif/sn/if_sn_isa.c,v 1.3 2003/08/07 21:17:05 dillon Exp $ + * $DragonFly: src/sys/dev/netif/sn/if_sn_isa.c,v 1.4 2006/10/25 20:55:59 dillon Exp $ */ #include #include #include - #include #include -#include -#include - #include #include #include diff --git a/sys/dev/netif/sn/if_sn_pccard.c b/sys/dev/netif/sn/if_sn_pccard.c index 210d81ffd1..0e312d0f07 100644 --- a/sys/dev/netif/sn/if_sn_pccard.c +++ b/sys/dev/netif/sn/if_sn_pccard.c @@ -23,7 +23,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/sn/if_sn_pccard.c,v 1.3.2.2 2001/01/25 19:40:27 imp Exp $ - * $DragonFly: src/sys/dev/netif/sn/if_sn_pccard.c,v 1.7 2005/12/31 14:08:00 sephe Exp $ + * $DragonFly: src/sys/dev/netif/sn/if_sn_pccard.c,v 1.8 2006/10/25 20:55:59 dillon Exp $ */ /* @@ -37,12 +37,8 @@ #include #include #include - #include #include - -#include -#include #include #include diff --git a/sys/dev/netif/sr/if_sr.c b/sys/dev/netif/sr/if_sr.c index 5f1a37e8f2..4c659e78b0 100644 --- a/sys/dev/netif/sr/if_sr.c +++ b/sys/dev/netif/sr/if_sr.c @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/sr/if_sr.c,v 1.48.2.1 2002/06/17 15:10:58 jhay Exp $ - * $DragonFly: src/sys/dev/netif/sr/if_sr.c,v 1.18 2006/09/05 00:55:41 dillon Exp $ + * $DragonFly: src/sys/dev/netif/sr/if_sr.c,v 1.19 2006/10/25 20:55:59 dillon Exp $ */ /* @@ -62,10 +62,6 @@ #include #include #include -#include -#include -#include -#include #include #include diff --git a/sys/dev/netif/sr/if_sr_isa.c b/sys/dev/netif/sr/if_sr_isa.c index dd76aae965..0e36480e96 100644 --- a/sys/dev/netif/sr/if_sr_isa.c +++ b/sys/dev/netif/sr/if_sr_isa.c @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/sr/if_sr_isa.c,v 1.46.2.1 2002/06/17 15:10:58 jhay Exp $ - * $DragonFly: src/sys/dev/netif/sr/if_sr_isa.c,v 1.4 2005/08/29 10:19:52 sephe Exp $ + * $DragonFly: src/sys/dev/netif/sr/if_sr_isa.c,v 1.5 2006/10/25 20:55:59 dillon Exp $ */ #include @@ -39,10 +39,6 @@ #include /* malloc region definitions */ #include #include -#include -#include -#include -#include #include #include diff --git a/sys/dev/netif/sr/if_sr_pci.c b/sys/dev/netif/sr/if_sr_pci.c index c79c9a9e21..6a7e212244 100644 --- a/sys/dev/netif/sr/if_sr_pci.c +++ b/sys/dev/netif/sr/if_sr_pci.c @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/sr/if_sr_pci.c,v 1.15.2.1 2002/06/17 15:10:58 jhay Exp $ - * $DragonFly: src/sys/dev/netif/sr/if_sr_pci.c,v 1.4 2005/08/29 10:19:52 sephe Exp $ + * $DragonFly: src/sys/dev/netif/sr/if_sr_pci.c,v 1.5 2006/10/25 20:55:59 dillon Exp $ */ @@ -37,10 +37,6 @@ #include #include #include -#include -#include -#include -#include #include #include diff --git a/sys/dev/netif/ste/if_ste.c b/sys/dev/netif/ste/if_ste.c index acd8c50070..bae6ef732e 100644 --- a/sys/dev/netif/ste/if_ste.c +++ b/sys/dev/netif/ste/if_ste.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/pci/if_ste.c,v 1.14.2.9 2003/02/05 22:03:57 mbr Exp $ - * $DragonFly: src/sys/dev/netif/ste/if_ste.c,v 1.34 2006/08/01 18:10:05 swildner Exp $ + * $DragonFly: src/sys/dev/netif/ste/if_ste.c,v 1.35 2006/10/25 20:55:59 dillon Exp $ */ #include @@ -41,6 +41,8 @@ #include #include #include +#include +#include #include #include @@ -55,12 +57,6 @@ #include /* for vtophys */ #include /* for vtophys */ -#include -#include -#include -#include -#include -#include #include "../mii_layer/mii.h" #include "../mii_layer/miivar.h" diff --git a/sys/dev/netif/ti/if_ti.c b/sys/dev/netif/ti/if_ti.c index 445959c1b8..ad4f3ab134 100644 --- a/sys/dev/netif/ti/if_ti.c +++ b/sys/dev/netif/ti/if_ti.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/pci/if_ti.c,v 1.25.2.14 2002/02/15 04:20:20 silby Exp $ - * $DragonFly: src/sys/dev/netif/ti/if_ti.c,v 1.41 2006/09/05 00:55:41 dillon Exp $ + * $DragonFly: src/sys/dev/netif/ti/if_ti.c,v 1.42 2006/10/25 20:55:59 dillon Exp $ */ /* @@ -88,6 +88,8 @@ #include #include #include +#include +#include #include #include @@ -107,10 +109,6 @@ #include /* for vtophys */ #include /* for vtophys */ -#include -#include -#include -#include #include #include diff --git a/sys/dev/netif/tl/if_tl.c b/sys/dev/netif/tl/if_tl.c index d728a14c5c..1ed59287fd 100644 --- a/sys/dev/netif/tl/if_tl.c +++ b/sys/dev/netif/tl/if_tl.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/pci/if_tl.c,v 1.51.2.5 2001/12/16 15:46:08 luigi Exp $ - * $DragonFly: src/sys/dev/netif/tl/if_tl.c,v 1.36 2006/07/14 18:57:34 corecode Exp $ + * $DragonFly: src/sys/dev/netif/tl/if_tl.c,v 1.37 2006/10/25 20:55:59 dillon Exp $ */ /* @@ -187,6 +187,8 @@ #include #include #include +#include +#include #include #include @@ -200,12 +202,6 @@ #include /* for vtophys */ #include /* for vtophys */ -#include -#include -#include -#include -#include -#include #include "../mii_layer/mii.h" #include "../mii_layer/miivar.h" diff --git a/sys/dev/netif/tx/if_tx.c b/sys/dev/netif/tx/if_tx.c index 7baf97f0c7..9e1c37fe7c 100644 --- a/sys/dev/netif/tx/if_tx.c +++ b/sys/dev/netif/tx/if_tx.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/tx/if_tx.c,v 1.61.2.1 2002/10/29 01:43:49 semenu Exp $ - * $DragonFly: src/sys/dev/netif/tx/if_tx.c,v 1.37 2006/09/05 03:48:10 dillon Exp $ + * $DragonFly: src/sys/dev/netif/tx/if_tx.c,v 1.38 2006/10/25 20:55:59 dillon Exp $ */ /* @@ -48,6 +48,8 @@ #include #include #include +#include +#include #include #include @@ -63,12 +65,6 @@ #include /* for vtophys */ #include /* for vtophys */ -#include -#include -#include -#include -#include -#include #include #include diff --git a/sys/dev/netif/txp/if_txp.c b/sys/dev/netif/txp/if_txp.c index 6648aee852..a8bcd327dc 100644 --- a/sys/dev/netif/txp/if_txp.c +++ b/sys/dev/netif/txp/if_txp.c @@ -1,6 +1,6 @@ /* $OpenBSD: if_txp.c,v 1.48 2001/06/27 06:34:50 kjc Exp $ */ /* $FreeBSD: src/sys/dev/txp/if_txp.c,v 1.4.2.4 2001/12/14 19:50:43 jlemon Exp $ */ -/* $DragonFly: src/sys/dev/netif/txp/if_txp.c,v 1.39 2006/09/05 03:48:11 dillon Exp $ */ +/* $DragonFly: src/sys/dev/netif/txp/if_txp.c,v 1.40 2006/10/25 20:55:59 dillon Exp $ */ /* * Copyright (c) 2001 @@ -48,6 +48,8 @@ #include #include #include +#include +#include #include #include @@ -71,12 +73,6 @@ #include /* for vtophys */ #include /* for vtophys */ -#include -#include -#include -#include -#include -#include #include "../mii_layer/mii.h" #include "../mii_layer/miivar.h" diff --git a/sys/dev/netif/vge/if_vge.c b/sys/dev/netif/vge/if_vge.c index 43cc06d0c4..24e203a0ac 100644 --- a/sys/dev/netif/vge/if_vge.c +++ b/sys/dev/netif/vge/if_vge.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/vge/if_vge.c,v 1.24 2006/02/14 12:44:56 glebius Exp $ - * $DragonFly: src/sys/dev/netif/vge/if_vge.c,v 1.2 2006/08/06 12:49:06 swildner Exp $ + * $DragonFly: src/sys/dev/netif/vge/if_vge.c,v 1.3 2006/10/25 20:55:59 dillon Exp $ */ /* @@ -93,6 +93,8 @@ #include #include #include +#include +#include #include #include @@ -105,11 +107,6 @@ #include -#include -#include -#include -#include - #include #include diff --git a/sys/dev/netif/vr/if_vr.c b/sys/dev/netif/vr/if_vr.c index b33364709a..fb40b71e4e 100644 --- a/sys/dev/netif/vr/if_vr.c +++ b/sys/dev/netif/vr/if_vr.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/pci/if_vr.c,v 1.26.2.13 2003/02/06 04:46:20 silby Exp $ - * $DragonFly: src/sys/dev/netif/vr/if_vr.c,v 1.42 2006/08/01 18:11:20 swildner Exp $ + * $DragonFly: src/sys/dev/netif/vr/if_vr.c,v 1.43 2006/10/25 20:55:59 dillon Exp $ */ /* @@ -70,6 +70,8 @@ #include #include #include +#include +#include #include #include @@ -83,12 +85,6 @@ #include /* for vtophys */ #include /* for vtophys */ -#include -#include -#include -#include -#include -#include #include #include diff --git a/sys/dev/netif/vx/if_vx.c b/sys/dev/netif/vx/if_vx.c index 572fd69c6c..e618d003fa 100644 --- a/sys/dev/netif/vx/if_vx.c +++ b/sys/dev/netif/vx/if_vx.c @@ -28,7 +28,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/vx/if_vx.c,v 1.25.2.6 2002/02/13 00:43:10 dillon Exp $ - * $DragonFly: src/sys/dev/netif/vx/if_vx.c,v 1.26 2005/12/11 01:54:09 swildner Exp $ + * $DragonFly: src/sys/dev/netif/vx/if_vx.c,v 1.27 2006/10/25 20:55:59 dillon Exp $ * */ @@ -69,13 +69,9 @@ #include #include - #include #include -#include -#include - #include #include "if_vxreg.h" diff --git a/sys/dev/netif/vx/if_vx_eisa.c b/sys/dev/netif/vx/if_vx_eisa.c index e46ae435e8..6ecc884dc9 100644 --- a/sys/dev/netif/vx/if_vx_eisa.c +++ b/sys/dev/netif/vx/if_vx_eisa.c @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/vx/if_vx_eisa.c,v 1.14 2000/01/29 14:50:31 peter Exp $ - * $DragonFly: src/sys/dev/netif/vx/if_vx_eisa.c,v 1.14 2005/11/28 17:13:44 dillon Exp $ + * $DragonFly: src/sys/dev/netif/vx/if_vx_eisa.c,v 1.15 2006/10/25 20:55:59 dillon Exp $ */ #include @@ -36,9 +36,6 @@ #include #include #include - -#include -#include #include #include diff --git a/sys/dev/netif/vx/if_vx_pci.c b/sys/dev/netif/vx/if_vx_pci.c index 78ed017710..585097ff1d 100644 --- a/sys/dev/netif/vx/if_vx_pci.c +++ b/sys/dev/netif/vx/if_vx_pci.c @@ -27,23 +27,19 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/vx/if_vx_pci.c,v 1.21 2000/05/28 15:59:52 peter Exp $ - * $DragonFly: src/sys/dev/netif/vx/if_vx_pci.c,v 1.13 2005/11/28 17:13:44 dillon Exp $ + * $DragonFly: src/sys/dev/netif/vx/if_vx_pci.c,v 1.14 2006/10/25 20:55:59 dillon Exp $ */ #include #include #include #include +#include +#include #include #include -#include -#include -#include -#include -#include - #include #include #include diff --git a/sys/dev/netif/wb/if_wb.c b/sys/dev/netif/wb/if_wb.c index 0139a8dc66..3215d1edda 100644 --- a/sys/dev/netif/wb/if_wb.c +++ b/sys/dev/netif/wb/if_wb.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/pci/if_wb.c,v 1.26.2.6 2003/03/05 18:42:34 njl Exp $ - * $DragonFly: src/sys/dev/netif/wb/if_wb.c,v 1.37 2006/08/06 12:49:06 swildner Exp $ + * $DragonFly: src/sys/dev/netif/wb/if_wb.c,v 1.38 2006/10/25 20:55:59 dillon Exp $ */ /* @@ -93,6 +93,8 @@ #include #include #include +#include +#include #include #include @@ -106,10 +108,6 @@ #include /* for vtophys */ #include /* for vtophys */ -#include -#include -#include -#include #include #include diff --git a/sys/dev/netif/wi/if_wi.c b/sys/dev/netif/wi/if_wi.c index f4a09d290e..f3e8e335fe 100644 --- a/sys/dev/netif/wi/if_wi.c +++ b/sys/dev/netif/wi/if_wi.c @@ -32,7 +32,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/wi/if_wi.c,v 1.180.2.7 2005/10/05 13:16:29 avatar Exp $ - * $DragonFly: src/sys/dev/netif/wi/if_wi.c,v 1.37 2006/08/06 12:49:06 swildner Exp $ + * $DragonFly: src/sys/dev/netif/wi/if_wi.c,v 1.38 2006/10/25 20:55:59 dillon Exp $ */ /* @@ -83,12 +83,10 @@ #include #include #include +#include #include -#include -#include #include -#include #include #include diff --git a/sys/dev/netif/wi/if_wi_pccard.c b/sys/dev/netif/wi/if_wi_pccard.c index 6fa97188d6..012ef55a84 100644 --- a/sys/dev/netif/wi/if_wi_pccard.c +++ b/sys/dev/netif/wi/if_wi_pccard.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/wi/if_wi_pccard.c,v 1.47 2004/06/09 06:31:40 imp Exp $ - * $DragonFly: src/sys/dev/netif/wi/if_wi_pccard.c,v 1.9 2006/03/25 04:14:05 sephe Exp $ + * $DragonFly: src/sys/dev/netif/wi/if_wi_pccard.c,v 1.10 2006/10/25 20:55:59 dillon Exp $ */ /* @@ -50,9 +50,6 @@ #include #include #include - -#include -#include #include #include diff --git a/sys/dev/netif/wi/if_wi_pci.c b/sys/dev/netif/wi/if_wi_pci.c index bba127a6d2..a16c366c3e 100644 --- a/sys/dev/netif/wi/if_wi_pci.c +++ b/sys/dev/netif/wi/if_wi_pci.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/wi/if_wi_pci.c,v 1.22 2004/03/17 17:50:48 njl Exp $ - * $DragonFly: src/sys/dev/netif/wi/if_wi_pci.c,v 1.8 2005/12/16 21:05:48 dillon Exp $ + * $DragonFly: src/sys/dev/netif/wi/if_wi_pci.c,v 1.9 2006/10/25 20:56:00 dillon Exp $ */ /* @@ -49,12 +49,10 @@ #include #include #include +#include #include -#include -#include #include -#include #include #include diff --git a/sys/dev/netif/wl/if_wl.c b/sys/dev/netif/wl/if_wl.c index 69e18a5045..ac4bef68c2 100644 --- a/sys/dev/netif/wl/if_wl.c +++ b/sys/dev/netif/wl/if_wl.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/i386/isa/if_wl.c,v 1.27.2.2 2000/07/17 21:24:32 archie Exp $ */ -/* $DragonFly: src/sys/dev/netif/wl/if_wl.c,v 1.28 2006/08/06 12:49:06 swildner Exp $ */ +/* $DragonFly: src/sys/dev/netif/wl/if_wl.c,v 1.29 2006/10/25 20:56:00 dillon Exp $ */ /* * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -194,21 +194,17 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #include #include +#include #include #include #include #include #include #include -#include - -#include #include - -#include -#include #include #include +#include #include #include diff --git a/sys/dev/netif/xe/if_xe.c b/sys/dev/netif/xe/if_xe.c index 4ae9923a43..d7adf0ee51 100644 --- a/sys/dev/netif/xe/if_xe.c +++ b/sys/dev/netif/xe/if_xe.c @@ -25,7 +25,7 @@ * * $Id: if_xe.c,v 1.20 1999/06/13 19:17:40 scott Exp $ * $FreeBSD: src/sys/dev/xe/if_xe.c,v 1.39 2003/10/14 22:51:35 rsm Exp $ - * $DragonFly: src/sys/dev/netif/xe/if_xe.c,v 1.32 2006/08/06 12:49:06 swildner Exp $ + * $DragonFly: src/sys/dev/netif/xe/if_xe.c,v 1.33 2006/10/25 20:56:00 dillon Exp $ */ /* @@ -106,14 +106,10 @@ #include #include #include -#include - #include #include - -#include -#include #include +#include #include #include diff --git a/sys/dev/netif/xe/if_xe_pccard.c b/sys/dev/netif/xe/if_xe_pccard.c index 7f5f468945..13d94604d4 100644 --- a/sys/dev/netif/xe/if_xe_pccard.c +++ b/sys/dev/netif/xe/if_xe_pccard.c @@ -26,19 +26,15 @@ * xe pccard interface driver * * $FreeBSD: src/sys/dev/xe/if_xe_pccard.c,v 1.11 2003/10/14 22:51:35 rsm Exp $ - * $DragonFly: src/sys/dev/netif/xe/if_xe_pccard.c,v 1.2 2005/11/20 10:16:56 sephe Exp $ + * $DragonFly: src/sys/dev/netif/xe/if_xe_pccard.c,v 1.3 2006/10/25 20:56:00 dillon Exp $ */ #include #include #include #include - #include #include - -#include -#include #include #include diff --git a/sys/dev/netif/xl/if_xl.c b/sys/dev/netif/xl/if_xl.c index a3331b7acf..a7a134248a 100644 --- a/sys/dev/netif/xl/if_xl.c +++ b/sys/dev/netif/xl/if_xl.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/pci/if_xl.c,v 1.72.2.28 2003/10/08 06:01:57 murray Exp $ - * $DragonFly: src/sys/dev/netif/xl/if_xl.c,v 1.45 2006/08/01 18:13:21 swildner Exp $ + * $DragonFly: src/sys/dev/netif/xl/if_xl.c,v 1.46 2006/10/25 20:56:00 dillon Exp $ */ /* @@ -109,6 +109,8 @@ #include #include #include +#include +#include #include #include @@ -121,13 +123,6 @@ #include -#include -#include -#include -#include -#include -#include - #include "../mii_layer/mii.h" #include "../mii_layer/miivar.h" diff --git a/sys/dev/pccard/cardbus/cardbus.c b/sys/dev/pccard/cardbus/cardbus.c index 846734f190..c8b57904e6 100644 --- a/sys/dev/pccard/cardbus/cardbus.c +++ b/sys/dev/pccard/cardbus/cardbus.c @@ -26,7 +26,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/cardbus/cardbus.c,v 1.28 2002/11/27 17:30:41 imp Exp $ - * $DragonFly: src/sys/dev/pccard/cardbus/cardbus.c,v 1.7 2006/09/05 00:55:41 dillon Exp $ + * $DragonFly: src/sys/dev/pccard/cardbus/cardbus.c,v 1.8 2006/10/25 20:56:00 dillon Exp $ */ /* @@ -43,11 +43,8 @@ #include #include #include - #include -#include #include -#include #include #include diff --git a/sys/dev/pccard/cardbus/cardbus_cis.c b/sys/dev/pccard/cardbus/cardbus_cis.c index 68ce8d260e..ca4c83125f 100644 --- a/sys/dev/pccard/cardbus/cardbus_cis.c +++ b/sys/dev/pccard/cardbus/cardbus_cis.c @@ -26,7 +26,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/cardbus/cardbus_cis.c,v 1.27 2002/11/27 06:56:29 imp Exp $ - * $DragonFly: src/sys/dev/pccard/cardbus/cardbus_cis.c,v 1.2 2006/09/05 00:55:41 dillon Exp $ + * $DragonFly: src/sys/dev/pccard/cardbus/cardbus_cis.c,v 1.3 2006/10/25 20:56:00 dillon Exp $ */ /* @@ -37,10 +37,7 @@ #include #include #include - #include -#include -#include #include #include diff --git a/sys/dev/pccard/exca/exca.c b/sys/dev/pccard/exca/exca.c index 49fd8e1b86..bbbeacb938 100644 --- a/sys/dev/pccard/exca/exca.c +++ b/sys/dev/pccard/exca/exca.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/exca/exca.c,v 1.6 2002/10/07 06:18:50 imp Exp $ */ -/* $DragonFly: src/sys/dev/pccard/exca/exca.c,v 1.1 2004/02/10 07:55:47 joerg Exp $ */ +/* $DragonFly: src/sys/dev/pccard/exca/exca.c,v 1.2 2006/10/25 20:56:00 dillon Exp $ */ /* * Copyright (c) 2002 M Warner Losh. All rights reserved. @@ -63,11 +63,8 @@ #include #include #include - #include -#include #include -#include #include #include diff --git a/sys/dev/pccard/pccbb/pccbb.c b/sys/dev/pccard/pccbb/pccbb.c index 0be1383d33..900fc81fe1 100644 --- a/sys/dev/pccard/pccbb/pccbb.c +++ b/sys/dev/pccard/pccbb/pccbb.c @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/pccbb/pccbb.c,v 1.64 2002/11/23 23:09:45 imp Exp $ - * $DragonFly: src/sys/dev/pccard/pccbb/pccbb.c,v 1.17 2006/09/05 00:55:41 dillon Exp $ + * $DragonFly: src/sys/dev/pccard/pccbb/pccbb.c,v 1.18 2006/10/25 20:56:00 dillon Exp $ */ /* @@ -86,9 +86,7 @@ #include #include #include -#include #include -#include #include #include diff --git a/sys/dev/powermng/i386/alpm/alpm.c b/sys/dev/powermng/i386/alpm/alpm.c index b5f7087784..a288999421 100644 --- a/sys/dev/powermng/i386/alpm/alpm.c +++ b/sys/dev/powermng/i386/alpm/alpm.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/pci/alpm.c,v 1.15 2001/01/17 00:38:06 peter Exp $ - * $DragonFly: src/sys/dev/powermng/i386/alpm/alpm.c,v 1.6 2005/02/17 13:59:36 joerg Exp $ + * $DragonFly: src/sys/dev/powermng/i386/alpm/alpm.c,v 1.7 2006/10/25 20:56:00 dillon Exp $ * */ @@ -37,11 +37,6 @@ #include #include #include - -#include -#include -#include -#include #include #include diff --git a/sys/dev/powermng/i386/amdpm/amdpm.c b/sys/dev/powermng/i386/amdpm/amdpm.c index fa37f5608f..d2da7ede88 100644 --- a/sys/dev/powermng/i386/amdpm/amdpm.c +++ b/sys/dev/powermng/i386/amdpm/amdpm.c @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/pci/amdpm.c,v 1.1.2.1 2001/10/10 12:10:26 murray Exp $ - * $DragonFly: src/sys/dev/powermng/i386/amdpm/amdpm.c,v 1.5 2005/02/17 13:59:36 joerg Exp $ + * $DragonFly: src/sys/dev/powermng/i386/amdpm/amdpm.c,v 1.6 2006/10/25 20:56:00 dillon Exp $ * */ @@ -42,13 +42,9 @@ #include #include #include +#include -#include -#include -#include #include -#include -#include #include #include diff --git a/sys/dev/powermng/i386/intpm/intpm.c b/sys/dev/powermng/i386/intpm/intpm.c index ff93615bd2..1fa78c61d8 100644 --- a/sys/dev/powermng/i386/intpm/intpm.c +++ b/sys/dev/powermng/i386/intpm/intpm.c @@ -24,17 +24,12 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/pci/intpm.c,v 1.16.2.1 2001/12/23 08:17:47 pirzyk Exp $ - * $DragonFly: src/sys/dev/powermng/i386/intpm/intpm.c,v 1.9 2005/10/12 17:35:54 dillon Exp $ + * $DragonFly: src/sys/dev/powermng/i386/intpm/intpm.c,v 1.10 2006/10/25 20:56:00 dillon Exp $ */ #include #include #include -#include -#include -#include - -#include #include #include #include @@ -43,7 +38,9 @@ #include #include #include -#include + +#include + #include #include "smbus_if.h" diff --git a/sys/dev/powermng/i386/viapm/viapm.c b/sys/dev/powermng/i386/viapm/viapm.c index 8c81ddb759..08b0344a40 100644 --- a/sys/dev/powermng/i386/viapm/viapm.c +++ b/sys/dev/powermng/i386/viapm/viapm.c @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/pci/viapm.c,v 1.1.2.1 2002/04/19 05:52:15 nsouch Exp $ - * $DragonFly: src/sys/dev/powermng/i386/viapm/viapm.c,v 1.8 2005/10/12 17:35:54 dillon Exp $ + * $DragonFly: src/sys/dev/powermng/i386/viapm/viapm.c,v 1.9 2006/10/25 20:56:00 dillon Exp $ * */ #include @@ -34,13 +34,9 @@ #include #include #include +#include -#include -#include -#include #include /* for DELAY */ -#include -#include #include #include diff --git a/sys/dev/powermng/ichsmb/ichsmb.c b/sys/dev/powermng/ichsmb/ichsmb.c index 94e5bd2fba..2bd8083b4f 100644 --- a/sys/dev/powermng/ichsmb/ichsmb.c +++ b/sys/dev/powermng/ichsmb/ichsmb.c @@ -37,7 +37,7 @@ * Author: Archie Cobbs * * $FreeBSD: src/sys/dev/ichsmb/ichsmb.c,v 1.1.2.1 2000/10/09 00:52:43 archie Exp $ - * $DragonFly: src/sys/dev/powermng/ichsmb/ichsmb.c,v 1.6 2005/06/10 23:29:32 dillon Exp $ + * $DragonFly: src/sys/dev/powermng/ichsmb/ichsmb.c,v 1.7 2006/10/25 20:56:00 dillon Exp $ */ /* @@ -51,11 +51,8 @@ #include #include #include -#include - -#include #include -#include +#include #include diff --git a/sys/dev/powermng/ichsmb/ichsmb_pci.c b/sys/dev/powermng/ichsmb/ichsmb_pci.c index c7bf098e63..384b23cef7 100644 --- a/sys/dev/powermng/ichsmb/ichsmb_pci.c +++ b/sys/dev/powermng/ichsmb/ichsmb_pci.c @@ -37,7 +37,7 @@ * Author: Archie Cobbs * * $FreeBSD: src/sys/dev/ichsmb/ichsmb_pci.c,v 1.1.2.3 2002/10/20 14:57:19 nyan Exp $ - * $DragonFly: src/sys/dev/powermng/ichsmb/ichsmb_pci.c,v 1.7 2005/10/12 17:35:54 dillon Exp $ + * $DragonFly: src/sys/dev/powermng/ichsmb/ichsmb_pci.c,v 1.8 2006/10/25 20:56:00 dillon Exp $ */ /* @@ -51,10 +51,7 @@ #include #include #include - -#include #include -#include #include #include diff --git a/sys/dev/raid/aac/aac.c b/sys/dev/raid/aac/aac.c index 82be80d1bc..0f11f8bc78 100644 --- a/sys/dev/raid/aac/aac.c +++ b/sys/dev/raid/aac/aac.c @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/aac/aac.c,v 1.9.2.14 2003/04/08 13:22:08 scottl Exp $ - * $DragonFly: src/sys/dev/raid/aac/aac.c,v 1.26 2006/09/10 01:26:35 dillon Exp $ + * $DragonFly: src/sys/dev/raid/aac/aac.c,v 1.27 2006/10/25 20:56:00 dillon Exp $ */ /* @@ -60,10 +60,6 @@ #include #include -#include -#include -#include - #include "aacreg.h" #include "aac_ioctl.h" #include "aacvar.h" diff --git a/sys/dev/raid/aac/aac_cam.c b/sys/dev/raid/aac/aac_cam.c index b095be0465..362de58d46 100644 --- a/sys/dev/raid/aac/aac_cam.c +++ b/sys/dev/raid/aac/aac_cam.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/aac/aac_cam.c,v 1.2.2.4 2003/04/08 13:22:08 scottl Exp $ - * $DragonFly: src/sys/dev/raid/aac/aac_cam.c,v 1.4 2004/03/15 03:05:03 dillon Exp $ + * $DragonFly: src/sys/dev/raid/aac/aac_cam.c,v 1.5 2006/10/25 20:56:00 dillon Exp $ */ /* @@ -52,10 +52,9 @@ #include #include #include +#include #include -#include -#include #include #include diff --git a/sys/dev/raid/aac/aac_debug.c b/sys/dev/raid/aac/aac_debug.c index c0202120ba..822aa85c36 100644 --- a/sys/dev/raid/aac/aac_debug.c +++ b/sys/dev/raid/aac/aac_debug.c @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/aac/aac_debug.c,v 1.2.2.5 2003/01/11 18:39:39 scottl Exp $ - * $DragonFly: src/sys/dev/raid/aac/aac_debug.c,v 1.3 2003/08/07 21:17:07 dillon Exp $ + * $DragonFly: src/sys/dev/raid/aac/aac_debug.c,v 1.4 2006/10/25 20:56:00 dillon Exp $ */ /* @@ -44,9 +44,6 @@ #include #include -#include -#include - #include "aacreg.h" #include "aac_ioctl.h" #include "aacvar.h" diff --git a/sys/dev/raid/aac/aac_disk.c b/sys/dev/raid/aac/aac_disk.c index a3e1fd8a1a..1e663a9745 100644 --- a/sys/dev/raid/aac/aac_disk.c +++ b/sys/dev/raid/aac/aac_disk.c @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/aac/aac_disk.c,v 1.3.2.8 2003/01/11 18:39:39 scottl Exp $ - * $DragonFly: src/sys/dev/raid/aac/aac_disk.c,v 1.14 2006/09/10 01:26:35 dillon Exp $ + * $DragonFly: src/sys/dev/raid/aac/aac_disk.c,v 1.15 2006/10/25 20:56:00 dillon Exp $ */ #include "opt_aac.h" @@ -42,13 +42,12 @@ #include #include #include +#include #include #include #include -#include -#include #include "aacreg.h" #include "aac_ioctl.h" diff --git a/sys/dev/raid/aac/aac_pci.c b/sys/dev/raid/aac/aac_pci.c index 06d4681cf5..8cc5177850 100644 --- a/sys/dev/raid/aac/aac_pci.c +++ b/sys/dev/raid/aac/aac_pci.c @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/aac/aac_pci.c,v 1.3.2.19 2003/11/01 18:44:51 scottl Exp $ - * $DragonFly: src/sys/dev/raid/aac/aac_pci.c,v 1.9 2006/04/17 15:59:55 dillon Exp $ + * $DragonFly: src/sys/dev/raid/aac/aac_pci.c,v 1.10 2006/10/25 20:56:00 dillon Exp $ */ /* @@ -45,10 +45,6 @@ #include #include #include - -#include -#include -#include #include #include diff --git a/sys/dev/raid/amr/amr.c b/sys/dev/raid/amr/amr.c index 05d3ee0c93..cc21955810 100644 --- a/sys/dev/raid/amr/amr.c +++ b/sys/dev/raid/amr/amr.c @@ -53,7 +53,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/amr/amr.c,v 1.7.2.13 2003/01/15 13:41:18 emoore Exp $ - * $DragonFly: src/sys/dev/raid/amr/amr.c,v 1.22 2006/09/10 01:26:35 dillon Exp $ + * $DragonFly: src/sys/dev/raid/amr/amr.c,v 1.23 2006/10/25 20:56:00 dillon Exp $ */ /* @@ -71,11 +71,6 @@ #include #include #include - -#include -#include -#include -#include #include #include diff --git a/sys/dev/raid/amr/amr_cam.c b/sys/dev/raid/amr/amr_cam.c index 6d09412da4..ce2cc6f03f 100644 --- a/sys/dev/raid/amr/amr_cam.c +++ b/sys/dev/raid/amr/amr_cam.c @@ -53,7 +53,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/amr/amr_cam.c,v 1.1.2.3 2002/11/11 13:19:10 emoore Exp $ - * $DragonFly: src/sys/dev/raid/amr/amr_cam.c,v 1.7 2006/09/05 00:55:41 dillon Exp $ + * $DragonFly: src/sys/dev/raid/amr/amr_cam.c,v 1.8 2006/10/25 20:56:00 dillon Exp $ */ #include @@ -77,9 +77,6 @@ #include #include -#include -#include - #include "amrreg.h" #include "amrvar.h" diff --git a/sys/dev/raid/amr/amr_disk.c b/sys/dev/raid/amr/amr_disk.c index 4663e80d25..09dbf23bed 100644 --- a/sys/dev/raid/amr/amr_disk.c +++ b/sys/dev/raid/amr/amr_disk.c @@ -54,7 +54,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/amr/amr_disk.c,v 1.5.2.5 2002/12/20 15:12:04 emoore Exp $ - * $DragonFly: src/sys/dev/raid/amr/amr_disk.c,v 1.12 2006/09/10 01:26:35 dillon Exp $ + * $DragonFly: src/sys/dev/raid/amr/amr_disk.c,v 1.13 2006/10/25 20:56:00 dillon Exp $ */ /* @@ -70,13 +70,12 @@ #include #include #include +#include #include #include -#include #include -#include #include "amrio.h" #include "amrreg.h" diff --git a/sys/dev/raid/amr/amr_pci.c b/sys/dev/raid/amr/amr_pci.c index 58d3433c5d..5a8157c494 100644 --- a/sys/dev/raid/amr/amr_pci.c +++ b/sys/dev/raid/amr/amr_pci.c @@ -53,7 +53,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/amr/amr_pci.c,v 1.1.2.9 2002/12/20 15:12:04 emoore Exp $ - * $DragonFly: src/sys/dev/raid/amr/amr_pci.c,v 1.7 2006/01/25 19:56:28 dillon Exp $ + * $DragonFly: src/sys/dev/raid/amr/amr_pci.c,v 1.8 2006/10/25 20:56:00 dillon Exp $ */ #include @@ -65,11 +65,6 @@ #include #include #include - -#include -#include -#include -#include #include #include diff --git a/sys/dev/raid/asr/asr.c b/sys/dev/raid/asr/asr.c index a2696ec0b1..8c763af11e 100644 --- a/sys/dev/raid/asr/asr.c +++ b/sys/dev/raid/asr/asr.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/asr/asr.c,v 1.3.2.2 2001/08/23 05:21:29 scottl Exp $ */ -/* $DragonFly: src/sys/dev/raid/asr/asr.c,v 1.26 2006/10/23 21:50:32 dillon Exp $ */ +/* $DragonFly: src/sys/dev/raid/asr/asr.c,v 1.27 2006/10/25 20:56:01 dillon Exp $ */ /* * Copyright (c) 1996-2000 Distributed Processing Technology Corporation * Copyright (c) 2000-2001 Adaptec Corporation @@ -218,8 +218,6 @@ static dpt_sig_S ASR_sig = { #include #include #include -#include -#include #include #include #include diff --git a/sys/dev/raid/ciss/ciss.c b/sys/dev/raid/ciss/ciss.c index 75ea5280bf..ceb87633d7 100644 --- a/sys/dev/raid/ciss/ciss.c +++ b/sys/dev/raid/ciss/ciss.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/ciss/ciss.c,v 1.2.2.6 2003/02/18 22:27:41 ps Exp $ - * $DragonFly: src/sys/dev/raid/ciss/ciss.c,v 1.19 2006/09/10 01:26:35 dillon Exp $ + * $DragonFly: src/sys/dev/raid/ciss/ciss.c,v 1.20 2006/10/25 20:56:01 dillon Exp $ */ /* @@ -78,6 +78,7 @@ #include #include #include +#include #include #include @@ -88,11 +89,7 @@ #include #include -#include -#include #include -#include -#include #include #include diff --git a/sys/dev/raid/dpt/dpt_eisa.c b/sys/dev/raid/dpt/dpt_eisa.c index 010a415189..ad141016d2 100644 --- a/sys/dev/raid/dpt/dpt_eisa.c +++ b/sys/dev/raid/dpt/dpt_eisa.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/dpt/dpt_eisa.c,v 1.12.2.1 2000/08/07 18:48:14 peter Exp $ - * $DragonFly: src/sys/dev/raid/dpt/dpt_eisa.c,v 1.6 2005/10/12 17:35:54 dillon Exp $ + * $DragonFly: src/sys/dev/raid/dpt/dpt_eisa.c,v 1.7 2006/10/25 20:56:01 dillon Exp $ */ #include @@ -32,10 +32,6 @@ #include #include #include - -#include -#include -#include #include #include diff --git a/sys/dev/raid/dpt/dpt_pci.c b/sys/dev/raid/dpt/dpt_pci.c index 39ada99baa..0cb285f90f 100644 --- a/sys/dev/raid/dpt/dpt_pci.c +++ b/sys/dev/raid/dpt/dpt_pci.c @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/dpt/dpt_pci.c,v 1.17.2.2 2000/08/26 22:21:21 peter Exp $ - * $DragonFly: src/sys/dev/raid/dpt/dpt_pci.c,v 1.6 2005/10/12 17:35:54 dillon Exp $ + * $DragonFly: src/sys/dev/raid/dpt/dpt_pci.c,v 1.7 2006/10/25 20:56:01 dillon Exp $ */ #include @@ -35,11 +35,6 @@ #include #include #include - -#include -#include -#include -#include #include #include diff --git a/sys/dev/raid/dpt/dpt_scsi.c b/sys/dev/raid/dpt/dpt_scsi.c index 0d047638df..8e988636dd 100644 --- a/sys/dev/raid/dpt/dpt_scsi.c +++ b/sys/dev/raid/dpt/dpt_scsi.c @@ -44,7 +44,7 @@ */ #ident "$FreeBSD: src/sys/dev/dpt/dpt_scsi.c,v 1.28.2.3 2003/01/31 02:47:10 grog Exp $" -#ident "$DragonFly: src/sys/dev/raid/dpt/dpt_scsi.c,v 1.10 2006/09/05 00:55:41 dillon Exp $" +#ident "$DragonFly: src/sys/dev/raid/dpt/dpt_scsi.c,v 1.11 2006/10/25 20:56:01 dillon Exp $" #define _DPT_C_ @@ -54,14 +54,9 @@ #include #include #include - #include #include -#include -#include -#include - #include #include diff --git a/sys/dev/raid/ida/ida.c b/sys/dev/raid/ida/ida.c index 66d37fd85e..5682447236 100644 --- a/sys/dev/raid/ida/ida.c +++ b/sys/dev/raid/ida/ida.c @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/ida/ida.c,v 1.7.2.3 2001/03/01 01:57:32 ps Exp $ - * $DragonFly: src/sys/dev/raid/ida/ida.c,v 1.13 2006/09/05 03:48:11 dillon Exp $ + * $DragonFly: src/sys/dev/raid/ida/ida.c,v 1.14 2006/10/25 20:56:01 dillon Exp $ */ /* @@ -51,17 +51,12 @@ #include #include #include - -#if NPCI > 0 -#include -#endif -#include -#include -#include #include #include #include +#include + #include "idareg.h" #include "idavar.h" diff --git a/sys/dev/raid/ida/ida_disk.c b/sys/dev/raid/ida/ida_disk.c index 0753bec27a..bac72cbd1b 100644 --- a/sys/dev/raid/ida/ida_disk.c +++ b/sys/dev/raid/ida/ida_disk.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/ida/ida_disk.c,v 1.12.2.6 2001/11/27 20:21:02 ps Exp $ - * $DragonFly: src/sys/dev/raid/ida/ida_disk.c,v 1.13 2006/09/10 01:26:35 dillon Exp $ + * $DragonFly: src/sys/dev/raid/ida/ida_disk.c,v 1.14 2006/10/25 20:56:01 dillon Exp $ */ /* @@ -42,19 +42,14 @@ #include #include #include - -#if NPCI > 0 -#include -#endif -#include -#include -#include #include #include +#include +#include + #include #include -#include #include "idareg.h" #include "idavar.h" diff --git a/sys/dev/raid/ida/ida_eisa.c b/sys/dev/raid/ida/ida_eisa.c index 7581256153..f6e4414bb7 100644 --- a/sys/dev/raid/ida/ida_eisa.c +++ b/sys/dev/raid/ida/ida_eisa.c @@ -25,21 +25,16 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/ida/ida_eisa.c,v 1.1.2.4 2001/07/30 20:29:58 jlemon Exp $ - * $DragonFly: src/sys/dev/raid/ida/ida_eisa.c,v 1.5 2005/10/12 17:35:54 dillon Exp $ + * $DragonFly: src/sys/dev/raid/ida/ida_eisa.c,v 1.6 2006/10/25 20:56:01 dillon Exp $ */ #include #include #include #include - #include #include #include - -#include -#include -#include #include #include "idavar.h" diff --git a/sys/dev/raid/ida/ida_pci.c b/sys/dev/raid/ida/ida_pci.c index dc15a0aad1..fd30f0a187 100644 --- a/sys/dev/raid/ida/ida_pci.c +++ b/sys/dev/raid/ida/ida_pci.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/ida/ida_pci.c,v 1.7.2.7 2001/07/30 20:29:58 jlemon Exp $ - * $DragonFly: src/sys/dev/raid/ida/ida_pci.c,v 1.5 2005/10/12 17:35:54 dillon Exp $ + * $DragonFly: src/sys/dev/raid/ida/ida_pci.c,v 1.6 2006/10/25 20:56:01 dillon Exp $ */ #include @@ -36,11 +36,6 @@ #include #include #include - -#include -#include -#include -#include #include #include diff --git a/sys/dev/raid/iir/iir.c b/sys/dev/raid/iir/iir.c index 91262a6f88..6e3e7ccfb2 100644 --- a/sys/dev/raid/iir/iir.c +++ b/sys/dev/raid/iir/iir.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/iir/iir.c,v 1.2.2.3 2002/05/05 08:18:12 asmodai Exp $ */ -/* $DragonFly: src/sys/dev/raid/iir/iir.c,v 1.12 2006/09/05 00:55:42 dillon Exp $ */ +/* $DragonFly: src/sys/dev/raid/iir/iir.c,v 1.13 2006/10/25 20:56:01 dillon Exp $ */ /* * Copyright (c) 2000-01 Intel Corporation * All Rights Reserved @@ -56,9 +56,6 @@ #include #include -#include -#include -#include #include #include diff --git a/sys/dev/raid/iir/iir_ctrl.c b/sys/dev/raid/iir/iir_ctrl.c index 3928532dd9..77e989403c 100644 --- a/sys/dev/raid/iir/iir_ctrl.c +++ b/sys/dev/raid/iir/iir_ctrl.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/iir/iir_ctrl.c,v 1.2.2.4 2002/05/05 08:18:12 asmodai Exp $ */ -/* $DragonFly: src/sys/dev/raid/iir/iir_ctrl.c,v 1.11 2006/09/10 01:26:35 dillon Exp $ */ +/* $DragonFly: src/sys/dev/raid/iir/iir_ctrl.c,v 1.12 2006/10/25 20:56:01 dillon Exp $ */ /* * Copyright (c) 2000-01 Intel Corporation * All Rights Reserved @@ -45,12 +45,13 @@ #include #include #include +#include #include #include #include #include #include -#include + #include #include #include diff --git a/sys/dev/raid/iir/iir_pci.c b/sys/dev/raid/iir/iir_pci.c index 3e96b6be50..b685cd8ce9 100644 --- a/sys/dev/raid/iir/iir_pci.c +++ b/sys/dev/raid/iir/iir_pci.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/iir/iir_pci.c,v 1.3.2.3 2002/05/05 08:18:12 asmodai Exp $ */ -/* $DragonFly: src/sys/dev/raid/iir/iir_pci.c,v 1.5 2005/10/12 17:35:54 dillon Exp $ */ +/* $DragonFly: src/sys/dev/raid/iir/iir_pci.c,v 1.6 2006/10/25 20:56:01 dillon Exp $ */ /* * Copyright (c) 2000-01 Intel Corporation * All Rights Reserved @@ -48,13 +48,9 @@ #include #include #include +#include -#include -#include -#include -#include #include -#include #include #include diff --git a/sys/dev/raid/ips/ips.h b/sys/dev/raid/ips/ips.h index 38411f4223..cbbf48f2db 100644 --- a/sys/dev/raid/ips/ips.h +++ b/sys/dev/raid/ips/ips.h @@ -26,7 +26,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/ips/ips.h,v 1.10 2004/05/30 20:08:34 phk Exp $ - * $DragonFly: src/sys/dev/raid/ips/ips.h,v 1.11 2006/07/28 02:17:37 dillon Exp $ + * $DragonFly: src/sys/dev/raid/ips/ips.h,v 1.12 2006/10/25 20:56:01 dillon Exp $ */ @@ -38,18 +38,14 @@ #include #include #include -#include #include #include -#include #include #include #include - -#include -#include #include -#include +#include +#include #include #include diff --git a/sys/dev/raid/ips/ips_disk.h b/sys/dev/raid/ips/ips_disk.h index 8b7c271e5a..69460fc77e 100644 --- a/sys/dev/raid/ips/ips_disk.h +++ b/sys/dev/raid/ips/ips_disk.h @@ -26,7 +26,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/ips/ips_disk.h,v 1.2 2003/08/22 06:00:27 imp Exp $ - * $DragonFly: src/sys/dev/raid/ips/ips_disk.h,v 1.3 2006/09/10 01:26:35 dillon Exp $ + * $DragonFly: src/sys/dev/raid/ips/ips_disk.h,v 1.4 2006/10/25 20:56:01 dillon Exp $ */ @@ -40,11 +40,7 @@ #include #include #include - -#include -#include #include -#include #include #include diff --git a/sys/dev/raid/mlx/mlx.c b/sys/dev/raid/mlx/mlx.c index 9b688d28d3..a0c5a8825f 100644 --- a/sys/dev/raid/mlx/mlx.c +++ b/sys/dev/raid/mlx/mlx.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/mlx/mlx.c,v 1.14.2.5 2001/09/11 09:49:53 kris Exp $ - * $DragonFly: src/sys/dev/raid/mlx/mlx.c,v 1.21 2006/09/10 01:26:36 dillon Exp $ + * $DragonFly: src/sys/dev/raid/mlx/mlx.c,v 1.22 2006/10/25 20:56:01 dillon Exp $ */ /* @@ -35,20 +35,15 @@ #include #include #include - #include #include #include #include #include +#include #include -#include -#include -#include -#include #include -#include #include "mlx_compat.h" #include "mlxio.h" diff --git a/sys/dev/raid/mlx/mlx_disk.c b/sys/dev/raid/mlx/mlx_disk.c index deb423df4b..9ba20eb75b 100644 --- a/sys/dev/raid/mlx/mlx_disk.c +++ b/sys/dev/raid/mlx/mlx_disk.c @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/mlx/mlx_disk.c,v 1.8.2.4 2001/06/25 04:37:51 msmith Exp $ - * $DragonFly: src/sys/dev/raid/mlx/mlx_disk.c,v 1.10 2006/09/10 01:26:36 dillon Exp $ + * $DragonFly: src/sys/dev/raid/mlx/mlx_disk.c,v 1.11 2006/10/25 20:56:01 dillon Exp $ */ /* @@ -35,13 +35,10 @@ #include #include #include - #include #include #include #include - -#include #include #include "mlx_compat.h" diff --git a/sys/dev/raid/mlx/mlx_pci.c b/sys/dev/raid/mlx/mlx_pci.c index 3a468755eb..a9a79635f1 100644 --- a/sys/dev/raid/mlx/mlx_pci.c +++ b/sys/dev/raid/mlx/mlx_pci.c @@ -24,22 +24,16 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/mlx/mlx_pci.c,v 1.4.2.5 2001/06/25 04:37:51 msmith Exp $ - * $DragonFly: src/sys/dev/raid/mlx/mlx_pci.c,v 1.3 2003/08/07 21:17:09 dillon Exp $ + * $DragonFly: src/sys/dev/raid/mlx/mlx_pci.c,v 1.4 2006/10/25 20:56:01 dillon Exp $ */ #include #include #include - #include #include #include #include - -#include -#include -#include -#include #include #include diff --git a/sys/dev/raid/mly/mly.c b/sys/dev/raid/mly/mly.c index fa7c4d3d2e..873ebe90a9 100644 --- a/sys/dev/raid/mly/mly.c +++ b/sys/dev/raid/mly/mly.c @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/mly/mly.c,v 1.3.2.3 2001/03/05 20:17:24 msmith Exp $ - * $DragonFly: src/sys/dev/raid/mly/mly.c,v 1.15 2006/09/10 01:26:36 dillon Exp $ + * $DragonFly: src/sys/dev/raid/mly/mly.c,v 1.16 2006/10/25 20:56:01 dillon Exp $ */ #include @@ -38,10 +38,6 @@ #include #include #include - -#include -#include -#include #include #include diff --git a/sys/dev/raid/mly/mly_cam.c b/sys/dev/raid/mly/mly_cam.c index bd792cf4ef..98be69f533 100644 --- a/sys/dev/raid/mly/mly_cam.c +++ b/sys/dev/raid/mly/mly_cam.c @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/mly/mly_cam.c,v 1.1.2.3 2001/04/21 04:09:06 msmith Exp $ - * $DragonFly: src/sys/dev/raid/mly/Attic/mly_cam.c,v 1.5 2005/06/10 17:10:26 swildner Exp $ + * $DragonFly: src/sys/dev/raid/mly/Attic/mly_cam.c,v 1.6 2006/10/25 20:56:01 dillon Exp $ */ /* * CAM interface for FreeBSD @@ -45,9 +45,6 @@ #include #include -#include -#include - #include "mlyreg.h" #include "mlyio.h" #include "mlyvar.h" diff --git a/sys/dev/raid/mly/mly_pci.c b/sys/dev/raid/mly/mly_pci.c index 15b1a2b3a2..1c153913bf 100644 --- a/sys/dev/raid/mly/mly_pci.c +++ b/sys/dev/raid/mly/mly_pci.c @@ -25,22 +25,17 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/mly/mly_pci.c,v 1.1.2.2 2001/03/05 20:17:24 msmith Exp $ - * $DragonFly: src/sys/dev/raid/mly/Attic/mly_pci.c,v 1.7 2006/09/05 00:55:42 dillon Exp $ + * $DragonFly: src/sys/dev/raid/mly/Attic/mly_pci.c,v 1.8 2006/10/25 20:56:01 dillon Exp $ */ #include #include #include #include - #include #include #include #include - -#include -#include -#include #include #include diff --git a/sys/dev/raid/pst/pst-iop.c b/sys/dev/raid/pst/pst-iop.c index 63d3fcab41..9761adaf19 100644 --- a/sys/dev/raid/pst/pst-iop.c +++ b/sys/dev/raid/pst/pst-iop.c @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/pst/pst-iop.c,v 1.2.2.1 2002/08/18 12:32:36 sos Exp $ - * $DragonFly: src/sys/dev/raid/pst/pst-iop.c,v 1.9 2006/09/05 03:48:11 dillon Exp $ + * $DragonFly: src/sys/dev/raid/pst/pst-iop.c,v 1.10 2006/10/25 20:56:01 dillon Exp $ */ #include @@ -36,13 +36,14 @@ #include #include #include +#include + #include #include + #include #include -#include -#include -#include + #include #include diff --git a/sys/dev/raid/pst/pst-pci.c b/sys/dev/raid/pst/pst-pci.c index b7566c2b36..030d35262d 100644 --- a/sys/dev/raid/pst/pst-pci.c +++ b/sys/dev/raid/pst/pst-pci.c @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/pst/pst-pci.c,v 1.1.2.1 2002/08/18 12:32:36 sos Exp $ - * $DragonFly: src/sys/dev/raid/pst/pst-pci.c,v 1.3 2003/08/07 21:16:58 dillon Exp $ + * $DragonFly: src/sys/dev/raid/pst/pst-pci.c,v 1.4 2006/10/25 20:56:01 dillon Exp $ */ #include @@ -36,12 +36,13 @@ #include #include #include +#include + #include #include + #include -#include -#include -#include + #include #include diff --git a/sys/dev/raid/pst/pst-raid.c b/sys/dev/raid/pst/pst-raid.c index 2fbd4d9908..6a2061f6c9 100644 --- a/sys/dev/raid/pst/pst-raid.c +++ b/sys/dev/raid/pst/pst-raid.c @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/pst/pst-raid.c,v 1.2.2.1 2002/08/18 12:32:36 sos Exp $ - * $DragonFly: src/sys/dev/raid/pst/pst-raid.c,v 1.19 2006/09/10 01:26:36 dillon Exp $ + * $DragonFly: src/sys/dev/raid/pst/pst-raid.c,v 1.20 2006/10/25 20:56:01 dillon Exp $ */ #include @@ -35,20 +35,21 @@ #include #include #include -#include #include #include #include #include #include #include +#include +#include #include + #include #include + #include -#include -#include -#include + #include #include diff --git a/sys/dev/raid/twa/twa_includes.h b/sys/dev/raid/twa/twa_includes.h index d3040652e5..ef1906a896 100644 --- a/sys/dev/raid/twa/twa_includes.h +++ b/sys/dev/raid/twa/twa_includes.h @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD$ - * $DragonFly: src/sys/dev/raid/twa/twa_includes.h,v 1.3 2006/07/28 02:17:38 dillon Exp $ + * $DragonFly: src/sys/dev/raid/twa/twa_includes.h,v 1.4 2006/10/25 20:56:01 dillon Exp $ */ /* @@ -45,16 +45,13 @@ #include #include #include +#include #include -#include -#include #include #include -#include - #include #include diff --git a/sys/dev/raid/twe/twe_compat.h b/sys/dev/raid/twe/twe_compat.h index 2bb5b3af1f..a2293e6741 100644 --- a/sys/dev/raid/twe/twe_compat.h +++ b/sys/dev/raid/twe/twe_compat.h @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/twe/twe_compat.h,v 1.1.2.5 2004/04/07 22:18:00 vkashyap Exp $ - * $DragonFly: src/sys/dev/raid/twe/twe_compat.h,v 1.15 2006/09/10 01:26:36 dillon Exp $ + * $DragonFly: src/sys/dev/raid/twe/twe_compat.h,v 1.16 2006/10/25 20:56:01 dillon Exp $ */ /* * Portability and compatibility interfaces. @@ -45,21 +45,16 @@ #include #include #include -#include #include #include #include #include - +#include #include +#include -#include -#include -#include #include -#include - #include #include diff --git a/sys/dev/serial/dgb/dgm.c b/sys/dev/serial/dgb/dgm.c index 816f5927cf..54c94ae547 100644 --- a/sys/dev/serial/dgb/dgm.c +++ b/sys/dev/serial/dgb/dgm.c @@ -1,6 +1,6 @@ /*- * $FreeBSD: src/sys/dev/dgb/dgm.c,v 1.31.2.3 2001/10/07 09:02:25 brian Exp $ - * $DragonFly: src/sys/dev/serial/dgb/dgm.c,v 1.14 2006/09/10 01:26:36 dillon Exp $ + * $DragonFly: src/sys/dev/serial/dgb/dgm.c,v 1.15 2006/10/25 20:56:01 dillon Exp $ * * This driver and the associated header files support the ISA PC/Xem * Digiboards. Its evolutionary roots are described below. @@ -88,8 +88,6 @@ #include #include #include -#include -#include #include diff --git a/sys/dev/serial/digi/digi.c b/sys/dev/serial/digi/digi.c index 5699988272..c6a8637a59 100644 --- a/sys/dev/serial/digi/digi.c +++ b/sys/dev/serial/digi/digi.c @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/digi/digi.c,v 1.36 2003/09/26 09:05:57 phk Exp $ - * $DragonFly: src/sys/dev/serial/digi/digi.c,v 1.8 2006/09/10 01:26:36 dillon Exp $ + * $DragonFly: src/sys/dev/serial/digi/digi.c,v 1.9 2006/10/25 20:56:01 dillon Exp $ */ /*- @@ -52,7 +52,6 @@ #include #include #include -#include #include #include diff --git a/sys/dev/serial/digi/digi_isa.c b/sys/dev/serial/digi/digi_isa.c index e246a96cac..588009e6e2 100644 --- a/sys/dev/serial/digi/digi_isa.c +++ b/sys/dev/serial/digi/digi_isa.c @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/digi/digi_isa.c,v 1.12 2003/08/24 17:46:03 obrien Exp $ - * $DragonFly: src/sys/dev/serial/digi/digi_isa.c,v 1.1 2004/12/22 08:42:47 joerg Exp $ + * $DragonFly: src/sys/dev/serial/digi/digi_isa.c,v 1.2 2006/10/25 20:56:01 dillon Exp $ */ /*- @@ -42,9 +42,8 @@ #include #include #include -#include #include -#include + #include #include diff --git a/sys/dev/serial/digi/digi_pci.c b/sys/dev/serial/digi/digi_pci.c index 490f2a859a..061861621f 100644 --- a/sys/dev/serial/digi/digi_pci.c +++ b/sys/dev/serial/digi/digi_pci.c @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/digi/digi_pci.c,v 1.9 2003/08/24 17:46:03 obrien Exp $ - * $DragonFly: src/sys/dev/serial/digi/digi_pci.c,v 1.3 2005/10/12 17:35:55 dillon Exp $ + * $DragonFly: src/sys/dev/serial/digi/digi_pci.c,v 1.4 2006/10/25 20:56:01 dillon Exp $ */ #include @@ -36,11 +36,11 @@ #include #include #include -#include #include -#include + #include #include + #include #include diff --git a/sys/dev/serial/rp/rp.c b/sys/dev/serial/rp/rp.c index 53e0eedc1f..96a706917a 100644 --- a/sys/dev/serial/rp/rp.c +++ b/sys/dev/serial/rp/rp.c @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/rp/rp.c,v 1.45.2.2 2002/11/07 22:26:59 tegge Exp $ - * $DragonFly: src/sys/dev/serial/rp/rp.c,v 1.19 2006/09/10 01:26:36 dillon Exp $ + * $DragonFly: src/sys/dev/serial/rp/rp.c,v 1.20 2006/10/25 20:56:02 dillon Exp $ */ /* @@ -46,8 +46,6 @@ #include #include #include -#include -#include #include #include #include diff --git a/sys/dev/serial/rp/rp_isa.c b/sys/dev/serial/rp/rp_isa.c index 50663c1048..433824d141 100644 --- a/sys/dev/serial/rp/rp_isa.c +++ b/sys/dev/serial/rp/rp_isa.c @@ -33,7 +33,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/rp/rp_isa.c,v 1.3.2.1 2002/06/18 03:11:46 obrien Exp $ - * $DragonFly: src/sys/dev/serial/rp/rp_isa.c,v 1.6 2006/09/05 03:48:11 dillon Exp $ + * $DragonFly: src/sys/dev/serial/rp/rp_isa.c,v 1.7 2006/10/25 20:56:02 dillon Exp $ */ #include @@ -43,8 +43,6 @@ #include #include #include -#include -#include #include #include diff --git a/sys/dev/serial/rp/rp_pci.c b/sys/dev/serial/rp/rp_pci.c index c3f7c2a861..85ef63185a 100644 --- a/sys/dev/serial/rp/rp_pci.c +++ b/sys/dev/serial/rp/rp_pci.c @@ -33,7 +33,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/rp/rp_pci.c,v 1.3.2.1 2002/06/18 03:11:46 obrien Exp $ - * $DragonFly: src/sys/dev/serial/rp/rp_pci.c,v 1.7 2006/09/05 03:48:11 dillon Exp $ + * $DragonFly: src/sys/dev/serial/rp/rp_pci.c,v 1.8 2006/10/25 20:56:02 dillon Exp $ */ #include @@ -43,8 +43,6 @@ #include #include #include -#include -#include #include #include diff --git a/sys/dev/serial/si/si.c b/sys/dev/serial/si/si.c index cea9b5e7a2..2e38ec278e 100644 --- a/sys/dev/serial/si/si.c +++ b/sys/dev/serial/si/si.c @@ -31,7 +31,7 @@ * NO EVENT SHALL THE AUTHORS BE LIABLE. * * $FreeBSD: src/sys/dev/si/si.c,v 1.101.2.1 2001/02/26 04:23:06 jlemon Exp $ - * $DragonFly: src/sys/dev/serial/si/si.c,v 1.20 2006/09/10 01:26:36 dillon Exp $ + * $DragonFly: src/sys/dev/serial/si/si.c,v 1.21 2006/10/25 20:56:02 dillon Exp $ */ #ifndef lint @@ -57,10 +57,8 @@ static const char si_copyright1[] = "@(#) Copyright (C) Specialix International #include #include #include -#include -#include #include -#include +#include #include diff --git a/sys/dev/serial/si/si_eisa.c b/sys/dev/serial/si/si_eisa.c index 73ec3f69f0..7a50e0d7fb 100644 --- a/sys/dev/serial/si/si_eisa.c +++ b/sys/dev/serial/si/si_eisa.c @@ -18,7 +18,7 @@ * NO EVENT SHALL THE AUTHORS BE LIABLE. * * $FreeBSD: src/sys/dev/si/si_eisa.c,v 1.1 2000/01/24 07:24:01 peter Exp $ - * $DragonFly: src/sys/dev/serial/si/si_eisa.c,v 1.5 2005/10/12 17:35:55 dillon Exp $ + * $DragonFly: src/sys/dev/serial/si/si_eisa.c,v 1.6 2006/10/25 20:56:02 dillon Exp $ */ #include @@ -26,9 +26,7 @@ #include #include #include -#include #include -#include #include "sireg.h" #include "sivar.h" diff --git a/sys/dev/serial/si/si_isa.c b/sys/dev/serial/si/si_isa.c index b512a4d44e..a26fabbed5 100644 --- a/sys/dev/serial/si/si_isa.c +++ b/sys/dev/serial/si/si_isa.c @@ -18,7 +18,7 @@ * NO EVENT SHALL THE AUTHORS BE LIABLE. * * $FreeBSD: src/sys/dev/si/si_isa.c,v 1.1 2000/01/24 07:24:01 peter Exp $ - * $DragonFly: src/sys/dev/serial/si/si_isa.c,v 1.5 2005/10/12 17:35:55 dillon Exp $ + * $DragonFly: src/sys/dev/serial/si/si_isa.c,v 1.6 2006/10/25 20:56:02 dillon Exp $ */ #include "opt_debug_si.h" @@ -27,9 +27,7 @@ #include #include #include -#include #include -#include #include "sireg.h" #include "sivar.h" diff --git a/sys/dev/serial/si/si_pci.c b/sys/dev/serial/si/si_pci.c index 4583d54aff..b46bde7174 100644 --- a/sys/dev/serial/si/si_pci.c +++ b/sys/dev/serial/si/si_pci.c @@ -18,16 +18,14 @@ * NO EVENT SHALL THE AUTHORS BE LIABLE. * * $FreeBSD: src/sys/dev/si/si_pci.c,v 1.2 2000/01/24 08:11:10 peter Exp $ - * $DragonFly: src/sys/dev/serial/si/si_pci.c,v 1.5 2005/10/12 17:35:55 dillon Exp $ + * $DragonFly: src/sys/dev/serial/si/si_pci.c,v 1.6 2006/10/25 20:56:02 dillon Exp $ */ #include #include #include #include -#include #include -#include #include "sireg.h" #include "sivar.h" diff --git a/sys/dev/serial/sio/sio.c b/sys/dev/serial/sio/sio.c index 6313c1e5dc..77a6e80046 100644 --- a/sys/dev/serial/sio/sio.c +++ b/sys/dev/serial/sio/sio.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/isa/sio.c,v 1.291.2.35 2003/05/18 08:51:15 murray Exp $ - * $DragonFly: src/sys/dev/serial/sio/sio.c,v 1.35 2006/09/10 01:26:37 dillon Exp $ + * $DragonFly: src/sys/dev/serial/sio/sio.c,v 1.36 2006/10/25 20:56:02 dillon Exp $ * from: @(#)com.c 7.5 (Berkeley) 5/16/91 * from: i386/isa sio.c,v 1.234 */ @@ -70,8 +70,6 @@ #include #include #include -#include -#include #include #include #include @@ -94,7 +92,6 @@ #ifndef SMP #include #endif -#include #include "sioreg.h" #include "sio_private.h" diff --git a/sys/dev/serial/sio/sio_pccard.c b/sys/dev/serial/sio/sio_pccard.c index d0a186b839..6050339772 100644 --- a/sys/dev/serial/sio/sio_pccard.c +++ b/sys/dev/serial/sio/sio_pccard.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $DragonFly: src/sys/dev/serial/sio/sio_pccard.c,v 1.4 2006/09/05 00:55:42 dillon Exp $ + * $DragonFly: src/sys/dev/serial/sio/sio_pccard.c,v 1.5 2006/10/25 20:56:02 dillon Exp $ */ #include #include @@ -39,12 +39,9 @@ #include #include #include -#include #include #include -#include - #include "sioreg.h" #include "sio_private.h" diff --git a/sys/dev/sound/isa/gusc.c b/sys/dev/sound/isa/gusc.c index df8fe9db00..a40591f65d 100644 --- a/sys/dev/sound/isa/gusc.c +++ b/sys/dev/sound/isa/gusc.c @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/sound/isa/gusc.c,v 1.5.2.6 2002/04/22 15:49:30 cg Exp $ - * $DragonFly: src/sys/dev/sound/isa/gusc.c,v 1.8 2006/09/05 00:55:43 dillon Exp $ + * $DragonFly: src/sys/dev/sound/isa/gusc.c,v 1.9 2006/10/25 20:56:02 dillon Exp $ */ #include @@ -34,10 +34,9 @@ #include #include #include -#include -#include #include #include + #include #include #include "bus_if.h" @@ -45,7 +44,7 @@ #include #include -SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/isa/gusc.c,v 1.8 2006/09/05 00:55:43 dillon Exp $"); +SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/isa/gusc.c,v 1.9 2006/10/25 20:56:02 dillon Exp $"); #define LOGICALID_NOPNP 0 #define LOGICALID_PCM 0x0000561e diff --git a/sys/dev/sound/pci/csa.c b/sys/dev/sound/pci/csa.c index 06f7b89bb2..f0e2f6ee28 100644 --- a/sys/dev/sound/pci/csa.c +++ b/sys/dev/sound/pci/csa.c @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/sound/pci/csa.c,v 1.8.2.12 2002/10/05 19:53:18 orion Exp $ - * $DragonFly: src/sys/dev/sound/pci/csa.c,v 1.5 2006/09/05 00:55:43 dillon Exp $ + * $DragonFly: src/sys/dev/sound/pci/csa.c,v 1.6 2006/10/25 20:56:02 dillon Exp $ */ #include @@ -37,10 +37,9 @@ #include #include #include -#include -#include #include #include + #include #include #include @@ -51,7 +50,7 @@ #include "gnu/csaimg.h" -SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pci/csa.c,v 1.5 2006/09/05 00:55:43 dillon Exp $"); +SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pci/csa.c,v 1.6 2006/10/25 20:56:02 dillon Exp $"); /* This is the pci device id. */ #define CS4610_PCI_ID 0x60011013 diff --git a/sys/dev/sound/pcm/sound.h b/sys/dev/sound/pcm/sound.h index 7ee74b081e..b01a49dc7b 100644 --- a/sys/dev/sound/pcm/sound.h +++ b/sys/dev/sound/pcm/sound.h @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/sound/pcm/sound.h,v 1.10.2.11 2002/04/22 15:49:36 cg Exp $ - * $DragonFly: src/sys/dev/sound/pcm/sound.h,v 1.8 2006/04/30 17:22:17 dillon Exp $ + * $DragonFly: src/sys/dev/sound/pcm/sound.h,v 1.9 2006/10/25 20:56:02 dillon Exp $ */ /* @@ -53,22 +53,20 @@ #include #include #include -#if defined(__FreeBSD__) && __FreeBSD_version > 500000 -#include -#endif #include -#include /* for DELAY */ -#include -#include #include #include #include #include #include #include +#include #include + +#include /* for DELAY */ + #include -#include + #include #include diff --git a/sys/dev/usbmisc/udbp/udbp.c b/sys/dev/usbmisc/udbp/udbp.c index beaee0432b..64ed96327a 100644 --- a/sys/dev/usbmisc/udbp/udbp.c +++ b/sys/dev/usbmisc/udbp/udbp.c @@ -27,7 +27,7 @@ * POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/usb/udbp.c,v 1.24 2003/08/24 17:55:55 obrien Exp $ - * $DragonFly: src/sys/dev/usbmisc/udbp/Attic/udbp.c,v 1.7 2006/09/05 00:55:43 dillon Exp $ + * $DragonFly: src/sys/dev/usbmisc/udbp/Attic/udbp.c,v 1.8 2006/10/25 20:56:02 dillon Exp $ */ /* Driver for arbitrary double bulk pipe devices. @@ -90,8 +90,8 @@ #include #include #include + #include -#include #include #include diff --git a/sys/dev/video/bktr/bktr_audio.c b/sys/dev/video/bktr/bktr_audio.c index 96c5cd0ab6..c0aed93cc5 100644 --- a/sys/dev/video/bktr/bktr_audio.c +++ b/sys/dev/video/bktr/bktr_audio.c @@ -31,7 +31,7 @@ * POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/bktr/bktr_audio.c,v 1.13 2003/12/08 07:59:18 obrien Exp $ - * $DragonFly: src/sys/dev/video/bktr/bktr_audio.c,v 1.6 2004/05/15 17:54:12 joerg Exp $ + * $DragonFly: src/sys/dev/video/bktr/bktr_audio.c,v 1.7 2006/10/25 20:56:02 dillon Exp $ */ /* @@ -54,11 +54,10 @@ #include #include #include +#include #include -#include /* for bus space */ -#include -#include + #include #include /* extensions to ioctl_meteor.h */ #include diff --git a/sys/dev/video/bktr/bktr_card.c b/sys/dev/video/bktr/bktr_card.c index 347caf827f..3603a589ca 100644 --- a/sys/dev/video/bktr/bktr_card.c +++ b/sys/dev/video/bktr/bktr_card.c @@ -31,7 +31,7 @@ * POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/bktr/bktr_card.c,v 1.32 2005/02/10 22:38:51 julian Exp $ - * $DragonFly: src/sys/dev/video/bktr/bktr_card.c,v 1.8 2005/03/12 11:35:27 corecode Exp $ + * $DragonFly: src/sys/dev/video/bktr/bktr_card.c,v 1.9 2006/10/25 20:56:02 dillon Exp $ */ /* @@ -52,11 +52,9 @@ #include #include #include +#include #include -#include /* for bus space */ -#include -#include #include #include /* extensions to ioctl_meteor.h */ diff --git a/sys/dev/video/bktr/bktr_core.c b/sys/dev/video/bktr/bktr_core.c index 7bf1ab9ce0..34c3d0eea3 100644 --- a/sys/dev/video/bktr/bktr_core.c +++ b/sys/dev/video/bktr/bktr_core.c @@ -62,7 +62,7 @@ * POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/bktr/bktr_core.c,v 1.138 2005/01/09 17:42:03 cognet Exp - * $DragonFly: src/sys/dev/video/bktr/bktr_core.c,v 1.18 2006/09/10 01:26:37 dillon Exp $ + * $DragonFly: src/sys/dev/video/bktr/bktr_core.c,v 1.19 2006/10/25 20:56:02 dillon Exp $ */ /* @@ -98,24 +98,20 @@ #include #include #include +#include /* used by smbus and newbus */ +#include +#include #include #include #include #include -#include /* used by smbus and newbus */ - #define PROC_LOCK(p) #define PROC_UNLOCK(p) #include #include -#include /* for bus space */ -#include -#include -#include - #include #include /* extensions to ioctl_meteor.h */ #include diff --git a/sys/dev/video/bktr/bktr_i2c.c b/sys/dev/video/bktr/bktr_i2c.c index 06724deff2..ad9cf7a2f8 100644 --- a/sys/dev/video/bktr/bktr_i2c.c +++ b/sys/dev/video/bktr/bktr_i2c.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/bktr/bktr_i2c.c,v 1.25 2003/12/08 07:59:18 obrien Exp $ - * $DragonFly: src/sys/dev/video/bktr/bktr_i2c.c,v 1.7 2006/08/03 16:40:48 swildner Exp $ + * $DragonFly: src/sys/dev/video/bktr/bktr_i2c.c,v 1.8 2006/10/25 20:56:02 dillon Exp $ */ /* @@ -42,16 +42,11 @@ #include #include #include - #include #include #include -#include /* for bus space */ -#include -#include - #include #include /* extensions to ioctl_meteor.h */ #include diff --git a/sys/dev/video/bktr/bktr_os.c b/sys/dev/video/bktr/bktr_os.c index 2036209f4e..51ab5b5f5f 100644 --- a/sys/dev/video/bktr/bktr_os.c +++ b/sys/dev/video/bktr/bktr_os.c @@ -31,7 +31,7 @@ * POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/bktr/bktr_os.c,v 1.45 2004/03/17 17:50:28 njl Exp $ - * $DragonFly: src/sys/dev/video/bktr/bktr_os.c,v 1.15 2006/09/10 01:26:37 dillon Exp $ + * $DragonFly: src/sys/dev/video/bktr/bktr_os.c,v 1.16 2006/10/25 20:56:02 dillon Exp $ */ /* @@ -63,6 +63,8 @@ #include #include #include +#include +#include #include #include @@ -70,14 +72,6 @@ #include #include -#include /* used by smbus and newbus */ - -#include /* used by bus space */ -#include /* used by bus space and newbus */ -#include - -#include /* used by newbus */ -#include /* used by newbus */ #include #include #include diff --git a/sys/dev/video/bktr/bktr_tuner.c b/sys/dev/video/bktr/bktr_tuner.c index 792332968e..0e559036ef 100644 --- a/sys/dev/video/bktr/bktr_tuner.c +++ b/sys/dev/video/bktr/bktr_tuner.c @@ -31,7 +31,7 @@ * POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/bktr/bktr_tuner.c,v 1.18 2005/01/23 07:13:09 julian Exp - * $DragonFly: src/sys/dev/video/bktr/bktr_tuner.c,v 1.7 2005/03/12 11:35:27 corecode Exp $ + * $DragonFly: src/sys/dev/video/bktr/bktr_tuner.c,v 1.8 2006/10/25 20:56:02 dillon Exp $ */ @@ -48,13 +48,10 @@ #include #include #include +#include #include -#include /* for bus space */ -#include -#include - #include #include /* extensions to ioctl_meteor.h */ #include diff --git a/sys/dev/video/bktr/msp34xx.c b/sys/dev/video/bktr/msp34xx.c index a5d88e565d..182d6d74fa 100644 --- a/sys/dev/video/bktr/msp34xx.c +++ b/sys/dev/video/bktr/msp34xx.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/bktr/msp34xx.c,v 1.5 2004/12/16 23:19:57 julian Exp - * $DragonFly: src/sys/dev/video/bktr/msp34xx.c,v 1.4 2006/09/05 00:55:44 dillon Exp $ + * $DragonFly: src/sys/dev/video/bktr/msp34xx.c,v 1.5 2006/10/25 20:56:02 dillon Exp $ */ /* @@ -81,17 +81,11 @@ #include #include #include - +#include #include #include #include -#ifdef BKTR_USE_FREEBSD_SMBUS -#include /* required by bktr_reg.h */ -#endif - -#include /* required by bktr_reg.h */ - #include #include /* extensions to ioctl_meteor.h */ #include diff --git a/sys/emulation/ndis/kern_ndis.c b/sys/emulation/ndis/kern_ndis.c index 6d2c9685fe..2678b405cc 100644 --- a/sys/emulation/ndis/kern_ndis.c +++ b/sys/emulation/ndis/kern_ndis.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.57 2004/07/11 00:19:30 wpaul Exp $ - * $DragonFly: src/sys/emulation/ndis/kern_ndis.c,v 1.12 2006/09/05 03:48:11 dillon Exp $ + * $DragonFly: src/sys/emulation/ndis/kern_ndis.c,v 1.13 2006/10/25 20:56:02 dillon Exp $ */ #include @@ -50,8 +50,6 @@ #include #include #include -#include -#include #include #include diff --git a/sys/emulation/ndis/subr_hal.c b/sys/emulation/ndis/subr_hal.c index f1a2051f65..3554b5b720 100644 --- a/sys/emulation/ndis/subr_hal.c +++ b/sys/emulation/ndis/subr_hal.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/compat/ndis/subr_hal.c,v 1.12 2004/04/19 22:39:04 wpaul Exp $ - * $DragonFly: src/sys/emulation/ndis/subr_hal.c,v 1.2 2005/12/10 16:06:20 swildner Exp $ + * $DragonFly: src/sys/emulation/ndis/subr_hal.c,v 1.3 2006/10/25 20:56:02 dillon Exp $ */ #include @@ -43,15 +43,12 @@ #include #include -#include -#include -#include -#include - #include #include #include +#include + #include "regcall.h" #include "pe_var.h" #include "resource_var.h" diff --git a/sys/emulation/ndis/subr_ndis.c b/sys/emulation/ndis/subr_ndis.c index 4f6bdd4b37..59b6767e39 100644 --- a/sys/emulation/ndis/subr_ndis.c +++ b/sys/emulation/ndis/subr_ndis.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.62 2004/07/11 00:19:30 wpaul Exp $ - * $DragonFly: src/sys/emulation/ndis/subr_ndis.c,v 1.16 2006/09/05 03:48:11 dillon Exp $ + * $DragonFly: src/sys/emulation/ndis/subr_ndis.c,v 1.17 2006/10/25 20:56:02 dillon Exp $ */ /* @@ -67,6 +67,8 @@ #include #include #include +#include +#include #include #include @@ -75,14 +77,6 @@ #include #include -#include -#include -#include -#include - -#include -#include - #include #include diff --git a/sys/emulation/ndis/subr_ntoskrnl.c b/sys/emulation/ndis/subr_ntoskrnl.c index 0eb7538e71..7eb159f1eb 100644 --- a/sys/emulation/ndis/subr_ntoskrnl.c +++ b/sys/emulation/ndis/subr_ntoskrnl.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.40 2004/07/20 20:28:57 wpaul Exp $ - * $DragonFly: src/sys/emulation/ndis/subr_ntoskrnl.c,v 1.9 2006/09/05 00:55:45 dillon Exp $ + * $DragonFly: src/sys/emulation/ndis/subr_ntoskrnl.c,v 1.10 2006/10/25 20:56:02 dillon Exp $ */ #include @@ -49,17 +49,13 @@ #include #include #include +#include +#include #include #include -#include -#include -#include #include -#include -#include - #include "regcall.h" #include "pe_var.h" #include "resource_var.h" diff --git a/sys/kern/bus_if.m b/sys/kern/bus_if.m index 71a6dbca64..ca68f203ee 100644 --- a/sys/kern/bus_if.m +++ b/sys/kern/bus_if.m @@ -24,7 +24,7 @@ # SUCH DAMAGE. # # $FreeBSD: src/sys/kern/bus_if.m,v 1.16 1999/10/12 21:35:50 dfr Exp $ -# $DragonFly: src/sys/kern/bus_if.m,v 1.10 2006/05/31 19:06:13 swildner Exp $ +# $DragonFly: src/sys/kern/bus_if.m,v 1.11 2006/10/25 20:56:02 dillon Exp $ # #include @@ -136,7 +136,7 @@ METHOD device_t add_child { # # Allocate a system resource attached to `dev' on behalf of `child'. -# The types are defined in ; the meaning of the +# The types are defined in ; the meaning of the # resource-ID field varies from bus to bus (but *rid == 0 is always # valid if the resource type is). start and end reflect the allowable # range, and should be passed as `0UL' and `~0UL', respectively, if diff --git a/sys/kern/subr_bus.c b/sys/kern/subr_bus.c index 76f989e904..4cbf504638 100644 --- a/sys/kern/subr_bus.c +++ b/sys/kern/subr_bus.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/kern/subr_bus.c,v 1.54.2.9 2002/10/10 15:13:32 jhb Exp $ - * $DragonFly: src/sys/kern/subr_bus.c,v 1.31 2006/09/05 03:48:12 dillon Exp $ + * $DragonFly: src/sys/kern/subr_bus.c,v 1.32 2006/10/25 20:56:02 dillon Exp $ */ #include "opt_bus.h" @@ -40,8 +40,9 @@ #include #include #include -#include +#include #include + #include /* for device_printf() */ MALLOC_DEFINE(M_BUS, "bus", "Bus data structures"); diff --git a/sys/kern/subr_rman.c b/sys/kern/subr_rman.c index a6fb8262fe..0208ef1365 100644 --- a/sys/kern/subr_rman.c +++ b/sys/kern/subr_rman.c @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/kern/subr_rman.c,v 1.10.2.1 2001/06/05 08:06:08 imp Exp $ - * $DragonFly: src/sys/kern/subr_rman.c,v 1.9 2006/09/05 03:48:12 dillon Exp $ + * $DragonFly: src/sys/kern/subr_rman.c,v 1.10 2006/10/25 20:56:02 dillon Exp $ */ /* @@ -64,7 +64,6 @@ #include #include #include /* XXX debugging */ -#include #include static MALLOC_DEFINE(M_RMAN, "rman", "Resource manager"); diff --git a/sys/net/faith/Makefile b/sys/net/faith/Makefile index 02fdcb8270..52040cd975 100644 --- a/sys/net/faith/Makefile +++ b/sys/net/faith/Makefile @@ -1,10 +1,10 @@ # $FreeBSD: src/sys/modules/if_faith/Makefile,v 1.1.2.1 2001/12/15 01:07:54 brooks Exp $ -# $DragonFly: src/sys/net/faith/Makefile,v 1.3 2005/02/18 11:41:42 corecode Exp $ +# $DragonFly: src/sys/net/faith/Makefile,v 1.4 2006/10/25 20:56:02 dillon Exp $ .PATH: ${.CURDIR}/../../net KMOD= if_faith -SRCS= if_faith.c opt_inet.h opt_inet6.h +SRCS= if_faith.c opt_inet.h opt_inet6.h bus_if.h device_if.h CFLAGS+= -DNFAITH=0 NOMAN= diff --git a/sys/net/faith/if_faith.c b/sys/net/faith/if_faith.c index ab1038b1d7..a907076560 100644 --- a/sys/net/faith/if_faith.c +++ b/sys/net/faith/if_faith.c @@ -33,7 +33,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/net/if_faith.c,v 1.3.2.6 2002/04/28 05:40:25 suz Exp $ - * $DragonFly: src/sys/net/faith/if_faith.c,v 1.15 2006/09/05 00:55:47 dillon Exp $ + * $DragonFly: src/sys/net/faith/if_faith.c,v 1.16 2006/10/25 20:56:02 dillon Exp $ */ /* * derived from @@ -54,6 +54,7 @@ #include #include #include +#include #include #include #include @@ -61,7 +62,6 @@ #include #include #include -#include /* XXX: Shouldn't really be required! */ #include #include diff --git a/sys/net/gif/Makefile b/sys/net/gif/Makefile index e7f01b8e2a..a9cf31b667 100644 --- a/sys/net/gif/Makefile +++ b/sys/net/gif/Makefile @@ -1,10 +1,11 @@ # $FreeBSD: src/sys/modules/if_gif/Makefile,v 1.1.2.1 2001/07/24 19:10:17 brooks Exp $ -# $DragonFly: src/sys/net/gif/Makefile,v 1.3 2005/02/18 11:41:42 corecode Exp $ +# $DragonFly: src/sys/net/gif/Makefile,v 1.4 2006/10/25 20:56:02 dillon Exp $ .PATH: ${.CURDIR}/../../net ${.CURDIR}/../../netinet ${.CURDIR}/../../netinet6 KMOD= if_gif SRCS= if_gif.c in_gif.c in6_gif.c opt_inet.h opt_inet6.h opt_mrouting.h +SRCS+= device_if.h bus_if.h NOMAN= .if !defined(BUILDING_WITH_KERNEL) diff --git a/sys/net/gif/if_gif.c b/sys/net/gif/if_gif.c index 813c3a992a..c51630caef 100644 --- a/sys/net/gif/if_gif.c +++ b/sys/net/gif/if_gif.c @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/net/if_gif.c,v 1.4.2.15 2002/11/08 16:57:13 ume Exp $ - * $DragonFly: src/sys/net/gif/if_gif.c,v 1.17 2006/09/05 00:55:47 dillon Exp $ + * $DragonFly: src/sys/net/gif/if_gif.c,v 1.18 2006/10/25 20:56:02 dillon Exp $ * $KAME: if_gif.c,v 1.87 2001/10/19 08:50:27 itojun Exp $ */ @@ -37,6 +37,7 @@ #include #include #include +#include #include #include #include @@ -48,7 +49,7 @@ #include #include #include -#include /* XXX: Shouldn't really be required! */ + #include #include diff --git a/sys/net/gre/Makefile b/sys/net/gre/Makefile index f314c92de1..8f19ed1ad8 100644 --- a/sys/net/gre/Makefile +++ b/sys/net/gre/Makefile @@ -1,10 +1,11 @@ # $FreeBSD$ -# $DragonFly: src/sys/net/gre/Makefile,v 1.2 2005/02/18 11:41:42 corecode Exp $ +# $DragonFly: src/sys/net/gre/Makefile,v 1.3 2006/10/25 20:56:03 dillon Exp $ .PATH: ${.CURDIR}/../../net ${.CURDIR}/../../netinet KMOD= if_gre SRCS= if_gre.c ip_gre.c opt_inet.h opt_ns.h opt_atalk.h +SRCS+= device_if.h bus_if.h .if !defined(BUILDING_WITH_KERNEL) opt_inet.h: diff --git a/sys/net/gre/if_gre.c b/sys/net/gre/if_gre.c index 2a9936c28d..abd3cf78bf 100644 --- a/sys/net/gre/if_gre.c +++ b/sys/net/gre/if_gre.c @@ -1,6 +1,6 @@ /* $NetBSD: if_gre.c,v 1.42 2002/08/14 00:23:27 itojun Exp $ */ /* $FreeBSD: src/sys/net/if_gre.c,v 1.9.2.3 2003/01/23 21:06:44 sam Exp $ */ -/* $DragonFly: src/sys/net/gre/if_gre.c,v 1.17 2006/09/05 00:55:47 dillon Exp $ */ +/* $DragonFly: src/sys/net/gre/if_gre.c,v 1.18 2006/10/25 20:56:03 dillon Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -53,11 +53,11 @@ #include #include +#include #include #include #include #include -#include #include #include #include diff --git a/sys/net/i4b/capi/iavc/iavc_card.c b/sys/net/i4b/capi/iavc/iavc_card.c index 924f0de517..6921b6806c 100644 --- a/sys/net/i4b/capi/iavc/iavc_card.c +++ b/sys/net/i4b/capi/iavc/iavc_card.c @@ -26,7 +26,7 @@ * The AVM ISDN controllers' card specific support routines. * * $FreeBSD: src/sys/i4b/capi/iavc/iavc_card.c,v 1.1.2.1 2001/08/10 14:08:34 obrien Exp $ - * $DragonFly: src/sys/net/i4b/capi/iavc/iavc_card.c,v 1.7 2006/01/14 11:05:17 swildner Exp $ + * $DragonFly: src/sys/net/i4b/capi/iavc/iavc_card.c,v 1.8 2006/10/25 20:56:03 dillon Exp $ */ #include @@ -34,16 +34,14 @@ #include #include #include -#include - -#include - -#include -#include #include #include #include +#include + +#include + #include #include #include diff --git a/sys/net/i4b/capi/iavc/iavc_isa.c b/sys/net/i4b/capi/iavc/iavc_isa.c index 33a6fb396b..83dce4c358 100644 --- a/sys/net/i4b/capi/iavc/iavc_isa.c +++ b/sys/net/i4b/capi/iavc/iavc_isa.c @@ -23,7 +23,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i4b/capi/iavc/iavc_isa.c,v 1.1.2.1 2001/08/10 14:08:34 obrien Exp $ - * $DragonFly: src/sys/net/i4b/capi/iavc/iavc_isa.c,v 1.8 2005/10/12 17:35:55 dillon Exp $ + * $DragonFly: src/sys/net/i4b/capi/iavc/iavc_isa.c,v 1.9 2006/10/25 20:56:03 dillon Exp $ */ #include @@ -31,16 +31,15 @@ #include #include #include -#include +#include +#include #include -#include -#include -#include -#include +#include #include #include + #include #include diff --git a/sys/net/i4b/capi/iavc/iavc_lli.c b/sys/net/i4b/capi/iavc/iavc_lli.c index 6d489f6f47..95bb6bb994 100644 --- a/sys/net/i4b/capi/iavc/iavc_lli.c +++ b/sys/net/i4b/capi/iavc/iavc_lli.c @@ -26,7 +26,7 @@ * The AVM ISDN controllers' Low Level Interface. * * $FreeBSD: src/sys/i4b/capi/iavc/iavc_lli.c,v 1.2.2.1 2001/08/10 14:08:34 obrien Exp $ - * $DragonFly: src/sys/net/i4b/capi/iavc/iavc_lli.c,v 1.8 2006/01/14 11:05:17 swildner Exp $ + * $DragonFly: src/sys/net/i4b/capi/iavc/iavc_lli.c,v 1.9 2006/10/25 20:56:03 dillon Exp $ */ #include @@ -35,17 +35,16 @@ #include #include #include -#include - -#include - -#include #include #include #include + +#include + #include #include +#include #include #include #include diff --git a/sys/net/i4b/capi/iavc/iavc_pci.c b/sys/net/i4b/capi/iavc/iavc_pci.c index 46f79fdc35..2c90873ef8 100644 --- a/sys/net/i4b/capi/iavc/iavc_pci.c +++ b/sys/net/i4b/capi/iavc/iavc_pci.c @@ -26,7 +26,7 @@ * The AVM ISDN controllers' PCI bus attachment handling. * * $FreeBSD: src/sys/i4b/capi/iavc/iavc_pci.c,v 1.1.2.1 2001/08/10 14:08:34 obrien Exp $ - * $DragonFly: src/sys/net/i4b/capi/iavc/iavc_pci.c,v 1.8 2005/10/12 17:35:55 dillon Exp $ + * $DragonFly: src/sys/net/i4b/capi/iavc/iavc_pci.c,v 1.9 2006/10/25 20:56:03 dillon Exp $ */ #include @@ -34,20 +34,18 @@ #include #include #include -#include +#include +#include #include -#include -#include -#include -#include #include #include #include #include +#include #include #include #include diff --git a/sys/net/i4b/layer1/ifpi/i4b_ifpi_pci.c b/sys/net/i4b/layer1/ifpi/i4b_ifpi_pci.c index cbeaa83524..257b6aad5d 100644 --- a/sys/net/i4b/layer1/ifpi/i4b_ifpi_pci.c +++ b/sys/net/i4b/layer1/ifpi/i4b_ifpi_pci.c @@ -36,7 +36,7 @@ * $Id: i4b_ifpi_pci.c,v 1.4 2000/06/02 11:58:56 hm Exp $ * * $FreeBSD: src/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c,v 1.6.2.1 2001/08/10 14:08:37 obrien Exp $ - * $DragonFly: src/sys/net/i4b/layer1/ifpi/i4b_ifpi_pci.c,v 1.13 2006/01/14 11:05:18 swildner Exp $ + * $DragonFly: src/sys/net/i4b/layer1/ifpi/i4b_ifpi_pci.c,v 1.14 2006/10/25 20:56:03 dillon Exp $ * * last edit-date: [Fri Jan 12 17:01:26 2001] * @@ -52,18 +52,15 @@ #include #include #include - -#include #include #include +#include #include #include #include -#include #include - #include #include #include diff --git a/sys/net/i4b/layer1/ifpi2/i4b_ifpi2_pci.c b/sys/net/i4b/layer1/ifpi2/i4b_ifpi2_pci.c index b53c978648..33684aad23 100644 --- a/sys/net/i4b/layer1/ifpi2/i4b_ifpi2_pci.c +++ b/sys/net/i4b/layer1/ifpi2/i4b_ifpi2_pci.c @@ -36,7 +36,7 @@ * $Id$ * * $FreeBSD: src/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c,v 1.6.2.2 2002/05/15 08:12:42 gj Exp $ - * $DragonFly: src/sys/net/i4b/layer1/ifpi2/i4b_ifpi2_pci.c,v 1.12 2006/01/14 11:05:18 swildner Exp $ + * $DragonFly: src/sys/net/i4b/layer1/ifpi2/i4b_ifpi2_pci.c,v 1.13 2006/10/25 20:56:03 dillon Exp $ * * last edit-date: [Fri Jan 12 17:01:26 2001] * @@ -52,18 +52,15 @@ #include #include #include - -#include #include #include +#include #include #include #include -#include #include - #include #include #include diff --git a/sys/net/i4b/layer1/ifpnp/i4b_ifpnp_avm.c b/sys/net/i4b/layer1/ifpnp/i4b_ifpnp_avm.c index 86b035fb68..280cf3a6c6 100644 --- a/sys/net/i4b/layer1/ifpnp/i4b_ifpnp_avm.c +++ b/sys/net/i4b/layer1/ifpnp/i4b_ifpnp_avm.c @@ -34,7 +34,7 @@ * --------------------------------------------------- * * $FreeBSD: src/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c,v 1.5.2.1 2001/08/10 14:08:37 obrien Exp $ - * $DragonFly: src/sys/net/i4b/layer1/ifpnp/i4b_ifpnp_avm.c,v 1.10 2006/01/14 11:05:18 swildner Exp $ + * $DragonFly: src/sys/net/i4b/layer1/ifpnp/i4b_ifpnp_avm.c,v 1.11 2006/10/25 20:56:03 dillon Exp $ * * last edit-date: [Fri Jan 12 17:05:28 2001] * @@ -49,17 +49,14 @@ #include #include #include - -#include #include #include +#include +#include #include -#include -#include #include - #include #include #include diff --git a/sys/net/i4b/layer1/ihfc/i4b_ihfc_drv.c b/sys/net/i4b/layer1/ihfc/i4b_ihfc_drv.c index 0b1afd7d22..56d84f4ea9 100644 --- a/sys/net/i4b/layer1/ihfc/i4b_ihfc_drv.c +++ b/sys/net/i4b/layer1/ihfc/i4b_ihfc_drv.c @@ -33,7 +33,7 @@ * last edit-date: [Fri Jan 12 17:06:52 2001] * * $FreeBSD: src/sys/i4b/layer1/ihfc/i4b_ihfc_drv.c,v 1.9.2.1 2001/08/10 14:08:37 obrien Exp $ - * $DragonFly: src/sys/net/i4b/layer1/ihfc/i4b_ihfc_drv.c,v 1.7 2005/06/15 11:56:03 joerg Exp $ + * $DragonFly: src/sys/net/i4b/layer1/ihfc/i4b_ihfc_drv.c,v 1.8 2006/10/25 20:56:03 dillon Exp $ * *---------------------------------------------------------------------------*/ @@ -44,13 +44,14 @@ #include #include #include -#include -#include - #include +#include +#include +#include #include "../../include/i4b_mbuf.h" +#include #include #include #include @@ -61,10 +62,6 @@ #include "i4b_ihfc_ext.h" #include "i4b_ihfc_drv.h" -#include -#include - - /*---------------------------------------------------------------------------* * Local prototypes *---------------------------------------------------------------------------*/ diff --git a/sys/net/i4b/layer1/ihfc/i4b_ihfc_pnp.c b/sys/net/i4b/layer1/ihfc/i4b_ihfc_pnp.c index b3c094015e..0335e6b656 100644 --- a/sys/net/i4b/layer1/ihfc/i4b_ihfc_pnp.c +++ b/sys/net/i4b/layer1/ihfc/i4b_ihfc_pnp.c @@ -36,7 +36,7 @@ * $Id: i4b_ihfc_pnp.c,v 1.9 2000/09/19 13:50:36 hm Exp $ * * $FreeBSD: src/sys/i4b/layer1/ihfc/i4b_ihfc_pnp.c,v 1.5.2.1 2001/08/10 14:08:37 obrien Exp $ - * $DragonFly: src/sys/net/i4b/layer1/ihfc/i4b_ihfc_pnp.c,v 1.7 2005/10/12 17:35:55 dillon Exp $ + * $DragonFly: src/sys/net/i4b/layer1/ihfc/i4b_ihfc_pnp.c,v 1.8 2006/10/25 20:56:03 dillon Exp $ * *---------------------------------------------------------------------------*/ @@ -48,25 +48,22 @@ #include #include #include +#include +#include #include -#include - #include "../../include/i4b_global.h" + +#include #include #include +#include + #include "../i4b_l1.h" #include "i4b_ihfc.h" #include "i4b_ihfc_ext.h" -#include -#include -#include -#include - -#include - /*---------------------------------------------------------------------------* * Softc *---------------------------------------------------------------------------*/ diff --git a/sys/net/i4b/layer1/isic/i4b_elsa_qs1p.c b/sys/net/i4b/layer1/isic/i4b_elsa_qs1p.c index aa02523526..ccd1101e0a 100644 --- a/sys/net/i4b/layer1/isic/i4b_elsa_qs1p.c +++ b/sys/net/i4b/layer1/isic/i4b_elsa_qs1p.c @@ -28,7 +28,7 @@ * ================================================================== * * $FreeBSD: src/sys/i4b/layer1/isic/i4b_elsa_qs1p.c,v 1.6.2.1 2001/08/10 14:08:38 obrien Exp $ - * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_elsa_qs1p.c,v 1.6 2005/10/12 17:35:55 dillon Exp $ + * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_elsa_qs1p.c,v 1.7 2006/10/25 20:56:03 dillon Exp $ * * last edit-date: [Wed Jan 24 09:09:28 2001] * @@ -46,16 +46,13 @@ #include #include #include - -#include - -#include #include #include #include #include +#include #include #include "i4b_isic.h" diff --git a/sys/net/i4b/layer1/isic/i4b_isic.h b/sys/net/i4b/layer1/isic/i4b_isic.h index f903691afd..28c4950822 100644 --- a/sys/net/i4b/layer1/isic/i4b_isic.h +++ b/sys/net/i4b/layer1/isic/i4b_isic.h @@ -28,7 +28,7 @@ * --------------------------------------- * * $FreeBSD: src/sys/i4b/layer1/isic/i4b_isic.h,v 1.3.2.1 2001/08/10 14:08:38 obrien Exp $ - * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_isic.h,v 1.5 2006/10/23 21:50:33 dillon Exp $ + * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_isic.h,v 1.6 2006/10/25 20:56:03 dillon Exp $ * * last edit-date: [Fri Jan 26 13:55:12 2001] * @@ -39,9 +39,7 @@ #include #include -#include #include -#include #include "../../include/i4b_l3l4.h" diff --git a/sys/net/i4b/layer1/isic/i4b_usr_sti.c b/sys/net/i4b/layer1/isic/i4b_usr_sti.c index c3a20e1c90..82591a596d 100644 --- a/sys/net/i4b/layer1/isic/i4b_usr_sti.c +++ b/sys/net/i4b/layer1/isic/i4b_usr_sti.c @@ -28,7 +28,7 @@ * ------------------------------------------------------------- * * $FreeBSD: src/sys/i4b/layer1/isic/i4b_usr_sti.c,v 1.5.2.1 2001/08/10 14:08:39 obrien Exp $ - * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_usr_sti.c,v 1.6 2005/10/12 17:35:55 dillon Exp $ + * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_usr_sti.c,v 1.7 2006/10/25 20:56:03 dillon Exp $ * * last edit-date: [Wed Jan 24 09:28:12 2001] * @@ -42,12 +42,10 @@ #include #include #include -#include #include - #include -#include +#include #include #include diff --git a/sys/net/i4b/layer1/itjc/i4b_itjc_pci.c b/sys/net/i4b/layer1/itjc/i4b_itjc_pci.c index 081e1dd928..b988bd3d66 100644 --- a/sys/net/i4b/layer1/itjc/i4b_itjc_pci.c +++ b/sys/net/i4b/layer1/itjc/i4b_itjc_pci.c @@ -34,7 +34,7 @@ * ---------------------------------------- * * $FreeBSD: src/sys/i4b/layer1/itjc/i4b_itjc_pci.c,v 1.1.2.1 2001/08/10 14:08:39 obrien Exp $ - * $DragonFly: src/sys/net/i4b/layer1/itjc/i4b_itjc_pci.c,v 1.15 2006/01/14 11:05:18 swildner Exp $ + * $DragonFly: src/sys/net/i4b/layer1/itjc/i4b_itjc_pci.c,v 1.16 2006/10/25 20:56:03 dillon Exp $ * * last edit-date: [Thu Jan 11 11:29:38 2001] * @@ -50,21 +50,17 @@ #include #include #include - -#include -#include -#include -#include #include #include +#include +#include + +#include #include #include -#include -#include #include - #include #include #include diff --git a/sys/net/i4b/layer1/iwic/i4b_iwic_pci.c b/sys/net/i4b/layer1/iwic/i4b_iwic_pci.c index e5cee1593d..df717a02a9 100644 --- a/sys/net/i4b/layer1/iwic/i4b_iwic_pci.c +++ b/sys/net/i4b/layer1/iwic/i4b_iwic_pci.c @@ -28,7 +28,7 @@ * ---------------------------------------- * * $FreeBSD: src/sys/i4b/layer1/iwic/i4b_iwic_pci.c,v 1.6.2.1 2001/08/10 14:08:40 obrien Exp $ - * $DragonFly: src/sys/net/i4b/layer1/iwic/i4b_iwic_pci.c,v 1.5 2005/10/12 17:35:56 dillon Exp $ + * $DragonFly: src/sys/net/i4b/layer1/iwic/i4b_iwic_pci.c,v 1.6 2006/10/25 20:56:03 dillon Exp $ * * last edit-date: [Tue Jan 16 10:53:03 2001] * @@ -44,17 +44,13 @@ #include #include #include -#include - - -#include -#include #include #include #include #include +#include #include #include diff --git a/sys/net/ppp_layer/ppp_tty.c b/sys/net/ppp_layer/ppp_tty.c index 9a19b73618..ed44ee216f 100644 --- a/sys/net/ppp_layer/ppp_tty.c +++ b/sys/net/ppp_layer/ppp_tty.c @@ -71,7 +71,7 @@ */ /* $FreeBSD: src/sys/net/ppp_tty.c,v 1.43.2.1 2002/02/13 00:43:11 dillon Exp $ */ -/* $DragonFly: src/sys/net/ppp_layer/ppp_tty.c,v 1.21 2006/10/23 21:59:18 dillon Exp $ */ +/* $DragonFly: src/sys/net/ppp_layer/ppp_tty.c,v 1.22 2006/10/25 20:56:03 dillon Exp $ */ #include "opt_ppp.h" /* XXX for ppp_defs.h */ @@ -90,8 +90,6 @@ #include #include -#include - #include #include diff --git a/sys/net/sl/if_sl.c b/sys/net/sl/if_sl.c index 4e96174fd8..1c7e1770a5 100644 --- a/sys/net/sl/if_sl.c +++ b/sys/net/sl/if_sl.c @@ -32,7 +32,7 @@ * * @(#)if_sl.c 8.6 (Berkeley) 2/1/94 * $FreeBSD: src/sys/net/if_sl.c,v 1.84.2.2 2002/02/13 00:43:10 dillon Exp $ - * $DragonFly: src/sys/net/sl/if_sl.c,v 1.29 2006/10/23 21:50:33 dillon Exp $ + * $DragonFly: src/sys/net/sl/if_sl.c,v 1.30 2006/10/25 20:56:03 dillon Exp $ */ /* @@ -105,10 +105,6 @@ #include -#ifdef __i386__ -#include -#endif - static void slattach (void *); PSEUDO_SET(slattach, if_sl); diff --git a/sys/net/vlan/Makefile b/sys/net/vlan/Makefile index 634fc3a9c2..42b04f617e 100644 --- a/sys/net/vlan/Makefile +++ b/sys/net/vlan/Makefile @@ -1,10 +1,11 @@ # $FreeBSD: src/sys/modules/if_vlan/Makefile,v 1.1.2.1 2001/12/04 20:09:32 brooks Exp $ -# $DragonFly: src/sys/net/vlan/Makefile,v 1.3 2005/02/18 11:41:42 corecode Exp $ +# $DragonFly: src/sys/net/vlan/Makefile,v 1.4 2006/10/25 20:56:03 dillon Exp $ .PATH: ${.CURDIR}/../../net KMOD= if_vlan SRCS= if_vlan.c opt_inet.h +SRCS+= device_if.h bus_if.h CFLAGS+= -DNVLAN=0 NOMAN= diff --git a/sys/net/vlan/if_vlan.c b/sys/net/vlan/if_vlan.c index 745240ed8d..ba57aa498f 100644 --- a/sys/net/vlan/if_vlan.c +++ b/sys/net/vlan/if_vlan.c @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/net/if_vlan.c,v 1.15.2.13 2003/02/14 22:25:58 fenner Exp $ - * $DragonFly: src/sys/net/vlan/if_vlan.c,v 1.21 2006/09/05 00:55:48 dillon Exp $ + * $DragonFly: src/sys/net/vlan/if_vlan.c,v 1.22 2006/10/25 20:56:03 dillon Exp $ */ /* @@ -61,6 +61,7 @@ #include "opt_inet.h" #include +#include #include #include #include @@ -69,9 +70,8 @@ #include #include #include -#include +#include #include -#include /* XXX: Shouldn't really be required! */ #include #include diff --git a/sys/platform/pc32/acpica5/acpi_wakeup.c b/sys/platform/pc32/acpica5/acpi_wakeup.c index 3a8470b7f7..a1943d99fc 100644 --- a/sys/platform/pc32/acpica5/acpi_wakeup.c +++ b/sys/platform/pc32/acpica5/acpi_wakeup.c @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/acpica/acpi_wakeup.c,v 1.33 2004/05/06 02:18:58 njl Exp $ - * $DragonFly: src/sys/platform/pc32/acpica5/acpi_wakeup.c,v 1.10 2006/10/23 21:59:16 dillon Exp $ + * $DragonFly: src/sys/platform/pc32/acpica5/acpi_wakeup.c,v 1.11 2006/10/25 20:55:48 dillon Exp $ */ #include @@ -42,7 +42,6 @@ #include #include -#include #include #include #include diff --git a/sys/platform/pc32/i386/busdma_machdep.c b/sys/platform/pc32/i386/busdma_machdep.c index e3c2d33277..f1f74e58a5 100644 --- a/sys/platform/pc32/i386/busdma_machdep.c +++ b/sys/platform/pc32/i386/busdma_machdep.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/i386/busdma_machdep.c,v 1.16.2.2 2003/01/23 00:55:27 scottl Exp $ - * $DragonFly: src/sys/platform/pc32/i386/busdma_machdep.c,v 1.16 2006/09/13 18:45:12 swildner Exp $ + * $DragonFly: src/sys/platform/pc32/i386/busdma_machdep.c,v 1.17 2006/10/25 20:55:51 dillon Exp $ */ #include @@ -33,6 +33,7 @@ #include #include #include +#include #include #include @@ -42,7 +43,6 @@ #include #include -#include #include #define MAX_BPAGES 128 diff --git a/sys/platform/pc32/i386/nexus.c b/sys/platform/pc32/i386/nexus.c index 01f3e51d89..315708cd74 100644 --- a/sys/platform/pc32/i386/nexus.c +++ b/sys/platform/pc32/i386/nexus.c @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/i386/nexus.c,v 1.26.2.10 2003/02/22 13:16:45 imp Exp $ - * $DragonFly: src/sys/platform/pc32/i386/nexus.c,v 1.26 2006/10/23 21:50:30 dillon Exp $ + * $DragonFly: src/sys/platform/pc32/i386/nexus.c,v 1.27 2006/10/25 20:55:51 dillon Exp $ */ /* @@ -47,7 +47,6 @@ #include #include #include -#include #include #include @@ -56,7 +55,6 @@ #include #include -#include #include #include #include diff --git a/sys/platform/pc32/include/bus.h b/sys/platform/pc32/include/bus.h deleted file mode 100644 index cbb58cc53c..0000000000 --- a/sys/platform/pc32/include/bus.h +++ /dev/null @@ -1,105 +0,0 @@ -/*- - * Copyright (c) KATO Takenori, 1999. - * - * All rights reserved. Unpublished rights reserved under the copyright - * laws of Japan. - * - * 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 as - * the first lines of this file unmodified. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. 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 ``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 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: src/sys/i386/include/bus.h,v 1.7.2.2 2002/03/03 05:42:50 nyan Exp $ - * $DragonFly: src/sys/platform/pc32/include/Attic/bus.h,v 1.6 2006/10/23 21:50:31 dillon Exp $ - */ - -#ifndef _MACHINE_BUS_H_ -#define _MACHINE_BUS_H_ - -#include -#include - -/* - * Stream accesses are the same as normal accesses on i386; there are no - * supported bus systems with an endianess different from the host one. - */ -#define bus_space_read_stream_1(t, h, o) bus_space_read_1((t), (h), (o)) -#define bus_space_read_stream_2(t, h, o) bus_space_read_2((t), (h), (o)) -#define bus_space_read_stream_4(t, h, o) bus_space_read_4((t), (h), (o)) - -#define bus_space_read_multi_stream_1(t, h, o, a, c) \ - bus_space_read_multi_1((t), (h), (o), (a), (c)) -#define bus_space_read_multi_stream_2(t, h, o, a, c) \ - bus_space_read_multi_2((t), (h), (o), (a), (c)) -#define bus_space_read_multi_stream_4(t, h, o, a, c) \ - bus_space_read_multi_4((t), (h), (o), (a), (c)) - -#define bus_space_write_stream_1(t, h, o, v) \ - bus_space_write_1((t), (h), (o), (v)) -#define bus_space_write_stream_2(t, h, o, v) \ - bus_space_write_2((t), (h), (o), (v)) -#define bus_space_write_stream_4(t, h, o, v) \ - bus_space_write_4((t), (h), (o), (v)) - -#define bus_space_write_multi_stream_1(t, h, o, a, c) \ - bus_space_write_multi_1((t), (h), (o), (a), (c)) -#define bus_space_write_multi_stream_2(t, h, o, a, c) \ - bus_space_write_multi_2((t), (h), (o), (a), (c)) -#define bus_space_write_multi_stream_4(t, h, o, a, c) \ - bus_space_write_multi_4((t), (h), (o), (a), (c)) - -#define bus_space_set_multi_stream_1(t, h, o, v, c) \ - bus_space_set_multi_1((t), (h), (o), (v), (c)) -#define bus_space_set_multi_stream_2(t, h, o, v, c) \ - bus_space_set_multi_2((t), (h), (o), (v), (c)) -#define bus_space_set_multi_stream_4(t, h, o, v, c) \ - bus_space_set_multi_4((t), (h), (o), (v), (c)) - -#define bus_space_read_region_stream_1(t, h, o, a, c) \ - bus_space_read_region_1((t), (h), (o), (a), (c)) -#define bus_space_read_region_stream_2(t, h, o, a, c) \ - bus_space_read_region_2((t), (h), (o), (a), (c)) -#define bus_space_read_region_stream_4(t, h, o, a, c) \ - bus_space_read_region_4((t), (h), (o), (a), (c)) - -#define bus_space_write_region_stream_1(t, h, o, a, c) \ - bus_space_write_region_1((t), (h), (o), (a), (c)) -#define bus_space_write_region_stream_2(t, h, o, a, c) \ - bus_space_write_region_2((t), (h), (o), (a), (c)) -#define bus_space_write_region_stream_4(t, h, o, a, c) \ - bus_space_write_region_4((t), (h), (o), (a), (c)) - -#define bus_space_set_region_stream_1(t, h, o, v, c) \ - bus_space_set_region_1((t), (h), (o), (v), (c)) -#define bus_space_set_region_stream_2(t, h, o, v, c) \ - bus_space_set_region_2((t), (h), (o), (v), (c)) -#define bus_space_set_region_stream_4(t, h, o, v, c) \ - bus_space_set_region_4((t), (h), (o), (v), (c)) - -#define bus_space_copy_region_stream_1(t, h1, o1, h2, o2, c) \ - bus_space_copy_region_1((t), (h1), (o1), (h2), (o2), (c)) -#define bus_space_copy_region_stream_2(t, h1, o1, h2, o2, c) \ - bus_space_copy_region_2((t), (h1), (o1), (h2), (o2), (c)) -#define bus_space_copy_region_stream_4(t, h1, o1, h2, o2, c) \ - bus_space_copy_region_4((t), (h1), (o1), (h2), (o2), (c)) - -#endif /* _MACHINE_BUS_H_ */ diff --git a/sys/platform/pc32/include/bus_memio.h b/sys/platform/pc32/include/bus_memio.h deleted file mode 100644 index 876ef25d36..0000000000 --- a/sys/platform/pc32/include/bus_memio.h +++ /dev/null @@ -1,32 +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: src/sys/i386/include/bus_memio.h,v 1.2 1999/08/28 00:44:08 peter Exp $ - * $DragonFly: src/sys/platform/pc32/include/Attic/bus_memio.h,v 1.3 2006/10/23 21:50:31 dillon Exp $ - */ - -#ifndef _MACHINE_BUS_MEMIO_H_ -#define _MACHINE_BUS_MEMIO_H_ -#endif /* _MACHINE_BUS_MEMIO_H_ */ diff --git a/sys/platform/pc32/include/bus_pio.h b/sys/platform/pc32/include/bus_pio.h deleted file mode 100644 index b7b99002dc..0000000000 --- a/sys/platform/pc32/include/bus_pio.h +++ /dev/null @@ -1,32 +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: src/sys/i386/include/bus_pio.h,v 1.2 1999/08/28 00:44:08 peter Exp $ - * $DragonFly: src/sys/platform/pc32/include/Attic/bus_pio.h,v 1.3 2006/10/23 21:50:31 dillon Exp $ - */ - -#ifndef _MACHINE_BUS_PIO_H_ -#define _MACHINE_BUS_PIO_H_ -#endif /* _MACHINE_BUS_PIO_H_ */ diff --git a/sys/platform/pc32/isa/npx.c b/sys/platform/pc32/isa/npx.c index f844739565..c4a9330b7e 100644 --- a/sys/platform/pc32/isa/npx.c +++ b/sys/platform/pc32/isa/npx.c @@ -33,7 +33,7 @@ * * from: @(#)npx.c 7.2 (Berkeley) 5/12/91 * $FreeBSD: src/sys/i386/isa/npx.c,v 1.80.2.3 2001/10/20 19:04:38 tegge Exp $ - * $DragonFly: src/sys/platform/pc32/isa/npx.c,v 1.35 2006/10/23 21:50:31 dillon Exp $ + * $DragonFly: src/sys/platform/pc32/isa/npx.c,v 1.36 2006/10/25 20:55:51 dillon Exp $ */ #include "opt_cpu.h" @@ -48,7 +48,6 @@ #include #include #include -#include #include #ifdef NPX_DEBUG #include @@ -68,7 +67,6 @@ #ifndef SMP #include #endif -#include #include #include #include diff --git a/sys/platform/vkernel/conf/files b/sys/platform/vkernel/conf/files index 9d44eee6a5..c86c74ce10 100644 --- a/sys/platform/vkernel/conf/files +++ b/sys/platform/vkernel/conf/files @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $DragonFly: src/sys/platform/vkernel/conf/files,v 1.1 2006/10/22 16:09:14 dillon Exp $ +# $DragonFly: src/sys/platform/vkernel/conf/files,v 1.2 2006/10/25 20:55:51 dillon Exp $ # bf_enc.o optional ipsec ipsec_esp \ dependency "$S/crypto/blowfish/arch/i386/bf_enc.S $S/crypto/blowfish/arch/i386/bf_enc_586.S $S/crypto/blowfish/arch/i386/bf_enc_686.S" \ @@ -28,14 +28,14 @@ vfs/smbfs/smbfs_smb.c optional smbfs vfs/smbfs/smbfs_subr.c optional smbfs vfs/smbfs/smbfs_vfsops.c optional smbfs vfs/smbfs/smbfs_vnops.c optional smbfs -i386/i386/atomic.c standard \ +arch/i386/i386/atomic.c standard \ compile-with "${CC} -c ${CFLAGS} ${DEFINED_PROF:S/^$/-fomit-frame-pointer/} ${.IMPSRC}" -vkernel/vkernel/autoconf.c standard +arch/vkernel/vkernel/autoconf.c standard # # DDB XXX -i386/i386/elf_machdep.c standard -i386/i386/in_cksum2.s optional inet -i386/i386/ktr.c optional ktr +arch/i386/i386/elf_machdep.c standard +arch/i386/i386/in_cksum2.s optional inet +arch/i386/i386/ktr.c optional ktr #vkernel/vkernel/pmap.c standard #vkernel/vkernel/pmap_inval.c standard #vkernel/vkernel/spinlock.s standard diff --git a/sys/platform/vkernel/conf/options b/sys/platform/vkernel/conf/options index 1faa4e3019..60f7c8971c 100644 --- a/sys/platform/vkernel/conf/options +++ b/sys/platform/vkernel/conf/options @@ -1,5 +1,5 @@ # -# $DragonFly: src/sys/platform/vkernel/conf/options,v 1.1 2006/10/22 16:09:14 dillon Exp $ +# $DragonFly: src/sys/platform/vkernel/conf/options,v 1.2 2006/10/25 20:55:51 dillon Exp $ # # The cpu type @@ -7,3 +7,8 @@ I586_CPU opt_global.h I686_CPU opt_global.h +# +# +SHOW_BUSYBUFS +PANIC_REBOOT_WAIT_TIME opt_panic.h + diff --git a/sys/sys/bus.h b/sys/sys/bus.h index 94f2d8edba..0493500c2d 100644 --- a/sys/sys/bus.h +++ b/sys/sys/bus.h @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/sys/bus.h,v 1.30.2.5 2004/03/17 17:54:25 njl Exp $ - * $DragonFly: src/sys/sys/bus.h,v 1.22 2006/05/20 02:42:13 dillon Exp $ + * $DragonFly: src/sys/sys/bus.h,v 1.23 2006/10/25 20:56:03 dillon Exp $ */ #ifndef _SYS_BUS_H_ @@ -44,6 +44,12 @@ #ifdef _KERNEL #include #endif +#ifndef _SYS_BUS_DMA_H_ +#include +#endif +#ifndef _SYS_BUS_RESOURCE_H_ +#include +#endif /* * Forward declarations diff --git a/sys/cpu/i386/include/bus_dma.h b/sys/sys/bus_dma.h similarity index 95% copy from sys/cpu/i386/include/bus_dma.h copy to sys/sys/bus_dma.h index b49425d498..e02565496e 100644 --- a/sys/cpu/i386/include/bus_dma.h +++ b/sys/sys/bus_dma.h @@ -1,5 +1,3 @@ -/* $NetBSD: bus.h,v 1.12 1997/10/01 08:25:15 fvdl Exp $ */ - /*- * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc. * All rights reserved. @@ -36,7 +34,6 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ - /* * Copyright (c) 1996 Charles M. Hannum. All rights reserved. * Copyright (c) 1996 Christopher G. Demetriou. All rights reserved. @@ -67,14 +64,20 @@ * (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: src/sys/i386/include/bus_dma.h,v 1.15.2.2 2002/11/21 23:36:01 sam Exp $ */ -/* $DragonFly: src/sys/cpu/i386/include/bus_dma.h,v 1.6 2006/10/23 21:50:31 dillon Exp $ */ +/* + * $NetBSD: bus.h,v 1.12 1997/10/01 08:25:15 fvdl Exp $ + * $FreeBSD: src/sys/i386/include/bus_dma.h,v 1.15.2.2 2002/11/21 23:36:01 sam Exp $ + * $DragonFly: src/sys/sys/bus_dma.h,v 1.1 2006/10/25 20:56:03 dillon Exp $ + */ -#ifndef _MACHINE_BUS_DMA_H_ -#define _MACHINE_BUS_DMA_H_ +#ifndef _SYS_BUS_DMA_H_ +#define _SYS_BUS_DMA_H_ -#ifndef _MACHINE_BUS_AT386_H_ -#include +/* + * Include machine-specific bus stuff + */ +#ifndef _MACHINE_BUS_DMA_H_ +#include /* bus_addr_t */ #endif /* @@ -247,4 +250,5 @@ void _bus_dmamap_unload(bus_dma_tag_t dmat, bus_dmamap_t map); if ((dmamap) != NULL) \ _bus_dmamap_unload(dmat, dmamap) -#endif /* _MACHINE_BUS_DMA_H_ */ +#endif /* _SYS_BUS_DMA_H_ */ + diff --git a/sys/platform/pc32/include/resource.h b/sys/sys/bus_resource.h similarity index 86% rename from sys/platform/pc32/include/resource.h rename to sys/sys/bus_resource.h index 81a02b04d1..d9cfafd376 100644 --- a/sys/platform/pc32/include/resource.h +++ b/sys/sys/bus_resource.h @@ -1,5 +1,3 @@ -/* $FreeBSD: src/sys/i386/include/resource.h,v 1.3 1999/10/14 21:38:30 dfr Exp $ */ -/* $DragonFly: src/sys/platform/pc32/include/Attic/resource.h,v 1.3 2006/10/23 21:50:31 dillon Exp $ */ /* * Copyright 1998 Massachusetts Institute of Technology * @@ -27,10 +25,13 @@ * 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: src/sys/i386/include/resource.h,v 1.3 1999/10/14 21:38:30 dfr Exp $ + * $DragonFly: src/sys/sys/bus_resource.h,v 1.1 2006/10/25 20:56:03 dillon Exp $ */ -#ifndef _MACHINE_RESOURCE_H_ -#define _MACHINE_RESOURCE_H_ +#ifndef _SYS_BUS_RESOURCE_H_ +#define _SYS_BUS_RESOURCE_H_ /* * Definitions of resource types for Intel Architecture machines @@ -42,4 +43,4 @@ #define SYS_RES_MEMORY 3 /* i/o memory */ #define SYS_RES_IOPORT 4 /* i/o ports */ -#endif /* !_MACHINE_RESOURCE_H_ */ +#endif /* !_SYS_BUS_RESOURCE_H_ */ diff --git a/sys/sys/firmware.h b/sys/sys/firmware.h index 4afa0eaa35..49575ee716 100644 --- a/sys/sys/firmware.h +++ b/sys/sys/firmware.h @@ -30,7 +30,7 @@ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $DragonFly: src/sys/sys/firmware.h,v 1.2 2006/05/20 02:42:13 dillon Exp $ + * $DragonFly: src/sys/sys/firmware.h,v 1.3 2006/10/25 20:56:03 dillon Exp $ */ #ifndef _SYS_FIRMWARE_H_ @@ -40,10 +40,18 @@ #error "No user-servicable parts inside" #endif +#ifndef _SYS_TYPES_H_ #include +#endif +#ifndef _SYS_QUEUE_H_ #include -#include -#include +#endif +#ifndef _SYS_BUS_H_ +#include +#endif +#ifndef _SYS_BUS_DMA_H_ +#include +#endif struct fw_image { TAILQ_ENTRY(fw_image) fw_link; diff --git a/sys/sys/rman.h b/sys/sys/rman.h index 0c7830c284..d02d54d723 100644 --- a/sys/sys/rman.h +++ b/sys/sys/rman.h @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/sys/rman.h,v 1.5.2.1 2001/06/05 08:06:07 imp Exp $ - * $DragonFly: src/sys/sys/rman.h,v 1.9 2006/05/20 02:42:13 dillon Exp $ + * $DragonFly: src/sys/sys/rman.h,v 1.10 2006/10/25 20:56:03 dillon Exp $ */ #ifndef _SYS_RMAN_H_ @@ -39,8 +39,8 @@ #ifndef _SYS_QUEUE_H_ #include #endif -#ifndef _MACHINE_BUS_H_ -#include /* bus_space_tag_t */ +#ifndef _SYS_BUS_H_ +#include /* bus_space_tag_t */ #endif /*