diff options
97 files changed, 72 insertions, 510 deletions
diff --git a/sys/amd64/amd64/fpu.c b/sys/amd64/amd64/fpu.c index 3b0ca26..2e521ae 100644 --- a/sys/amd64/amd64/fpu.c +++ b/sys/amd64/amd64/fpu.c @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * from: @(#)npx.c 7.2 (Berkeley) 5/12/91 - * $Id: npx.c,v 1.46 1997/06/22 16:04:06 peter Exp $ + * $Id: npx.c,v 1.47 1997/07/17 02:09:25 peter Exp $ */ #include "npx.h" @@ -40,14 +40,12 @@ #include "opt_cpu.h" #include "opt_math_emulate.h" -#include "opt_smp.h" #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> #include <sys/sysctl.h> #include <sys/conf.h> -#include <sys/file.h> #include <sys/proc.h> #ifdef NPX_DEBUG #include <sys/syslog.h> @@ -59,7 +57,6 @@ #include <machine/ipl.h> #include <machine/md_var.h> #include <machine/pcb.h> -#include <machine/trap.h> #include <machine/clock.h> #include <machine/specialreg.h> #if defined(APIC_IO) diff --git a/sys/amd64/amd64/tsc.c b/sys/amd64/amd64/tsc.c index 245a696..6277477 100644 --- a/sys/amd64/amd64/tsc.c +++ b/sys/amd64/amd64/tsc.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)clock.c 7.2 (Berkeley) 5/12/91 - * $Id: clock.c,v 1.91 1997/07/19 02:28:29 fsmp Exp $ + * $Id: clock.c,v 1.92 1997/07/19 03:59:28 fsmp Exp $ */ /* @@ -71,7 +71,6 @@ #include <i386/isa/icu.h> #include <i386/isa/isa.h> -#include <i386/isa/intr_machdep.h> #include <i386/isa/rtc.h> #include <i386/isa/timerreg.h> diff --git a/sys/amd64/isa/clock.c b/sys/amd64/isa/clock.c index 245a696..6277477 100644 --- a/sys/amd64/isa/clock.c +++ b/sys/amd64/isa/clock.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)clock.c 7.2 (Berkeley) 5/12/91 - * $Id: clock.c,v 1.91 1997/07/19 02:28:29 fsmp Exp $ + * $Id: clock.c,v 1.92 1997/07/19 03:59:28 fsmp Exp $ */ /* @@ -71,7 +71,6 @@ #include <i386/isa/icu.h> #include <i386/isa/isa.h> -#include <i386/isa/intr_machdep.h> #include <i386/isa/rtc.h> #include <i386/isa/timerreg.h> diff --git a/sys/amd64/isa/intr_machdep.c b/sys/amd64/isa/intr_machdep.c index d1caa64..5f241d6 100644 --- a/sys/amd64/isa/intr_machdep.c +++ b/sys/amd64/isa/intr_machdep.c @@ -34,26 +34,20 @@ * SUCH DAMAGE. * * from: @(#)isa.c 7.2 (Berkeley) 5/13/91 - * $Id: intr_machdep.c,v 1.2 1997/06/02 15:28:10 kato Exp $ + * $Id: intr_machdep.c,v 1.3 1997/06/22 16:04:04 peter Exp $ */ #include "opt_auto_eoi.h" #include <sys/param.h> #include <sys/systm.h> -#include <sys/buf.h> #include <sys/syslog.h> -#include <sys/malloc.h> #include <machine/ipl.h> #include <machine/md_var.h> #include <machine/segments.h> #if defined(APIC_IO) #include <machine/smp.h> -#include <machine/apic.h> #endif /* APIC_IO */ -#include <vm/vm.h> -#include <vm/vm_param.h> -#include <vm/pmap.h> #include <i386/isa/isa_device.h> #ifdef PC98 #include <pc98/pc98/pc98.h> @@ -63,7 +57,6 @@ #include <i386/isa/isa.h> #endif #include <i386/isa/icu.h> -#include <i386/isa/ic/i8237.h> #include "vector.h" #include <i386/isa/intr_machdep.h> diff --git a/sys/amd64/isa/isa.c b/sys/amd64/isa/isa.c index 0420ea9..0206662 100644 --- a/sys/amd64/isa/isa.c +++ b/sys/amd64/isa/isa.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)isa.c 7.2 (Berkeley) 5/13/91 - * $Id: isa.c,v 1.93 1997/06/25 21:00:00 fsmp Exp $ + * $Id: isa.c,v 1.94 1997/07/09 17:58:16 ache Exp $ */ /* @@ -50,11 +50,9 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/buf.h> -#include <sys/syslog.h> #include <sys/malloc.h> #include <machine/ipl.h> #include <machine/md_var.h> -#include <machine/segments.h> #ifdef APIC_IO #include <machine/smp.h> #include <machine/apic.h> @@ -65,9 +63,7 @@ #include <i386/isa/isa_device.h> #include <i386/isa/intr_machdep.h> #include <i386/isa/isa.h> -#include <i386/isa/icu.h> #include <i386/isa/ic/i8237.h> -#include "vector.h" #include <sys/interrupt.h> diff --git a/sys/amd64/isa/nmi.c b/sys/amd64/isa/nmi.c index d1caa64..5f241d6 100644 --- a/sys/amd64/isa/nmi.c +++ b/sys/amd64/isa/nmi.c @@ -34,26 +34,20 @@ * SUCH DAMAGE. * * from: @(#)isa.c 7.2 (Berkeley) 5/13/91 - * $Id: intr_machdep.c,v 1.2 1997/06/02 15:28:10 kato Exp $ + * $Id: intr_machdep.c,v 1.3 1997/06/22 16:04:04 peter Exp $ */ #include "opt_auto_eoi.h" #include <sys/param.h> #include <sys/systm.h> -#include <sys/buf.h> #include <sys/syslog.h> -#include <sys/malloc.h> #include <machine/ipl.h> #include <machine/md_var.h> #include <machine/segments.h> #if defined(APIC_IO) #include <machine/smp.h> -#include <machine/apic.h> #endif /* APIC_IO */ -#include <vm/vm.h> -#include <vm/vm_param.h> -#include <vm/pmap.h> #include <i386/isa/isa_device.h> #ifdef PC98 #include <pc98/pc98/pc98.h> @@ -63,7 +57,6 @@ #include <i386/isa/isa.h> #endif #include <i386/isa/icu.h> -#include <i386/isa/ic/i8237.h> #include "vector.h" #include <i386/isa/intr_machdep.h> diff --git a/sys/amd64/isa/npx.c b/sys/amd64/isa/npx.c index 3b0ca26..2e521ae 100644 --- a/sys/amd64/isa/npx.c +++ b/sys/amd64/isa/npx.c @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * from: @(#)npx.c 7.2 (Berkeley) 5/12/91 - * $Id: npx.c,v 1.46 1997/06/22 16:04:06 peter Exp $ + * $Id: npx.c,v 1.47 1997/07/17 02:09:25 peter Exp $ */ #include "npx.h" @@ -40,14 +40,12 @@ #include "opt_cpu.h" #include "opt_math_emulate.h" -#include "opt_smp.h" #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> #include <sys/sysctl.h> #include <sys/conf.h> -#include <sys/file.h> #include <sys/proc.h> #ifdef NPX_DEBUG #include <sys/syslog.h> @@ -59,7 +57,6 @@ #include <machine/ipl.h> #include <machine/md_var.h> #include <machine/pcb.h> -#include <machine/trap.h> #include <machine/clock.h> #include <machine/specialreg.h> #if defined(APIC_IO) diff --git a/sys/amd64/pci/pci_bus.c b/sys/amd64/pci/pci_bus.c index b801abd..c4f2660 100644 --- a/sys/amd64/pci/pci_bus.c +++ b/sys/amd64/pci/pci_bus.c @@ -23,14 +23,13 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: pcibus.c,v 1.38 1997/05/26 21:25:24 se Exp $ + * $Id: pcibus.c,v 1.39 1997/05/26 21:52:41 se Exp $ * */ #include <sys/types.h> #include <sys/systm.h> -#include <pci/pcireg.h> #include <pci/pcivar.h> #include <i386/isa/pcibus.h> diff --git a/sys/amd64/pci/pci_cfgreg.c b/sys/amd64/pci/pci_cfgreg.c index b801abd..c4f2660 100644 --- a/sys/amd64/pci/pci_cfgreg.c +++ b/sys/amd64/pci/pci_cfgreg.c @@ -23,14 +23,13 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: pcibus.c,v 1.38 1997/05/26 21:25:24 se Exp $ + * $Id: pcibus.c,v 1.39 1997/05/26 21:52:41 se Exp $ * */ #include <sys/types.h> #include <sys/systm.h> -#include <pci/pcireg.h> #include <pci/pcivar.h> #include <i386/isa/pcibus.h> diff --git a/sys/dev/cy/cy.c b/sys/dev/cy/cy.c index d867751..c5683f9 100644 --- a/sys/dev/cy/cy.c +++ b/sys/dev/cy/cy.c @@ -27,7 +27,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: cy.c,v 1.46 1997/03/23 03:34:44 bde Exp $ + * $Id: cy.c,v 1.47 1997/03/24 11:23:42 bde Exp $ */ #include "cy.h" @@ -70,13 +70,11 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/reboot.h> #include <sys/tty.h> #include <sys/proc.h> #include <sys/conf.h> #include <sys/dkstat.h> #include <sys/fcntl.h> -#include <sys/uio.h> #include <sys/kernel.h> #include <sys/malloc.h> #include <sys/syslog.h> diff --git a/sys/dev/cy/cy_isa.c b/sys/dev/cy/cy_isa.c index d867751..c5683f9 100644 --- a/sys/dev/cy/cy_isa.c +++ b/sys/dev/cy/cy_isa.c @@ -27,7 +27,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: cy.c,v 1.46 1997/03/23 03:34:44 bde Exp $ + * $Id: cy.c,v 1.47 1997/03/24 11:23:42 bde Exp $ */ #include "cy.h" @@ -70,13 +70,11 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/reboot.h> #include <sys/tty.h> #include <sys/proc.h> #include <sys/conf.h> #include <sys/dkstat.h> #include <sys/fcntl.h> -#include <sys/uio.h> #include <sys/kernel.h> #include <sys/malloc.h> #include <sys/syslog.h> diff --git a/sys/dev/ed/if_ed.c b/sys/dev/ed/if_ed.c index 8adf4e6..eafc297 100644 --- a/sys/dev/ed/if_ed.c +++ b/sys/dev/ed/if_ed.c @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: if_ed.c,v 1.115 1997/02/22 09:36:20 peter Exp $ + * $Id: if_ed.c,v 1.116 1997/03/24 11:32:39 bde Exp $ */ /* @@ -43,7 +43,6 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/conf.h> -#include <sys/errno.h> #include <sys/sockio.h> #include <sys/mbuf.h> #include <sys/socket.h> @@ -52,21 +51,12 @@ #include <net/if.h> #include <net/if_dl.h> #include <net/if_mib.h> -#include <net/if_types.h> #ifdef INET #include <netinet/in.h> -#include <netinet/in_systm.h> -#include <netinet/in_var.h> -#include <netinet/ip.h> #include <netinet/if_ether.h> #endif -#ifdef IPX -#include <netipx/ipx.h> -#include <netipx/ipx_if.h> -#endif - #ifdef NS #include <netns/ns.h> #include <netns/ns_if.h> @@ -74,7 +64,6 @@ #if NBPFILTER > 0 #include <net/bpf.h> -#include <net/bpfdesc.h> #endif #include <machine/clock.h> diff --git a/sys/dev/ep/if_ep.c b/sys/dev/ep/if_ep.c index bba5ca5..f1af488 100644 --- a/sys/dev/ep/if_ep.c +++ b/sys/dev/ep/if_ep.c @@ -38,7 +38,7 @@ */ /* - * $Id: if_ep.c,v 1.57 1997/02/22 09:36:25 peter Exp $ + * $Id: if_ep.c,v 1.58 1997/03/24 11:32:45 bde Exp $ * * Promiscuous mode added and interrupt logic slightly changed * to reduce the number of adapter failures. Transceiver select @@ -64,27 +64,19 @@ #include <sys/param.h> #if defined(__FreeBSD__) #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/conf.h> #endif #include <sys/mbuf.h> #include <sys/socket.h> #include <sys/sockio.h> -#include <sys/errno.h> -#include <sys/syslog.h> #if defined(__NetBSD__) #include <sys/select.h> #endif #include <net/if.h> -#include <net/if_dl.h> -#include <net/if_types.h> #ifdef INET #include <netinet/in.h> -#include <netinet/in_systm.h> -#include <netinet/in_var.h> -#include <netinet/ip.h> #include <netinet/if_ether.h> #endif @@ -100,7 +92,6 @@ #if NBPFILTER > 0 #include <net/bpf.h> -#include <net/bpfdesc.h> #endif #if defined(__FreeBSD__) @@ -155,7 +146,6 @@ struct isa_driver epdriver = { #include "crd.h" #if NCRD > 0 -#include "apm.h" #include <sys/select.h> #include <pccard/card.h> #include <pccard/driver.h> diff --git a/sys/dev/ex/if_ex.c b/sys/dev/ex/if_ex.c index ecd942c..725ece6 100644 --- a/sys/dev/ex/if_ex.c +++ b/sys/dev/ex/if_ex.c @@ -39,23 +39,15 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/conf.h> -#include <sys/errno.h> #include <sys/sockio.h> #include <sys/mbuf.h> #include <sys/socket.h> -#include <sys/syslog.h> #include <net/if.h> -#include <net/if_dl.h> -#include <net/if_types.h> #ifdef INET #include <netinet/in.h> -#include <netinet/in_systm.h> -#include <netinet/in_var.h> -#include <netinet/ip.h> #include <netinet/if_ether.h> #endif @@ -71,7 +63,6 @@ #if NBPFILTER > 0 #include <net/bpf.h> -#include <net/bpfdesc.h> #endif #include <machine/clock.h> diff --git a/sys/dev/fdc/fdc.c b/sys/dev/fdc/fdc.c index 562fcbe..4754895 100644 --- a/sys/dev/fdc/fdc.c +++ b/sys/dev/fdc/fdc.c @@ -43,7 +43,7 @@ * SUCH DAMAGE. * * from: @(#)fd.c 7.4 (Berkeley) 5/25/91 - * $Id: fd.c,v 1.98 1997/03/23 03:34:47 bde Exp $ + * $Id: fd.c,v 1.99 1997/03/24 11:23:43 bde Exp $ * */ @@ -64,7 +64,6 @@ #include <machine/ioctl_fd.h> #include <sys/disklabel.h> #include <sys/buf.h> -#include <sys/uio.h> #include <sys/malloc.h> #include <sys/proc.h> #include <sys/syslog.h> diff --git a/sys/dev/fe/if_fe.c b/sys/dev/fe/if_fe.c index 4d6d344..b53bfe7 100644 --- a/sys/dev/fe/if_fe.c +++ b/sys/dev/fe/if_fe.c @@ -21,7 +21,7 @@ */ /* - * $Id: if_fe.c,v 1.27 1997/02/22 09:36:27 peter Exp $ + * $Id: if_fe.c,v 1.28 1997/03/24 11:32:49 bde Exp $ * * Device driver for Fujitsu MB86960A/MB86965A based Ethernet cards. * To be used with FreeBSD 2.x @@ -70,7 +70,6 @@ * o To test IPX codes. */ -#include "isa.h" #include "fe.h" #include "crd.h" #include "bpfilter.h" @@ -80,7 +79,6 @@ #include <sys/conf.h> -#include <sys/errno.h> #include <sys/sockio.h> #include <sys/mbuf.h> #include <sys/socket.h> @@ -88,13 +86,9 @@ #include <net/if.h> #include <net/if_dl.h> -#include <net/if_types.h> #ifdef INET #include <netinet/in.h> -#include <netinet/in_systm.h> -#include <netinet/in_var.h> -#include <netinet/ip.h> #include <netinet/if_ether.h> #endif @@ -118,12 +112,10 @@ #if NBPFILTER > 0 #include <net/bpf.h> -#include <net/bpfdesc.h> #endif #include <machine/clock.h> -#include <i386/isa/isa.h> #include <i386/isa/isa_device.h> #include <i386/isa/icu.h> diff --git a/sys/dev/ie/if_ie.c b/sys/dev/ie/if_ie.c index 1ddc30c..b2691c8 100644 --- a/sys/dev/ie/if_ie.c +++ b/sys/dev/ie/if_ie.c @@ -47,7 +47,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: if_ie.c,v 1.42 1997/05/21 18:26:09 gibbs Exp $ + * $Id: if_ie.c,v 1.43 1997/06/27 19:36:27 gibbs Exp $ */ /* @@ -114,24 +114,18 @@ iomem and and with 0xffff. #include <sys/kernel.h> #include <sys/conf.h> #include <sys/mbuf.h> -#include <sys/protosw.h> #include <sys/socket.h> #include <sys/sockio.h> -#include <sys/errno.h> #include <sys/syslog.h> #include <net/if.h> #include <net/if_types.h> #include <net/if_dl.h> -#include <net/route.h> #include "bpfilter.h" #ifdef INET #include <netinet/in.h> -#include <netinet/in_systm.h> -#include <netinet/in_var.h> -#include <netinet/ip.h> #include <netinet/if_ether.h> #endif @@ -156,11 +150,8 @@ iomem and and with 0xffff. #include <i386/isa/if_iee16.h> #include <i386/isa/elink.h> -#include <vm/vm.h> - #if NBPFILTER > 0 #include <net/bpf.h> -#include <net/bpfdesc.h> #endif #ifdef DEBUG diff --git a/sys/dev/joy/joy.c b/sys/dev/joy/joy.c index 9675e79..ee50044 100644 --- a/sys/dev/joy/joy.c +++ b/sys/dev/joy/joy.c @@ -30,7 +30,6 @@ #if NJOY > 0 -#include <sys/errno.h> #include <sys/param.h> #include <sys/systm.h> #include <sys/conf.h> @@ -252,7 +251,6 @@ SYSINIT(joydev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,joy_drvinit,NULL) #include <sys/exec.h> #include <sys/sysent.h> -#include <sys/sysproto.h> #include <sys/lkm.h> MOD_DEV (joy, LM_DT_CHAR, CDEV_MAJOR, &joy_cdevsw); diff --git a/sys/dev/lnc/if_lnc.c b/sys/dev/lnc/if_lnc.c index 3da3a5a..24df453 100644 --- a/sys/dev/lnc/if_lnc.c +++ b/sys/dev/lnc/if_lnc.c @@ -73,8 +73,6 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/conf.h> -#include <sys/errno.h> -#include <sys/ioccom.h> #include <sys/sockio.h> #include <sys/malloc.h> #include <sys/mbuf.h> @@ -82,19 +80,14 @@ #include <sys/syslog.h> #include <net/if.h> -#include <net/if_dl.h> #include <net/if_types.h> #ifdef INET #include <netinet/in.h> -#include <netinet/in_systm.h> -#include <netinet/in_var.h> -#include <netinet/ip.h> #include <netinet/if_ether.h> #endif #if NBPFILTER > 0 #include <net/bpf.h> -#include <net/bpfdesc.h> #endif #include <machine/md_var.h> diff --git a/sys/dev/mcd/mcd.c b/sys/dev/mcd/mcd.c index 67157ba..72fa029 100644 --- a/sys/dev/mcd/mcd.c +++ b/sys/dev/mcd/mcd.c @@ -40,23 +40,18 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: mcd.c,v 1.91 1997/06/01 15:59:11 peter Exp $ + * $Id: mcd.c,v 1.92 1997/06/01 16:03:13 peter Exp $ */ static const char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore"; #include "mcd.h" #if NMCD > 0 -#include <sys/types.h> #include <sys/param.h> #include <sys/systm.h> #include <sys/conf.h> #include <sys/fcntl.h> #include <sys/buf.h> -#include <sys/proc.h> -#include <sys/stat.h> -#include <sys/uio.h> #include <sys/cdio.h> -#include <sys/errno.h> #include <sys/dkbad.h> #include <sys/disklabel.h> #include <sys/kernel.h> @@ -66,8 +61,6 @@ static const char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore"; #include <machine/clock.h> -#include <i386/i386/cons.h> - #include <i386/isa/isa_device.h> #include <i386/isa/mcdreg.h> diff --git a/sys/dev/mse/mse.c b/sys/dev/mse/mse.c index ee196b5..091ff8c 100644 --- a/sys/dev/mse/mse.c +++ b/sys/dev/mse/mse.c @@ -11,7 +11,7 @@ * this software for any purpose. It is provided "as is" * without express or implied warranty. * - * $Id: mse.c,v 1.31 1997/02/22 09:36:56 peter Exp $ + * $Id: mse.c,v 1.32 1997/03/24 11:23:56 bde Exp $ */ /* * Driver for the Logitech and ATI Inport Bus mice for use with 386bsd and @@ -50,7 +50,6 @@ #include <sys/systm.h> #include <sys/conf.h> #include <sys/proc.h> -#include <sys/buf.h> #include <sys/kernel.h> #include <sys/uio.h> #ifdef DEVFS diff --git a/sys/dev/rc/rc.c b/sys/dev/rc/rc.c index ea064ea..8a721e0 100644 --- a/sys/dev/rc/rc.c +++ b/sys/dev/rc/rc.c @@ -30,7 +30,6 @@ * */ -#include "opt_comconsole.h" #include "rc.h" #if NRC > 0 @@ -44,9 +43,7 @@ #include <sys/conf.h> #include <sys/dkstat.h> #include <sys/fcntl.h> -#include <sys/uio.h> #include <sys/kernel.h> -#include <sys/syslog.h> #ifdef DEVFS #include <sys/devfsext.h> #endif /*DEVFS*/ @@ -54,7 +51,6 @@ #include <machine/clock.h> #include <i386/isa/isa_device.h> -#include <i386/isa/sioreg.h> #include <i386/isa/ic/cd180.h> #include <i386/isa/rcreg.h> diff --git a/sys/dev/scd/scd.c b/sys/dev/scd/scd.c index d58f90b..e7fef41 100644 --- a/sys/dev/scd/scd.c +++ b/sys/dev/scd/scd.c @@ -41,7 +41,7 @@ */ -/* $Id: scd.c,v 1.30 1997/05/04 15:24:20 joerg Exp $ */ +/* $Id: scd.c,v 1.31 1997/05/10 12:13:13 joerg Exp $ */ /* Please send any comments to micke@dynas.se */ @@ -49,17 +49,11 @@ #include "scd.h" #if NSCD > 0 -#include <sys/types.h> #include <sys/param.h> #include <sys/systm.h> #include <sys/conf.h> -#include <sys/file.h> #include <sys/buf.h> -#include <sys/proc.h> -#include <sys/stat.h> -#include <sys/uio.h> #include <sys/cdio.h> -#include <sys/errno.h> #include <sys/dkbad.h> #include <sys/disklabel.h> #include <sys/kernel.h> diff --git a/sys/dev/si/si.c b/sys/dev/si/si.c index cb2c452..86b9de4 100644 --- a/sys/dev/si/si.c +++ b/sys/dev/si/si.c @@ -30,7 +30,7 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN * NO EVENT SHALL THE AUTHORS BE LIABLE. * - * $Id: si.c,v 1.57 1997/03/24 12:02:48 bde Exp $ + * $Id: si.c,v 1.58 1997/04/20 15:36:04 bde Exp $ */ #ifndef lint @@ -45,14 +45,11 @@ static const char si_copyright1[] = "@(#) (C) Specialix International, 1990,199 #include <sys/ioctl_compat.h> #endif #include <sys/tty.h> -#include <sys/ttydefaults.h> #include <sys/proc.h> #include <sys/conf.h> #include <sys/fcntl.h> -#include <sys/uio.h> #include <sys/dkstat.h> #include <sys/kernel.h> -#include <sys/syslog.h> #include <sys/malloc.h> #include <sys/sysctl.h> #ifdef DEVFS @@ -62,7 +59,6 @@ static const char si_copyright1[] = "@(#) (C) Specialix International, 1990,199 #include <machine/clock.h> #include <vm/vm.h> -#include <vm/vm_param.h> #include <vm/pmap.h> #include <i386/isa/icu.h> diff --git a/sys/dev/sio/sio.c b/sys/dev/sio/sio.c index 90e50a4..0a9ce1b 100644 --- a/sys/dev/sio/sio.c +++ b/sys/dev/sio/sio.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)com.c 7.5 (Berkeley) 5/16/91 - * $Id: sio.c,v 1.171 1997/06/04 16:25:14 pst Exp $ + * $Id: sio.c,v 1.172 1997/07/17 06:01:15 dyson Exp $ */ #include "opt_comconsole.h" @@ -56,7 +56,6 @@ #include <sys/conf.h> #include <sys/dkstat.h> #include <sys/fcntl.h> -#include <sys/uio.h> #include <sys/kernel.h> #include <sys/malloc.h> #include <sys/syslog.h> diff --git a/sys/dev/sr/if_sr.c b/sys/dev/sr/if_sr.c index a9abd8f..16789ef 100644 --- a/sys/dev/sr/if_sr.c +++ b/sys/dev/sr/if_sr.c @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: if_sr.c,v 1.6 1997/02/22 09:36:35 peter Exp $ + * $Id: if_sr.c,v 1.7 1997/05/19 22:02:49 joerg Exp $ */ /* @@ -53,7 +53,6 @@ #else #define NFR 0 #endif -#include "pci.h" #include "bpfilter.h" #include <sys/param.h> diff --git a/sys/dev/sr/if_sr_isa.c b/sys/dev/sr/if_sr_isa.c index a9abd8f..16789ef 100644 --- a/sys/dev/sr/if_sr_isa.c +++ b/sys/dev/sr/if_sr_isa.c @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: if_sr.c,v 1.6 1997/02/22 09:36:35 peter Exp $ + * $Id: if_sr.c,v 1.7 1997/05/19 22:02:49 joerg Exp $ */ /* @@ -53,7 +53,6 @@ #else #define NFR 0 #endif -#include "pci.h" #include "bpfilter.h" #include <sys/param.h> diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c index 31d2b26d..a2b843a 100644 --- a/sys/dev/syscons/syscons.c +++ b/sys/dev/syscons/syscons.c @@ -25,7 +25,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. * - * $Id: syscons.c,v 1.224 1997/07/14 03:36:50 yokota Exp $ + * $Id: syscons.c,v 1.225 1997/07/15 14:43:22 yokota Exp $ */ #include "sc.h" @@ -40,11 +40,7 @@ #include <sys/proc.h> #include <sys/signalvar.h> #include <sys/tty.h> -#include <sys/uio.h> -#include <sys/callout.h> #include <sys/kernel.h> -#include <sys/syslog.h> -#include <sys/errno.h> #include <sys/malloc.h> #ifdef DEVFS #include <sys/devfsext.h> diff --git a/sys/dev/wl/if_wl.c b/sys/dev/wl/if_wl.c index e6b049b..0c12e52 100644 --- a/sys/dev/wl/if_wl.c +++ b/sys/dev/wl/if_wl.c @@ -162,12 +162,7 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #include <sys/param.h> #include <sys/systm.h> -#include <sys/errno.h> -#if __FreeBSD__ >= 3 #include <sys/sockio.h> -#else -#include <sys/ioctl.h> -#endif #include <sys/mbuf.h> #include <sys/socket.h> #include <sys/syslog.h> @@ -178,32 +173,19 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #include <net/if.h> #include <net/if_dl.h> -#include <net/if_types.h> #ifdef INET #include <netinet/in.h> -#include <netinet/in_systm.h> -#include <netinet/in_var.h> -#include <netinet/ip.h> #include <netinet/if_ether.h> #endif -#ifdef NS -#include <netns/ns.h> -#include <netns/ns_if.h> -#endif - #if NBPFILTER > 0 #include <net/bpf.h> -#include <net/bpfdesc.h> #endif -#include <machine/cpufunc.h> #include <machine/clock.h> -#include <i386/isa/isa.h> #include <i386/isa/isa_device.h> -#include <i386/isa/icu.h> #include <i386/isa/ic/if_wl_i82586.h> /* Definitions for the Intel chip */ diff --git a/sys/i386/i386/tsc.c b/sys/i386/i386/tsc.c index 245a696..6277477 100644 --- a/sys/i386/i386/tsc.c +++ b/sys/i386/i386/tsc.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)clock.c 7.2 (Berkeley) 5/12/91 - * $Id: clock.c,v 1.91 1997/07/19 02:28:29 fsmp Exp $ + * $Id: clock.c,v 1.92 1997/07/19 03:59:28 fsmp Exp $ */ /* @@ -71,7 +71,6 @@ #include <i386/isa/icu.h> #include <i386/isa/isa.h> -#include <i386/isa/intr_machdep.h> #include <i386/isa/rtc.h> #include <i386/isa/timerreg.h> diff --git a/sys/i386/isa/aha1542.c b/sys/i386/isa/aha1542.c index 01a8778..fcc53a0 100644 --- a/sys/i386/isa/aha1542.c +++ b/sys/i386/isa/aha1542.c @@ -12,34 +12,29 @@ * on the understanding that TFS is not responsible for the correct * functioning of this software in any circumstances. * - * $Id: aha1542.c,v 1.68 1997/03/23 06:26:46 bde Exp $ + * $Id: aha1542.c,v 1.69 1997/03/24 11:23:37 bde Exp $ */ /* * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992 */ -#include <sys/types.h> #ifdef KERNEL /* don't laugh.. look for main() */ #include "aha.h" #include <sys/param.h> #include <sys/systm.h> -#include <sys/errno.h> #include <sys/malloc.h> #include <sys/buf.h> -#include <sys/proc.h> #include <machine/clock.h> #include <machine/stdarg.h> #include <vm/vm.h> -#include <vm/vm_param.h> #include <vm/pmap.h> #include <i386/isa/isa_device.h> #endif /* KERNEL */ -#include <scsi/scsi_all.h> #include <scsi/scsiconf.h> #include <scsi/scsi_debug.h> diff --git a/sys/i386/isa/aic6360.c b/sys/i386/isa/aic6360.c index c0ab38f..4eec99a 100644 --- a/sys/i386/isa/aic6360.c +++ b/sys/i386/isa/aic6360.c @@ -31,7 +31,7 @@ */ /* - * $Id: aic6360.c,v 1.28 1997/03/23 06:26:47 bde Exp $ + * $Id: aic6360.c,v 1.29 1997/03/24 11:23:38 bde Exp $ * * Acknowledgements: Many of the algorithms used in this driver are * inspired by the work of Julian Elischer (julian@tfs.com) and @@ -115,24 +115,17 @@ #include "opt_ddb.h" #include "aic.h" -#include <sys/types.h> #include <sys/param.h> #include <sys/kernel.h> #include <sys/systm.h> -#include <sys/errno.h> #include <sys/malloc.h> #include <sys/buf.h> -#include <sys/proc.h> -#include <sys/queue.h> -#include <scsi/scsi_all.h> #include <scsi/scsiconf.h> #include <scsi/scsi_debug.h> #include <machine/clock.h> #include <i386/isa/isa_device.h> -#include <sys/kernel.h> - #include "ioconf.h" /* Definitions, most of them has turned out to be unneccesary, but here they diff --git a/sys/i386/isa/atapi.c b/sys/i386/isa/atapi.c index 6a85cfd..296903d 100644 --- a/sys/i386/isa/atapi.c +++ b/sys/i386/isa/atapi.c @@ -112,11 +112,9 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/proc.h> #include <sys/malloc.h> #include <machine/clock.h> -#include <machine/cpufunc.h> #ifdef ATAPI_MODULE # define ATAPI_STATIC @@ -965,7 +963,6 @@ struct atapires (*atapi_request_immediate_ptr) (struct atapi *ata, int unit, * ATAPI loadable driver stubs. */ #include <sys/exec.h> -#include <sys/conf.h> #include <sys/sysent.h> #include <sys/lkm.h> diff --git a/sys/i386/isa/b004.c b/sys/i386/isa/b004.c index 33180d4..1deaee9 100644 --- a/sys/i386/isa/b004.c +++ b/sys/i386/isa/b004.c @@ -50,7 +50,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/proc.h> #include <sys/uio.h> #include <sys/conf.h> #include <sys/kernel.h> diff --git a/sys/i386/isa/bt5xx-445.c b/sys/i386/isa/bt5xx-445.c index cd6f23f..0bac9ac 100644 --- a/sys/i386/isa/bt5xx-445.c +++ b/sys/i386/isa/bt5xx-445.c @@ -12,7 +12,7 @@ * on the understanding that TFS is not responsible for the correct * functioning of this software in any circumstances. * - * $Id: bt5xx-445.c,v 1.6 1997/02/22 09:35:58 peter Exp $ + * $Id: bt5xx-445.c,v 1.7 1997/03/23 04:39:30 bde Exp $ */ /* @@ -32,9 +32,7 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> -#include <scsi/scsi_all.h> #include <scsi/scsiconf.h> #include <i386/isa/isa_device.h> diff --git a/sys/i386/isa/clock.c b/sys/i386/isa/clock.c index 245a696..6277477 100644 --- a/sys/i386/isa/clock.c +++ b/sys/i386/isa/clock.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)clock.c 7.2 (Berkeley) 5/12/91 - * $Id: clock.c,v 1.91 1997/07/19 02:28:29 fsmp Exp $ + * $Id: clock.c,v 1.92 1997/07/19 03:59:28 fsmp Exp $ */ /* @@ -71,7 +71,6 @@ #include <i386/isa/icu.h> #include <i386/isa/isa.h> -#include <i386/isa/intr_machdep.h> #include <i386/isa/rtc.h> #include <i386/isa/timerreg.h> diff --git a/sys/i386/isa/ctx.c b/sys/i386/isa/ctx.c index e4840e5..af1523a 100644 --- a/sys/i386/isa/ctx.c +++ b/sys/i386/isa/ctx.c @@ -8,7 +8,7 @@ * of this software, nor does the author assume any responsibility * for damages incurred with its use. * - * $Id: ctx.c,v 1.23 1997/02/22 09:36:01 peter Exp $ + * $Id: ctx.c,v 1.24 1997/03/24 11:23:40 bde Exp $ */ /* @@ -114,11 +114,9 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/conf.h> -#include <sys/proc.h> #include <sys/uio.h> #include <sys/kernel.h> #include <sys/malloc.h> -#include <sys/kernel.h> #ifdef DEVFS #include <sys/devfsext.h> #endif /*DEVFS*/ diff --git a/sys/i386/isa/cx.c b/sys/i386/isa/cx.c index 029e46d..3766ef3 100644 --- a/sys/i386/isa/cx.c +++ b/sys/i386/isa/cx.c @@ -23,13 +23,10 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> -#include <sys/mbuf.h> #include <sys/fcntl.h> #include <sys/conf.h> #include <sys/proc.h> #include <sys/tty.h> -#include <sys/errno.h> -#include <sys/syslog.h> #include <sys/socket.h> #include <net/if.h> diff --git a/sys/i386/isa/cy.c b/sys/i386/isa/cy.c index d867751..c5683f9 100644 --- a/sys/i386/isa/cy.c +++ b/sys/i386/isa/cy.c @@ -27,7 +27,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: cy.c,v 1.46 1997/03/23 03:34:44 bde Exp $ + * $Id: cy.c,v 1.47 1997/03/24 11:23:42 bde Exp $ */ #include "cy.h" @@ -70,13 +70,11 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/reboot.h> #include <sys/tty.h> #include <sys/proc.h> #include <sys/conf.h> #include <sys/dkstat.h> #include <sys/fcntl.h> -#include <sys/uio.h> #include <sys/kernel.h> #include <sys/malloc.h> #include <sys/syslog.h> diff --git a/sys/i386/isa/elink.c b/sys/i386/isa/elink.c index f9c88d9..43cd0aa 100644 --- a/sys/i386/isa/elink.c +++ b/sys/i386/isa/elink.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. * - * $Id$ + * $Id: elink.c,v 1.7 1997/02/22 09:36:07 peter Exp $ */ /* @@ -34,7 +34,6 @@ */ #include <sys/types.h> -#include <sys/cdefs.h> #include <machine/cpufunc.h> diff --git a/sys/i386/isa/fd.c b/sys/i386/isa/fd.c index 562fcbe..4754895 100644 --- a/sys/i386/isa/fd.c +++ b/sys/i386/isa/fd.c @@ -43,7 +43,7 @@ * SUCH DAMAGE. * * from: @(#)fd.c 7.4 (Berkeley) 5/25/91 - * $Id: fd.c,v 1.98 1997/03/23 03:34:47 bde Exp $ + * $Id: fd.c,v 1.99 1997/03/24 11:23:43 bde Exp $ * */ @@ -64,7 +64,6 @@ #include <machine/ioctl_fd.h> #include <sys/disklabel.h> #include <sys/buf.h> -#include <sys/uio.h> #include <sys/malloc.h> #include <sys/proc.h> #include <sys/syslog.h> diff --git a/sys/i386/isa/ft.c b/sys/i386/isa/ft.c index 2c57e61..f0ae02b 100644 --- a/sys/i386/isa/ft.c +++ b/sys/i386/isa/ft.c @@ -17,7 +17,7 @@ * POSSIBILITY OF SUCH DAMAGE. * * ft.c - QIC-40/80 floppy tape driver - * $Id: ft.c,v 1.32 1997/03/24 07:19:55 kato Exp $ + * $Id: ft.c,v 1.33 1997/03/24 11:23:45 bde Exp $ * * 01/19/95 ++sg * Cleaned up recalibrate/seek code at attach time for FreeBSD 2.x. @@ -65,17 +65,12 @@ #include "ft.h" #if NFT > 0 -#include "fd.h" #include <sys/param.h> #include <sys/systm.h> -#include <sys/conf.h> #include <sys/disklabel.h> /* temp. for dkunit() in fdc.h */ -#include <sys/file.h> -#include <sys/proc.h> #include <sys/malloc.h> #include <sys/buf.h> -#include <sys/uio.h> #include <sys/ftape.h> #include <machine/clock.h> @@ -85,7 +80,6 @@ #include <pc98/pc98/fdreg.h> #else #include <i386/isa/fdreg.h> -#include <i386/isa/rtc.h> #endif #include <i386/isa/fdc.h> #include <i386/isa/ftreg.h> diff --git a/sys/i386/isa/gpib.c b/sys/i386/isa/gpib.c index b30f898..2ab2105 100644 --- a/sys/i386/isa/gpib.c +++ b/sys/i386/isa/gpib.c @@ -25,21 +25,15 @@ #if NGP > 0 #include <sys/param.h> -#include <sys/buf.h> #include <sys/systm.h> -#include <sys/proc.h> #include <sys/conf.h> #include <sys/uio.h> #include <sys/kernel.h> #include <sys/malloc.h> -#include <sys/conf.h> -#include <sys/kernel.h> #ifdef DEVFS #include <sys/devfsext.h> #endif /*DEVFS*/ -#include <machine/clock.h> - #include <i386/isa/gpibreg.h> #include <i386/isa/gpib.h> #include <i386/isa/isa_device.h> diff --git a/sys/i386/isa/gsc.c b/sys/i386/isa/gsc.c index 9985f55..310cfa1 100644 --- a/sys/i386/isa/gsc.c +++ b/sys/i386/isa/gsc.c @@ -37,7 +37,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/proc.h> #include <sys/conf.h> #include <sys/buf.h> #include <sys/malloc.h> diff --git a/sys/i386/isa/if_cx.c b/sys/i386/isa/if_cx.c index c7dd4e4..725e8f7 100644 --- a/sys/i386/isa/if_cx.c +++ b/sys/i386/isa/if_cx.c @@ -28,14 +28,11 @@ #include <sys/sockio.h> #include <sys/socket.h> #include <sys/conf.h> -#include <sys/errno.h> #include <net/if.h> -#include <net/if_types.h> #if NBPFILTER > 0 #include <net/bpf.h> -#include <net/bpfdesc.h> #endif #include <i386/isa/isa_device.h> diff --git a/sys/i386/isa/if_ed.c b/sys/i386/isa/if_ed.c index 8adf4e6..eafc297 100644 --- a/sys/i386/isa/if_ed.c +++ b/sys/i386/isa/if_ed.c @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: if_ed.c,v 1.115 1997/02/22 09:36:20 peter Exp $ + * $Id: if_ed.c,v 1.116 1997/03/24 11:32:39 bde Exp $ */ /* @@ -43,7 +43,6 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/conf.h> -#include <sys/errno.h> #include <sys/sockio.h> #include <sys/mbuf.h> #include <sys/socket.h> @@ -52,21 +51,12 @@ #include <net/if.h> #include <net/if_dl.h> #include <net/if_mib.h> -#include <net/if_types.h> #ifdef INET #include <netinet/in.h> -#include <netinet/in_systm.h> -#include <netinet/in_var.h> -#include <netinet/ip.h> #include <netinet/if_ether.h> #endif -#ifdef IPX -#include <netipx/ipx.h> -#include <netipx/ipx_if.h> -#endif - #ifdef NS #include <netns/ns.h> #include <netns/ns_if.h> @@ -74,7 +64,6 @@ #if NBPFILTER > 0 #include <net/bpf.h> -#include <net/bpfdesc.h> #endif #include <machine/clock.h> diff --git a/sys/i386/isa/if_eg.c b/sys/i386/isa/if_eg.c index 4718d04..e74f325 100644 --- a/sys/i386/isa/if_eg.c +++ b/sys/i386/isa/if_eg.c @@ -27,7 +27,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. * - * $Id: if_eg.c,v 1.22 1997/02/22 09:36:22 peter Exp $ + * $Id: if_eg.c,v 1.23 1997/03/24 11:32:41 bde Exp $ * * Support for 3Com 3c505 Etherlink+ card. */ @@ -42,29 +42,18 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/conf.h> -#include <sys/errno.h> #include <sys/sockio.h> #include <sys/mbuf.h> #include <sys/socket.h> #include <sys/syslog.h> #include <net/if.h> -#include <net/if_dl.h> -#include <net/if_types.h> #ifdef INET #include <netinet/in.h> -#include <netinet/in_systm.h> -#include <netinet/in_var.h> -#include <netinet/ip.h> #include <netinet/if_ether.h> #endif -#ifdef IPX -#include <netipx/ipx.h> -#include <netipx/ipx_if.h> -#endif - #ifdef NS #include <netns/ns.h> #include <netns/ns_if.h> @@ -72,7 +61,6 @@ #if NBPFILTER > 0 #include <net/bpf.h> -#include <net/bpfdesc.h> #endif #include <machine/clock.h> diff --git a/sys/i386/isa/if_el.c b/sys/i386/isa/if_el.c index ca1618f..7001c07 100644 --- a/sys/i386/isa/if_el.c +++ b/sys/i386/isa/if_el.c @@ -6,7 +6,7 @@ * * Questions, comments, bug reports and fixes to kimmel@cs.umass.edu. * - * $Id: if_el.c,v 1.29 1997/02/22 09:36:23 peter Exp $ + * $Id: if_el.c,v 1.30 1997/03/24 11:32:43 bde Exp $ */ /* Except of course for the portions of code lifted from other FreeBSD * drivers (mainly elread, elget and el_ioctl) @@ -25,21 +25,15 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/conf.h> -#include <sys/errno.h> #include <sys/sockio.h> #include <sys/mbuf.h> #include <sys/socket.h> #include <sys/syslog.h> #include <net/if.h> -#include <net/if_dl.h> -#include <net/if_types.h> #ifdef INET #include <netinet/in.h> -#include <netinet/in_systm.h> -#include <netinet/in_var.h> -#include <netinet/ip.h> #include <netinet/if_ether.h> #endif @@ -55,7 +49,6 @@ #if NBPFILTER > 0 #include <net/bpf.h> -#include <net/bpfdesc.h> #endif #include <machine/clock.h> diff --git a/sys/i386/isa/if_ep.c b/sys/i386/isa/if_ep.c index bba5ca5..f1af488 100644 --- a/sys/i386/isa/if_ep.c +++ b/sys/i386/isa/if_ep.c @@ -38,7 +38,7 @@ */ /* - * $Id: if_ep.c,v 1.57 1997/02/22 09:36:25 peter Exp $ + * $Id: if_ep.c,v 1.58 1997/03/24 11:32:45 bde Exp $ * * Promiscuous mode added and interrupt logic slightly changed * to reduce the number of adapter failures. Transceiver select @@ -64,27 +64,19 @@ #include <sys/param.h> #if defined(__FreeBSD__) #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/conf.h> #endif #include <sys/mbuf.h> #include <sys/socket.h> #include <sys/sockio.h> -#include <sys/errno.h> -#include <sys/syslog.h> #if defined(__NetBSD__) #include <sys/select.h> #endif #include <net/if.h> -#include <net/if_dl.h> -#include <net/if_types.h> #ifdef INET #include <netinet/in.h> -#include <netinet/in_systm.h> -#include <netinet/in_var.h> -#include <netinet/ip.h> #include <netinet/if_ether.h> #endif @@ -100,7 +92,6 @@ #if NBPFILTER > 0 #include <net/bpf.h> -#include <net/bpfdesc.h> #endif #if defined(__FreeBSD__) @@ -155,7 +146,6 @@ struct isa_driver epdriver = { #include "crd.h" #if NCRD > 0 -#include "apm.h" #include <sys/select.h> #include <pccard/card.h> #include <pccard/driver.h> diff --git a/sys/i386/isa/if_ex.c b/sys/i386/isa/if_ex.c index ecd942c..725ece6 100644 --- a/sys/i386/isa/if_ex.c +++ b/sys/i386/isa/if_ex.c @@ -39,23 +39,15 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/conf.h> -#include <sys/errno.h> #include <sys/sockio.h> #include <sys/mbuf.h> #include <sys/socket.h> -#include <sys/syslog.h> #include <net/if.h> -#include <net/if_dl.h> -#include <net/if_types.h> #ifdef INET #include <netinet/in.h> -#include <netinet/in_systm.h> -#include <netinet/in_var.h> -#include <netinet/ip.h> #include <netinet/if_ether.h> #endif @@ -71,7 +63,6 @@ #if NBPFILTER > 0 #include <net/bpf.h> -#include <net/bpfdesc.h> #endif #include <machine/clock.h> diff --git a/sys/i386/isa/if_fe.c b/sys/i386/isa/if_fe.c index 4d6d344..b53bfe7 100644 --- a/sys/i386/isa/if_fe.c +++ b/sys/i386/isa/if_fe.c @@ -21,7 +21,7 @@ */ /* - * $Id: if_fe.c,v 1.27 1997/02/22 09:36:27 peter Exp $ + * $Id: if_fe.c,v 1.28 1997/03/24 11:32:49 bde Exp $ * * Device driver for Fujitsu MB86960A/MB86965A based Ethernet cards. * To be used with FreeBSD 2.x @@ -70,7 +70,6 @@ * o To test IPX codes. */ -#include "isa.h" #include "fe.h" #include "crd.h" #include "bpfilter.h" @@ -80,7 +79,6 @@ #include <sys/conf.h> -#include <sys/errno.h> #include <sys/sockio.h> #include <sys/mbuf.h> #include <sys/socket.h> @@ -88,13 +86,9 @@ #include <net/if.h> #include <net/if_dl.h> -#include <net/if_types.h> #ifdef INET #include <netinet/in.h> -#include <netinet/in_systm.h> -#include <netinet/in_var.h> -#include <netinet/ip.h> #include <netinet/if_ether.h> #endif @@ -118,12 +112,10 @@ #if NBPFILTER > 0 #include <net/bpf.h> -#include <net/bpfdesc.h> #endif #include <machine/clock.h> -#include <i386/isa/isa.h> #include <i386/isa/isa_device.h> #include <i386/isa/icu.h> diff --git a/sys/i386/isa/if_ie.c b/sys/i386/isa/if_ie.c index 1ddc30c..b2691c8 100644 --- a/sys/i386/isa/if_ie.c +++ b/sys/i386/isa/if_ie.c @@ -47,7 +47,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: if_ie.c,v 1.42 1997/05/21 18:26:09 gibbs Exp $ + * $Id: if_ie.c,v 1.43 1997/06/27 19:36:27 gibbs Exp $ */ /* @@ -114,24 +114,18 @@ iomem and and with 0xffff. #include <sys/kernel.h> #include <sys/conf.h> #include <sys/mbuf.h> -#include <sys/protosw.h> #include <sys/socket.h> #include <sys/sockio.h> -#include <sys/errno.h> #include <sys/syslog.h> #include <net/if.h> #include <net/if_types.h> #include <net/if_dl.h> -#include <net/route.h> #include "bpfilter.h" #ifdef INET #include <netinet/in.h> -#include <netinet/in_systm.h> -#include <netinet/in_var.h> -#include <netinet/ip.h> #include <netinet/if_ether.h> #endif @@ -156,11 +150,8 @@ iomem and and with 0xffff. #include <i386/isa/if_iee16.h> #include <i386/isa/elink.h> -#include <vm/vm.h> - #if NBPFILTER > 0 #include <net/bpf.h> -#include <net/bpfdesc.h> #endif #ifdef DEBUG diff --git a/sys/i386/isa/if_le.c b/sys/i386/isa/if_le.c index 2fdac20..684e165 100644 --- a/sys/i386/isa/if_le.c +++ b/sys/i386/isa/if_le.c @@ -21,7 +21,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. * - * $Id$ + * $Id: if_le.c,v 1.37 1997/02/22 09:36:33 peter Exp $ */ /* @@ -40,28 +40,19 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/conf.h> #include <sys/mbuf.h> -#include <sys/protosw.h> #include <sys/socket.h> -#include <sys/ioccom.h> #include <sys/sockio.h> -#include <sys/errno.h> #include <sys/malloc.h> -#include <sys/syslog.h> #include <net/if.h> #include <net/if_types.h> #include <net/if_dl.h> -#include <net/route.h> #include "bpfilter.h" #ifdef INET #include <netinet/in.h> -#include <netinet/in_systm.h> -#include <netinet/in_var.h> -#include <netinet/ip.h> #include <netinet/if_ether.h> #endif @@ -81,12 +72,10 @@ #include <i386/isa/icu.h> #include <vm/vm.h> -#include <vm/vm_param.h> #include <vm/pmap.h> #if NBPFILTER > 0 #include <net/bpf.h> -#include <net/bpfdesc.h> #endif /* Forward declarations */ diff --git a/sys/i386/isa/if_lnc.c b/sys/i386/isa/if_lnc.c index 3da3a5a..24df453 100644 --- a/sys/i386/isa/if_lnc.c +++ b/sys/i386/isa/if_lnc.c @@ -73,8 +73,6 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/conf.h> -#include <sys/errno.h> -#include <sys/ioccom.h> #include <sys/sockio.h> #include <sys/malloc.h> #include <sys/mbuf.h> @@ -82,19 +80,14 @@ #include <sys/syslog.h> #include <net/if.h> -#include <net/if_dl.h> #include <net/if_types.h> #ifdef INET #include <netinet/in.h> -#include <netinet/in_systm.h> -#include <netinet/in_var.h> -#include <netinet/ip.h> #include <netinet/if_ether.h> #endif #if NBPFILTER > 0 #include <net/bpf.h> -#include <net/bpfdesc.h> #endif #include <machine/md_var.h> diff --git a/sys/i386/isa/if_sr.c b/sys/i386/isa/if_sr.c index a9abd8f..16789ef 100644 --- a/sys/i386/isa/if_sr.c +++ b/sys/i386/isa/if_sr.c @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: if_sr.c,v 1.6 1997/02/22 09:36:35 peter Exp $ + * $Id: if_sr.c,v 1.7 1997/05/19 22:02:49 joerg Exp $ */ /* @@ -53,7 +53,6 @@ #else #define NFR 0 #endif -#include "pci.h" #include "bpfilter.h" #include <sys/param.h> diff --git a/sys/i386/isa/if_wl.c b/sys/i386/isa/if_wl.c index e6b049b..0c12e52 100644 --- a/sys/i386/isa/if_wl.c +++ b/sys/i386/isa/if_wl.c @@ -162,12 +162,7 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #include <sys/param.h> #include <sys/systm.h> -#include <sys/errno.h> -#if __FreeBSD__ >= 3 #include <sys/sockio.h> -#else -#include <sys/ioctl.h> -#endif #include <sys/mbuf.h> #include <sys/socket.h> #include <sys/syslog.h> @@ -178,32 +173,19 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #include <net/if.h> #include <net/if_dl.h> -#include <net/if_types.h> #ifdef INET #include <netinet/in.h> -#include <netinet/in_systm.h> -#include <netinet/in_var.h> -#include <netinet/ip.h> #include <netinet/if_ether.h> #endif -#ifdef NS -#include <netns/ns.h> -#include <netns/ns_if.h> -#endif - #if NBPFILTER > 0 #include <net/bpf.h> -#include <net/bpfdesc.h> #endif -#include <machine/cpufunc.h> #include <machine/clock.h> -#include <i386/isa/isa.h> #include <i386/isa/isa_device.h> -#include <i386/isa/icu.h> #include <i386/isa/ic/if_wl_i82586.h> /* Definitions for the Intel chip */ diff --git a/sys/i386/isa/if_ze.c b/sys/i386/isa/if_ze.c index 1b211cd..fffb452 100644 --- a/sys/i386/isa/if_ze.c +++ b/sys/i386/isa/if_ze.c @@ -47,7 +47,7 @@ */ /* - * $Id: if_ze.c,v 1.42 1997/04/26 11:45:57 peter Exp $ + * $Id: if_ze.c,v 1.43 1997/04/27 21:18:58 fsmp Exp $ */ /* XXX - Don't mix different PCCARD support code */ @@ -68,22 +68,15 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/conf.h> -#include <sys/errno.h> #include <sys/sockio.h> #include <sys/mbuf.h> #include <sys/socket.h> #include <sys/syslog.h> #include <net/if.h> -#include <net/if_dl.h> -#include <net/if_types.h> -#include <net/netisr.h> #ifdef INET #include <netinet/in.h> -#include <netinet/in_systm.h> -#include <netinet/in_var.h> -#include <netinet/ip.h> #include <netinet/if_ether.h> #endif @@ -99,13 +92,11 @@ #if NBPFILTER > 0 #include <net/bpf.h> -#include <net/bpfdesc.h> #endif #include <machine/clock.h> #include <machine/md_var.h> -#include <i386/isa/isa.h> #include <i386/isa/isa_device.h> #include <i386/isa/icu.h> #include <i386/isa/if_edreg.h> diff --git a/sys/i386/isa/if_zp.c b/sys/i386/isa/if_zp.c index ce27d4d..3c2b00c 100644 --- a/sys/i386/isa/if_zp.c +++ b/sys/i386/isa/if_zp.c @@ -34,7 +34,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * From: if_ep.c,v 1.9 1994/01/25 10:46:29 deraadt Exp $ - * $Id: if_zp.c,v 1.35 1997/03/24 11:32:57 bde Exp $ + * $Id: if_zp.c,v 1.37 1997/04/21 13:38:32 nate Exp $ */ /*- * TODO: @@ -119,23 +119,16 @@ #if defined(__FreeBSD__) #include <sys/systm.h> #include <sys/conf.h> -#include <sys/kernel.h> #endif #include <sys/mbuf.h> #include <sys/socket.h> #include <sys/sockio.h> -#include <sys/errno.h> #include <sys/syslog.h> #include <net/if.h> -#include <net/if_dl.h> -#include <net/if_types.h> #ifdef INET #include <netinet/in.h> -#include <netinet/in_systm.h> -#include <netinet/in_var.h> -#include <netinet/ip.h> #include <netinet/if_ether.h> #endif @@ -151,7 +144,6 @@ #if NBPFILTER > 0 #include <net/bpf.h> -#include <net/bpfdesc.h> #endif #include <machine/clock.h> diff --git a/sys/i386/isa/intr_machdep.c b/sys/i386/isa/intr_machdep.c index d1caa64..5f241d6 100644 --- a/sys/i386/isa/intr_machdep.c +++ b/sys/i386/isa/intr_machdep.c @@ -34,26 +34,20 @@ * SUCH DAMAGE. * * from: @(#)isa.c 7.2 (Berkeley) 5/13/91 - * $Id: intr_machdep.c,v 1.2 1997/06/02 15:28:10 kato Exp $ + * $Id: intr_machdep.c,v 1.3 1997/06/22 16:04:04 peter Exp $ */ #include "opt_auto_eoi.h" #include <sys/param.h> #include <sys/systm.h> -#include <sys/buf.h> #include <sys/syslog.h> -#include <sys/malloc.h> #include <machine/ipl.h> #include <machine/md_var.h> #include <machine/segments.h> #if defined(APIC_IO) #include <machine/smp.h> -#include <machine/apic.h> #endif /* APIC_IO */ -#include <vm/vm.h> -#include <vm/vm_param.h> -#include <vm/pmap.h> #include <i386/isa/isa_device.h> #ifdef PC98 #include <pc98/pc98/pc98.h> @@ -63,7 +57,6 @@ #include <i386/isa/isa.h> #endif #include <i386/isa/icu.h> -#include <i386/isa/ic/i8237.h> #include "vector.h" #include <i386/isa/intr_machdep.h> diff --git a/sys/i386/isa/isa.c b/sys/i386/isa/isa.c index 0420ea9..0206662 100644 --- a/sys/i386/isa/isa.c +++ b/sys/i386/isa/isa.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)isa.c 7.2 (Berkeley) 5/13/91 - * $Id: isa.c,v 1.93 1997/06/25 21:00:00 fsmp Exp $ + * $Id: isa.c,v 1.94 1997/07/09 17:58:16 ache Exp $ */ /* @@ -50,11 +50,9 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/buf.h> -#include <sys/syslog.h> #include <sys/malloc.h> #include <machine/ipl.h> #include <machine/md_var.h> -#include <machine/segments.h> #ifdef APIC_IO #include <machine/smp.h> #include <machine/apic.h> @@ -65,9 +63,7 @@ #include <i386/isa/isa_device.h> #include <i386/isa/intr_machdep.h> #include <i386/isa/isa.h> -#include <i386/isa/icu.h> #include <i386/isa/ic/i8237.h> -#include "vector.h" #include <sys/interrupt.h> diff --git a/sys/i386/isa/istallion.c b/sys/i386/isa/istallion.c index 76dc3b7..d98bb2a 100644 --- a/sys/i386/isa/istallion.c +++ b/sys/i386/isa/istallion.c @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: istallion.c,v 1.10 1997/03/23 03:34:49 bde Exp $ + * $Id: istallion.c,v 1.11 1997/03/24 11:23:52 bde Exp $ */ /*****************************************************************************/ @@ -49,11 +49,8 @@ #include <sys/conf.h> #include <sys/fcntl.h> #include <sys/uio.h> -#include <sys/syslog.h> -#include <machine/cpu.h> #include <machine/clock.h> #include <vm/vm.h> -#include <vm/vm_param.h> #include <vm/pmap.h> #include <i386/isa/isa_device.h> #include <machine/cdk.h> diff --git a/sys/i386/isa/joy.c b/sys/i386/isa/joy.c index 9675e79..ee50044 100644 --- a/sys/i386/isa/joy.c +++ b/sys/i386/isa/joy.c @@ -30,7 +30,6 @@ #if NJOY > 0 -#include <sys/errno.h> #include <sys/param.h> #include <sys/systm.h> #include <sys/conf.h> @@ -252,7 +251,6 @@ SYSINIT(joydev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,joy_drvinit,NULL) #include <sys/exec.h> #include <sys/sysent.h> -#include <sys/sysproto.h> #include <sys/lkm.h> MOD_DEV (joy, LM_DT_CHAR, CDEV_MAJOR, &joy_cdevsw); diff --git a/sys/i386/isa/kbdio.c b/sys/i386/isa/kbdio.c index 8786b9d..b38201c 100644 --- a/sys/i386/isa/kbdio.c +++ b/sys/i386/isa/kbdio.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: kbdio.c,v 1.9 1997/03/06 22:34:10 joerg Exp $ + * $Id: kbdio.c,v 1.10 1997/03/07 10:22:55 yokota Exp $ */ #include "sc.h" @@ -38,12 +38,6 @@ #include <sys/systm.h> #include <sys/syslog.h> #include <machine/clock.h> -#ifdef PC98 -#include <pc98/pc98/pc98.h> -#else -#include <i386/isa/isa.h> -#endif -#include <i386/isa/isa_device.h> #include <i386/isa/kbdio.h> /* diff --git a/sys/i386/isa/labpc.c b/sys/i386/isa/labpc.c index aa6abe0..003189c 100644 --- a/sys/i386/isa/labpc.c +++ b/sys/i386/isa/labpc.c @@ -41,20 +41,16 @@ #include "labpc.h" -#include <sys/types.h> #include <sys/param.h> -#include <sys/time.h> #include <sys/systm.h> #include <sys/kernel.h> #include <sys/malloc.h> -#include <sys/errno.h> #include <sys/buf.h> #define b_actf b_act.tqe_next #include <sys/dataacq.h> #include <sys/conf.h> -#include <sys/kernel.h> #ifdef DEVFS #include <sys/devfsext.h> #endif /*DEVFS*/ diff --git a/sys/i386/isa/lpt.c b/sys/i386/isa/lpt.c index 2e2cb8e..b5136b4 100644 --- a/sys/i386/isa/lpt.c +++ b/sys/i386/isa/lpt.c @@ -46,7 +46,7 @@ * SUCH DAMAGE. * * from: unknown origin, 386BSD 0.1 - * $Id: lpt.c,v 1.59 1997/03/24 11:33:00 bde Exp $ + * $Id: lpt.c,v 1.60 1997/04/20 15:36:03 bde Exp $ */ /* @@ -106,7 +106,6 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/conf.h> -#include <sys/proc.h> #include <sys/buf.h> #include <sys/kernel.h> #include <sys/uio.h> @@ -134,16 +133,11 @@ #include <net/if.h> #include <net/if_types.h> #include <net/netisr.h> -#include <net/route.h> #include <netinet/in.h> -#include <netinet/in_systm.h> #include <netinet/in_var.h> -#include <netinet/ip.h> -#include <netinet/if_ether.h> #include "bpfilter.h" #if NBPFILTER > 0 #include <net/bpf.h> -#include <net/bpfdesc.h> #endif #endif /* INET */ diff --git a/sys/i386/isa/mcd.c b/sys/i386/isa/mcd.c index 67157ba..72fa029 100644 --- a/sys/i386/isa/mcd.c +++ b/sys/i386/isa/mcd.c @@ -40,23 +40,18 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: mcd.c,v 1.91 1997/06/01 15:59:11 peter Exp $ + * $Id: mcd.c,v 1.92 1997/06/01 16:03:13 peter Exp $ */ static const char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore"; #include "mcd.h" #if NMCD > 0 -#include <sys/types.h> #include <sys/param.h> #include <sys/systm.h> #include <sys/conf.h> #include <sys/fcntl.h> #include <sys/buf.h> -#include <sys/proc.h> -#include <sys/stat.h> -#include <sys/uio.h> #include <sys/cdio.h> -#include <sys/errno.h> #include <sys/dkbad.h> #include <sys/disklabel.h> #include <sys/kernel.h> @@ -66,8 +61,6 @@ static const char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore"; #include <machine/clock.h> -#include <i386/i386/cons.h> - #include <i386/isa/isa_device.h> #include <i386/isa/mcdreg.h> diff --git a/sys/i386/isa/mse.c b/sys/i386/isa/mse.c index ee196b5..091ff8c 100644 --- a/sys/i386/isa/mse.c +++ b/sys/i386/isa/mse.c @@ -11,7 +11,7 @@ * this software for any purpose. It is provided "as is" * without express or implied warranty. * - * $Id: mse.c,v 1.31 1997/02/22 09:36:56 peter Exp $ + * $Id: mse.c,v 1.32 1997/03/24 11:23:56 bde Exp $ */ /* * Driver for the Logitech and ATI Inport Bus mice for use with 386bsd and @@ -50,7 +50,6 @@ #include <sys/systm.h> #include <sys/conf.h> #include <sys/proc.h> -#include <sys/buf.h> #include <sys/kernel.h> #include <sys/uio.h> #ifdef DEVFS diff --git a/sys/i386/isa/ncr5380.c b/sys/i386/isa/ncr5380.c index e1fffcc..34f09ba 100644 --- a/sys/i386/isa/ncr5380.c +++ b/sys/i386/isa/ncr5380.c @@ -36,14 +36,9 @@ #include "nca.h" #if NNCA > 0 -#include <sys/types.h> #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> -#include <sys/errno.h> -#include <sys/malloc.h> -#include <sys/buf.h> -#include <sys/proc.h> #include <machine/clock.h> @@ -51,7 +46,6 @@ #include <i386/isa/ic/ncr5380.h> #include <i386/isa/ic/ncr53400.h> -#include <scsi/scsi_all.h> #include <scsi/scsiconf.h> #include "ioconf.h" diff --git a/sys/i386/isa/nmi.c b/sys/i386/isa/nmi.c index d1caa64..5f241d6 100644 --- a/sys/i386/isa/nmi.c +++ b/sys/i386/isa/nmi.c @@ -34,26 +34,20 @@ * SUCH DAMAGE. * * from: @(#)isa.c 7.2 (Berkeley) 5/13/91 - * $Id: intr_machdep.c,v 1.2 1997/06/02 15:28:10 kato Exp $ + * $Id: intr_machdep.c,v 1.3 1997/06/22 16:04:04 peter Exp $ */ #include "opt_auto_eoi.h" #include <sys/param.h> #include <sys/systm.h> -#include <sys/buf.h> #include <sys/syslog.h> -#include <sys/malloc.h> #include <machine/ipl.h> #include <machine/md_var.h> #include <machine/segments.h> #if defined(APIC_IO) #include <machine/smp.h> -#include <machine/apic.h> #endif /* APIC_IO */ -#include <vm/vm.h> -#include <vm/vm_param.h> -#include <vm/pmap.h> #include <i386/isa/isa_device.h> #ifdef PC98 #include <pc98/pc98/pc98.h> @@ -63,7 +57,6 @@ #include <i386/isa/isa.h> #endif #include <i386/isa/icu.h> -#include <i386/isa/ic/i8237.h> #include "vector.h" #include <i386/isa/intr_machdep.h> diff --git a/sys/i386/isa/npx.c b/sys/i386/isa/npx.c index 3b0ca26..2e521ae 100644 --- a/sys/i386/isa/npx.c +++ b/sys/i386/isa/npx.c @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * from: @(#)npx.c 7.2 (Berkeley) 5/12/91 - * $Id: npx.c,v 1.46 1997/06/22 16:04:06 peter Exp $ + * $Id: npx.c,v 1.47 1997/07/17 02:09:25 peter Exp $ */ #include "npx.h" @@ -40,14 +40,12 @@ #include "opt_cpu.h" #include "opt_math_emulate.h" -#include "opt_smp.h" #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> #include <sys/sysctl.h> #include <sys/conf.h> -#include <sys/file.h> #include <sys/proc.h> #ifdef NPX_DEBUG #include <sys/syslog.h> @@ -59,7 +57,6 @@ #include <machine/ipl.h> #include <machine/md_var.h> #include <machine/pcb.h> -#include <machine/trap.h> #include <machine/clock.h> #include <machine/specialreg.h> #if defined(APIC_IO) diff --git a/sys/i386/isa/pcibus.c b/sys/i386/isa/pcibus.c index b801abd..c4f2660 100644 --- a/sys/i386/isa/pcibus.c +++ b/sys/i386/isa/pcibus.c @@ -23,14 +23,13 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: pcibus.c,v 1.38 1997/05/26 21:25:24 se Exp $ + * $Id: pcibus.c,v 1.39 1997/05/26 21:52:41 se Exp $ * */ #include <sys/types.h> #include <sys/systm.h> -#include <pci/pcireg.h> #include <pci/pcivar.h> #include <i386/isa/pcibus.h> diff --git a/sys/i386/isa/pcicx.c b/sys/i386/isa/pcicx.c index cfcfb38..65c9df8 100644 --- a/sys/i386/isa/pcicx.c +++ b/sys/i386/isa/pcicx.c @@ -39,7 +39,6 @@ #include <sys/param.h> #if defined(__FreeBSD__) #include <sys/systm.h> -#include <sys/kernel.h> #include <machine/clock.h> #endif #include <i386/isa/isa_device.h> diff --git a/sys/i386/isa/psm.c b/sys/i386/isa/psm.c index 0af20b9..6ed4255 100644 --- a/sys/i386/isa/psm.c +++ b/sys/i386/isa/psm.c @@ -19,7 +19,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: psm.c,v 1.39 1997/05/27 11:55:41 yokota Exp $ + * $Id: psm.c,v 1.40 1997/06/30 12:52:57 yokota Exp $ */ /* @@ -63,7 +63,6 @@ #if NPSM > 0 -#include <limits.h> #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> @@ -80,7 +79,6 @@ #include <i386/include/clock.h> #include <i386/include/apm_bios.h> -#include <i386/isa/isa.h> #include <i386/isa/isa_device.h> #include <i386/isa/kbdio.h> diff --git a/sys/i386/isa/qcam.c b/sys/i386/isa/qcam.c index 5cdb2e2..85ced2b 100644 --- a/sys/i386/isa/qcam.c +++ b/sys/i386/isa/qcam.c @@ -42,7 +42,6 @@ #include <sys/conf.h> #include <sys/uio.h> #include <sys/malloc.h> -#include <sys/errno.h> #ifdef DEVFS #include <sys/devfsext.h> #endif /* DEVFS */ @@ -50,7 +49,6 @@ #include <machine/clock.h> #include <machine/qcam.h> -#include <i386/isa/qcamreg.h> #include <i386/isa/qcamdefs.h> #include <i386/isa/isa.h> #include <i386/isa/isa_device.h> diff --git a/sys/i386/isa/rc.c b/sys/i386/isa/rc.c index ea064ea..8a721e0 100644 --- a/sys/i386/isa/rc.c +++ b/sys/i386/isa/rc.c @@ -30,7 +30,6 @@ * */ -#include "opt_comconsole.h" #include "rc.h" #if NRC > 0 @@ -44,9 +43,7 @@ #include <sys/conf.h> #include <sys/dkstat.h> #include <sys/fcntl.h> -#include <sys/uio.h> #include <sys/kernel.h> -#include <sys/syslog.h> #ifdef DEVFS #include <sys/devfsext.h> #endif /*DEVFS*/ @@ -54,7 +51,6 @@ #include <machine/clock.h> #include <i386/isa/isa_device.h> -#include <i386/isa/sioreg.h> #include <i386/isa/ic/cd180.h> #include <i386/isa/rcreg.h> diff --git a/sys/i386/isa/scd.c b/sys/i386/isa/scd.c index d58f90b..e7fef41 100644 --- a/sys/i386/isa/scd.c +++ b/sys/i386/isa/scd.c @@ -41,7 +41,7 @@ */ -/* $Id: scd.c,v 1.30 1997/05/04 15:24:20 joerg Exp $ */ +/* $Id: scd.c,v 1.31 1997/05/10 12:13:13 joerg Exp $ */ /* Please send any comments to micke@dynas.se */ @@ -49,17 +49,11 @@ #include "scd.h" #if NSCD > 0 -#include <sys/types.h> #include <sys/param.h> #include <sys/systm.h> #include <sys/conf.h> -#include <sys/file.h> #include <sys/buf.h> -#include <sys/proc.h> -#include <sys/stat.h> -#include <sys/uio.h> #include <sys/cdio.h> -#include <sys/errno.h> #include <sys/dkbad.h> #include <sys/disklabel.h> #include <sys/kernel.h> diff --git a/sys/i386/isa/seagate.c b/sys/i386/isa/seagate.c index 5d24bda..4e06abf 100644 --- a/sys/i386/isa/seagate.c +++ b/sys/i386/isa/seagate.c @@ -60,7 +60,7 @@ * that category, with the possible exception of scanners and * some of the older MO drives. * - * $Id: seagate.c,v 1.22 1997/03/24 11:24:02 bde Exp $ + * $Id: seagate.c,v 1.23 1997/05/25 04:13:27 peter Exp $ */ /* @@ -112,14 +112,9 @@ #include "sea.h" #if NSEA > 0 -#include <sys/types.h> #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> -#include <sys/errno.h> -#include <sys/malloc.h> -#include <sys/buf.h> -#include <sys/proc.h> #include <machine/clock.h> @@ -129,7 +124,6 @@ #include <i386/isa/isa_device.h> -#include <scsi/scsi_all.h> #include <scsi/scsiconf.h> #include "ioconf.h" diff --git a/sys/i386/isa/si.c b/sys/i386/isa/si.c index cb2c452..86b9de4 100644 --- a/sys/i386/isa/si.c +++ b/sys/i386/isa/si.c @@ -30,7 +30,7 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN * NO EVENT SHALL THE AUTHORS BE LIABLE. * - * $Id: si.c,v 1.57 1997/03/24 12:02:48 bde Exp $ + * $Id: si.c,v 1.58 1997/04/20 15:36:04 bde Exp $ */ #ifndef lint @@ -45,14 +45,11 @@ static const char si_copyright1[] = "@(#) (C) Specialix International, 1990,199 #include <sys/ioctl_compat.h> #endif #include <sys/tty.h> -#include <sys/ttydefaults.h> #include <sys/proc.h> #include <sys/conf.h> #include <sys/fcntl.h> -#include <sys/uio.h> #include <sys/dkstat.h> #include <sys/kernel.h> -#include <sys/syslog.h> #include <sys/malloc.h> #include <sys/sysctl.h> #ifdef DEVFS @@ -62,7 +59,6 @@ static const char si_copyright1[] = "@(#) (C) Specialix International, 1990,199 #include <machine/clock.h> #include <vm/vm.h> -#include <vm/vm_param.h> #include <vm/pmap.h> #include <i386/isa/icu.h> diff --git a/sys/i386/isa/sio.c b/sys/i386/isa/sio.c index 90e50a4..0a9ce1b 100644 --- a/sys/i386/isa/sio.c +++ b/sys/i386/isa/sio.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)com.c 7.5 (Berkeley) 5/16/91 - * $Id: sio.c,v 1.171 1997/06/04 16:25:14 pst Exp $ + * $Id: sio.c,v 1.172 1997/07/17 06:01:15 dyson Exp $ */ #include "opt_comconsole.h" @@ -56,7 +56,6 @@ #include <sys/conf.h> #include <sys/dkstat.h> #include <sys/fcntl.h> -#include <sys/uio.h> #include <sys/kernel.h> #include <sys/malloc.h> #include <sys/syslog.h> diff --git a/sys/i386/isa/spigot.c b/sys/i386/isa/spigot.c index 9c76e81..1809356 100644 --- a/sys/i386/isa/spigot.c +++ b/sys/i386/isa/spigot.c @@ -57,10 +57,6 @@ error "Can only have 1 spigot configured." #include <sys/conf.h> #include <sys/proc.h> #include <sys/signalvar.h> -#include <sys/file.h> -#include <sys/uio.h> -#include <sys/malloc.h> -#include <sys/errno.h> #include <sys/mman.h> #ifdef DEVFS #include <sys/devfsext.h> diff --git a/sys/i386/isa/stallion.c b/sys/i386/isa/stallion.c index c634c40..0feff74 100644 --- a/sys/i386/isa/stallion.c +++ b/sys/i386/isa/stallion.c @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: stallion.c,v 1.10 1997/03/24 11:24:06 bde Exp $ + * $Id: stallion.c,v 1.11 1997/03/24 21:38:51 davidn Exp $ */ /*****************************************************************************/ @@ -48,9 +48,6 @@ #include <sys/proc.h> #include <sys/conf.h> #include <sys/fcntl.h> -#include <sys/uio.h> -#include <sys/syslog.h> -#include <machine/cpu.h> #include <machine/clock.h> #include <i386/isa/isa_device.h> #include <i386/isa/ic/scd1400.h> diff --git a/sys/i386/isa/syscons.c b/sys/i386/isa/syscons.c index 31d2b26d..a2b843a 100644 --- a/sys/i386/isa/syscons.c +++ b/sys/i386/isa/syscons.c @@ -25,7 +25,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. * - * $Id: syscons.c,v 1.224 1997/07/14 03:36:50 yokota Exp $ + * $Id: syscons.c,v 1.225 1997/07/15 14:43:22 yokota Exp $ */ #include "sc.h" @@ -40,11 +40,7 @@ #include <sys/proc.h> #include <sys/signalvar.h> #include <sys/tty.h> -#include <sys/uio.h> -#include <sys/callout.h> #include <sys/kernel.h> -#include <sys/syslog.h> -#include <sys/errno.h> #include <sys/malloc.h> #ifdef DEVFS #include <sys/devfsext.h> diff --git a/sys/i386/isa/tw.c b/sys/i386/isa/tw.c index 5b05ef7..d690535 100644 --- a/sys/i386/isa/tw.c +++ b/sys/i386/isa/tw.c @@ -140,9 +140,7 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/proc.h> #include <sys/conf.h> -#include <sys/buf.h> #include <sys/kernel.h> #include <sys/uio.h> #include <sys/syslog.h> diff --git a/sys/i386/isa/ultra14f.c b/sys/i386/isa/ultra14f.c index 6ee3439..73d73a1 100644 --- a/sys/i386/isa/ultra14f.c +++ b/sys/i386/isa/ultra14f.c @@ -22,30 +22,24 @@ * today: Fri Jun 2 17:21:03 EST 1994 * added 24F support ++sg * - * $Id: ultra14f.c,v 1.53 1997/03/23 06:33:30 bde Exp $ + * $Id: ultra14f.c,v 1.54 1997/03/24 11:24:10 bde Exp $ */ -#include <sys/types.h> - #ifdef KERNEL /* don't laugh.. this compiles to a program too.. look */ #include "uha.h" #include <sys/param.h> #include <sys/systm.h> -#include <sys/errno.h> #include <sys/malloc.h> #include <sys/buf.h> -#include <sys/proc.h> #include <machine/clock.h> #include <vm/vm.h> -#include <vm/vm_param.h> #include <vm/pmap.h> #include <i386/isa/isa_device.h> #endif /*KERNEL */ -#include <scsi/scsi_all.h> #include <scsi/scsiconf.h> #include <scsi/scsi_debug.h> diff --git a/sys/i386/isa/wcd.c b/sys/i386/isa/wcd.c index 39d030f..42e3460 100644 --- a/sys/i386/isa/wcd.c +++ b/sys/i386/isa/wcd.c @@ -34,8 +34,6 @@ #include <sys/devfsext.h> #endif /*DEVFS*/ -#include <machine/cpufunc.h> - #include <i386/isa/atapi.h> static d_open_t wcdropen; diff --git a/sys/i386/isa/wd.c b/sys/i386/isa/wd.c index 4d05cf2..09beae0 100644 --- a/sys/i386/isa/wd.c +++ b/sys/i386/isa/wd.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)wd.c 7.2 (Berkeley) 5/9/91 - * $Id: wd.c,v 1.130 1997/05/27 18:28:08 se Exp $ + * $Id: wd.c,v 1.131 1997/07/01 00:22:45 bde Exp $ */ /* TODO: @@ -71,13 +71,9 @@ #include <sys/systm.h> #include <sys/kernel.h> #include <sys/conf.h> -#include <sys/file.h> -#include <sys/stat.h> #include <sys/disklabel.h> #include <sys/diskslice.h> #include <sys/buf.h> -#include <sys/proc.h> -#include <sys/uio.h> #include <sys/malloc.h> #ifdef DEVFS #include <sys/devfsext.h> @@ -92,7 +88,6 @@ #include <sys/syslog.h> #include <sys/dkstat.h> #include <vm/vm.h> -#include <vm/vm_param.h> #include <vm/vm_prot.h> #include <vm/pmap.h> diff --git a/sys/i386/isa/wd7000.c b/sys/i386/isa/wd7000.c index e110e82..f1c9bdf 100644 --- a/sys/i386/isa/wd7000.c +++ b/sys/i386/isa/wd7000.c @@ -50,22 +50,15 @@ #include "wds.h" #if NWDS > 0 -#include <sys/types.h> #include <sys/param.h> #include <sys/systm.h> -#include <sys/errno.h> #include <sys/buf.h> -#include <sys/proc.h> -#include <sys/dkbad.h> -#include <sys/disklabel.h> -#include <scsi/scsi_all.h> #include <scsi/scsiconf.h> #include <machine/clock.h> #include <vm/vm.h> -#include <vm/vm_param.h> #include <vm/pmap.h> #include <i386/isa/isa_device.h> diff --git a/sys/i386/isa/wt.c b/sys/i386/isa/wt.c index f01148b..a45cbb0 100644 --- a/sys/i386/isa/wt.c +++ b/sys/i386/isa/wt.c @@ -20,7 +20,7 @@ * the original CMU copyright notice. * * Version 1.3, Thu Nov 11 12:09:13 MSK 1993 - * $Id: wt.c,v 1.38 1997/02/22 09:37:28 peter Exp $ + * $Id: wt.c,v 1.39 1997/03/24 11:24:14 bde Exp $ * */ @@ -67,15 +67,12 @@ #include <sys/fcntl.h> #include <sys/malloc.h> #include <sys/mtio.h> -#include <sys/proc.h> #include <sys/conf.h> #ifdef DEVFS #include <sys/devfsext.h> #endif /*DEVFS*/ -#include <vm/vm_param.h> #include <machine/clock.h> -#include <machine/wtio.h> #include <i386/isa/isa_device.h> #include <i386/isa/wtreg.h> diff --git a/sys/i386/pci/pci_bus.c b/sys/i386/pci/pci_bus.c index b801abd..c4f2660 100644 --- a/sys/i386/pci/pci_bus.c +++ b/sys/i386/pci/pci_bus.c @@ -23,14 +23,13 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: pcibus.c,v 1.38 1997/05/26 21:25:24 se Exp $ + * $Id: pcibus.c,v 1.39 1997/05/26 21:52:41 se Exp $ * */ #include <sys/types.h> #include <sys/systm.h> -#include <pci/pcireg.h> #include <pci/pcivar.h> #include <i386/isa/pcibus.h> diff --git a/sys/i386/pci/pci_cfgreg.c b/sys/i386/pci/pci_cfgreg.c index b801abd..c4f2660 100644 --- a/sys/i386/pci/pci_cfgreg.c +++ b/sys/i386/pci/pci_cfgreg.c @@ -23,14 +23,13 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: pcibus.c,v 1.38 1997/05/26 21:25:24 se Exp $ + * $Id: pcibus.c,v 1.39 1997/05/26 21:52:41 se Exp $ * */ #include <sys/types.h> #include <sys/systm.h> -#include <pci/pcireg.h> #include <pci/pcivar.h> #include <i386/isa/pcibus.h> diff --git a/sys/i386/pci/pci_pir.c b/sys/i386/pci/pci_pir.c index b801abd..c4f2660 100644 --- a/sys/i386/pci/pci_pir.c +++ b/sys/i386/pci/pci_pir.c @@ -23,14 +23,13 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: pcibus.c,v 1.38 1997/05/26 21:25:24 se Exp $ + * $Id: pcibus.c,v 1.39 1997/05/26 21:52:41 se Exp $ * */ #include <sys/types.h> #include <sys/systm.h> -#include <pci/pcireg.h> #include <pci/pcivar.h> #include <i386/isa/pcibus.h> diff --git a/sys/isa/atrtc.c b/sys/isa/atrtc.c index 245a696..6277477 100644 --- a/sys/isa/atrtc.c +++ b/sys/isa/atrtc.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)clock.c 7.2 (Berkeley) 5/12/91 - * $Id: clock.c,v 1.91 1997/07/19 02:28:29 fsmp Exp $ + * $Id: clock.c,v 1.92 1997/07/19 03:59:28 fsmp Exp $ */ /* @@ -71,7 +71,6 @@ #include <i386/isa/icu.h> #include <i386/isa/isa.h> -#include <i386/isa/intr_machdep.h> #include <i386/isa/rtc.h> #include <i386/isa/timerreg.h> diff --git a/sys/isa/fd.c b/sys/isa/fd.c index 562fcbe..4754895 100644 --- a/sys/isa/fd.c +++ b/sys/isa/fd.c @@ -43,7 +43,7 @@ * SUCH DAMAGE. * * from: @(#)fd.c 7.4 (Berkeley) 5/25/91 - * $Id: fd.c,v 1.98 1997/03/23 03:34:47 bde Exp $ + * $Id: fd.c,v 1.99 1997/03/24 11:23:43 bde Exp $ * */ @@ -64,7 +64,6 @@ #include <machine/ioctl_fd.h> #include <sys/disklabel.h> #include <sys/buf.h> -#include <sys/uio.h> #include <sys/malloc.h> #include <sys/proc.h> #include <sys/syslog.h> diff --git a/sys/isa/joy.c b/sys/isa/joy.c index 9675e79..ee50044 100644 --- a/sys/isa/joy.c +++ b/sys/isa/joy.c @@ -30,7 +30,6 @@ #if NJOY > 0 -#include <sys/errno.h> #include <sys/param.h> #include <sys/systm.h> #include <sys/conf.h> @@ -252,7 +251,6 @@ SYSINIT(joydev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,joy_drvinit,NULL) #include <sys/exec.h> #include <sys/sysent.h> -#include <sys/sysproto.h> #include <sys/lkm.h> MOD_DEV (joy, LM_DT_CHAR, CDEV_MAJOR, &joy_cdevsw); diff --git a/sys/isa/kbdio.c b/sys/isa/kbdio.c index 8786b9d..b38201c 100644 --- a/sys/isa/kbdio.c +++ b/sys/isa/kbdio.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: kbdio.c,v 1.9 1997/03/06 22:34:10 joerg Exp $ + * $Id: kbdio.c,v 1.10 1997/03/07 10:22:55 yokota Exp $ */ #include "sc.h" @@ -38,12 +38,6 @@ #include <sys/systm.h> #include <sys/syslog.h> #include <machine/clock.h> -#ifdef PC98 -#include <pc98/pc98/pc98.h> -#else -#include <i386/isa/isa.h> -#endif -#include <i386/isa/isa_device.h> #include <i386/isa/kbdio.h> /* diff --git a/sys/isa/sio.c b/sys/isa/sio.c index 90e50a4..0a9ce1b 100644 --- a/sys/isa/sio.c +++ b/sys/isa/sio.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)com.c 7.5 (Berkeley) 5/16/91 - * $Id: sio.c,v 1.171 1997/06/04 16:25:14 pst Exp $ + * $Id: sio.c,v 1.172 1997/07/17 06:01:15 dyson Exp $ */ #include "opt_comconsole.h" @@ -56,7 +56,6 @@ #include <sys/conf.h> #include <sys/dkstat.h> #include <sys/fcntl.h> -#include <sys/uio.h> #include <sys/kernel.h> #include <sys/malloc.h> #include <sys/syslog.h> diff --git a/sys/isa/syscons.c b/sys/isa/syscons.c index 31d2b26d..a2b843a 100644 --- a/sys/isa/syscons.c +++ b/sys/isa/syscons.c @@ -25,7 +25,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. * - * $Id: syscons.c,v 1.224 1997/07/14 03:36:50 yokota Exp $ + * $Id: syscons.c,v 1.225 1997/07/15 14:43:22 yokota Exp $ */ #include "sc.h" @@ -40,11 +40,7 @@ #include <sys/proc.h> #include <sys/signalvar.h> #include <sys/tty.h> -#include <sys/uio.h> -#include <sys/callout.h> #include <sys/kernel.h> -#include <sys/syslog.h> -#include <sys/errno.h> #include <sys/malloc.h> #ifdef DEVFS #include <sys/devfsext.h> |
