diff options
Diffstat (limited to 'sys/i386')
44 files changed, 467 insertions, 462 deletions
diff --git a/sys/i386/conf/Makefile.i386 b/sys/i386/conf/Makefile.i386 index 084fcfd4ff21..73df15a8ff79 100644 --- a/sys/i386/conf/Makefile.i386 +++ b/sys/i386/conf/Makefile.i386 @@ -1,6 +1,6 @@ # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $Id: Makefile.i386,v 1.26 1994/05/26 13:38:01 rgrimes Exp $ +# $Id: Makefile.i386,v 1.27 1994/08/06 10:52:15 davidg Exp $ # # Makefile for FreeBSD # @@ -26,8 +26,12 @@ CC= cc CPP= cpp DBSYM= /usr/sbin/dbsym +.if exists(./@/.) +S= ./@ +.else S= ../.. -I386= ../../i386 +.endif +I386= ${S}/i386 CWARNFLAGS=-W -Wreturn-type -Wcomment # diff --git a/sys/i386/eisa/aha1742.c b/sys/i386/eisa/aha1742.c index 27bce5f7c056..5ac65b85d5cb 100644 --- a/sys/i386/eisa/aha1742.c +++ b/sys/i386/eisa/aha1742.c @@ -14,13 +14,13 @@ * * commenced: Sun Sep 27 18:14:01 PDT 1992 * - * $Id: aha1742.c,v 1.14 1994/01/11 07:24:32 rgrimes Exp $ + * $Id: aha1742.c,v 1.16 1994/05/25 08:58:13 rgrimes Exp $ */ #include <sys/types.h> #ifdef KERNEL /* don't laugh, it compiles as a program too.. look */ -#include <ahb.h> +#include "ahb.h" #include <sys/param.h> #include <sys/systm.h> #include <sys/errno.h> @@ -56,7 +56,7 @@ typedef timeout_func_t timeout_t; #endif typedef unsigned long int physaddr; -#include "kernel.h" +#include <sys/kernel.h> #define KVTOPHYS(x) vtophys(x) diff --git a/sys/i386/i386/autoconf.c b/sys/i386/i386/autoconf.c index 3575d1c7e231..a5ac4b3339ab 100644 --- a/sys/i386/i386/autoconf.c +++ b/sys/i386/i386/autoconf.c @@ -45,16 +45,16 @@ * devices are determined (from possibilities mentioned in ioconf.c), * and the drivers are initialized. */ -#include "param.h" -#include "systm.h" -#include "buf.h" -#include "dkstat.h" -#include "conf.h" -#include "dmap.h" -#include "reboot.h" -#include "kernel.h" - -#include "machine/pte.h" +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/buf.h> +#include <sys/dkstat.h> +#include <sys/conf.h> +#include <sys/dmap.h> +#include <sys/reboot.h> +#include <sys/kernel.h> + +#include <machine/pte.h> static void swapconf(void); static void setroot(void); diff --git a/sys/i386/i386/cons.c b/sys/i386/i386/cons.c index ceb4b398b62c..f7c4581b2790 100644 --- a/sys/i386/i386/cons.c +++ b/sys/i386/i386/cons.c @@ -36,23 +36,23 @@ * SUCH DAMAGE. * * from: @(#)cons.c 7.2 (Berkeley) 5/9/91 - * $Id: cons.c,v 1.10 1994/01/23 19:17:17 davidg Exp $ + * $Id: cons.c,v 1.12 1994/05/25 08:52:56 rgrimes Exp $ */ -#include "sys/param.h" +#include <sys/param.h> #include <sys/systm.h> -#include "sys/proc.h" -#include "sys/user.h" -#include "sys/buf.h" -#include "sys/ioctl.h" -#include "sys/tty.h" -#include "sys/file.h" -#include "sys/conf.h" -#include "sys/vnode.h" -#include "machine/stdarg.h" - -#include "machine/cons.h" +#include <sys/proc.h> +#include <sys/user.h> +#include <sys/buf.h> +#include <sys/ioctl.h> +#include <sys/tty.h> +#include <sys/file.h> +#include <sys/conf.h> +#include <sys/vnode.h> +#include <machine/stdarg.h> + +#include <machine/cons.h> /* XXX - all this could be autoconfig()ed */ int pccnprobe(), pccninit(), pccngetc(), pccnputc(); diff --git a/sys/i386/i386/db_disasm.c b/sys/i386/i386/db_disasm.c index 98e251b684cd..81b6de450131 100644 --- a/sys/i386/i386/db_disasm.c +++ b/sys/i386/i386/db_disasm.c @@ -23,16 +23,16 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: db_disasm.c,v 1.4 1993/11/25 01:30:51 wollman Exp $ + * $Id: db_disasm.c,v 1.5 1993/12/19 00:49:58 wollman Exp $ */ /* * Instruction disassembler. */ -#include "param.h" -#include "systm.h" -#include "proc.h" -#include "ddb/ddb.h" +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/proc.h> +#include <ddb/ddb.h> #include <ddb/db_access.h> #include <ddb/db_sym.h> diff --git a/sys/i386/i386/db_interface.c b/sys/i386/i386/db_interface.c index e79a2ae4a7ef..595f5acf12de 100644 --- a/sys/i386/i386/db_interface.c +++ b/sys/i386/i386/db_interface.c @@ -23,17 +23,17 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: db_interface.c,v 1.5 1993/12/19 00:50:00 wollman Exp $ + * $Id: db_interface.c,v 1.7 1994/05/25 08:53:13 rgrimes Exp $ */ /* * Interface to new debugger. */ -#include "param.h" -#include "systm.h" -#include "kernel.h" -#include "proc.h" -#include "ddb/ddb.h" +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/kernel.h> +#include <sys/proc.h> +#include <ddb/ddb.h> #include <sys/reboot.h> /* #include <vm/vm_statistics.h> */ diff --git a/sys/i386/i386/db_trace.c b/sys/i386/i386/db_trace.c index 78aca490d452..ae6b98b06e45 100644 --- a/sys/i386/i386/db_trace.c +++ b/sys/i386/i386/db_trace.c @@ -23,19 +23,19 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: db_trace.c,v 1.6 1994/05/25 08:53:21 rgrimes Exp $ + * $Id: db_trace.c,v 1.7 1994/08/06 10:25:33 davidg Exp $ */ -#include "param.h" -#include "systm.h" +#include <sys/param.h> +#include <sys/systm.h> #include <vm/vm.h> #include <vm/vm_param.h> #include <vm/lock.h> #include <vm/vm_prot.h> #include <vm/pmap.h> -#include "proc.h" -#include "ddb/ddb.h" +#include <sys/proc.h> +#include <ddb/ddb.h> #include <ddb/db_access.h> #include <ddb/db_sym.h> diff --git a/sys/i386/i386/dkbad.c b/sys/i386/i386/dkbad.c index 2ebf05cac901..cc70487ae304 100644 --- a/sys/i386/i386/dkbad.c +++ b/sys/i386/i386/dkbad.c @@ -34,15 +34,15 @@ * SUCH DAMAGE. * * from: @(#)dkbad.c 5.4 (Berkeley) 1/19/91 - * $Id: dkbad.c,v 1.2 1993/10/16 14:14:59 rgrimes Exp $ + * $Id: dkbad.c,v 1.3 1993/12/19 00:50:01 wollman Exp $ */ #ifndef NOBADSECT -#include "sys/param.h" -#include "systm.h" -#include "sys/buf.h" -#include "sys/dkbad.h" +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/buf.h> +#include <sys/dkbad.h> /* * Search the bad sector table looking for diff --git a/sys/i386/i386/exception.s b/sys/i386/i386/exception.s index 30bc16415aff..7ba980660ffe 100644 --- a/sys/i386/i386/exception.s +++ b/sys/i386/i386/exception.s @@ -30,23 +30,23 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: exception.s,v 1.2 1994/01/03 07:55:20 davidg Exp $ + * $Id: exception.s,v 1.3 1994/04/02 07:00:23 davidg Exp $ */ #include "npx.h" /* NNPX */ #include "assym.s" /* system defines */ -#include "errno.h" /* error return codes */ +#include <sys/errno.h> /* error return codes */ -#include "machine/spl.h" /* SWI_AST_MASK ... */ +#include <machine/spl.h> /* SWI_AST_MASK ... */ -#include "machine/psl.h" /* PSL_I */ +#include <machine/psl.h> /* PSL_I */ -#include "machine/trap.h" /* trap codes */ -#include "syscall.h" /* syscall numbers */ +#include <machine/trap.h> /* trap codes */ +#include <sys/syscall.h> /* syscall numbers */ -#include "machine/asmacros.h" /* miscellaneous macros */ +#include <machine/asmacros.h> /* miscellaneous macros */ #define KDSEL 0x10 /* kernel data selector */ #define SEL_RPL_MASK 0x0003 diff --git a/sys/i386/i386/in_cksum.c b/sys/i386/i386/in_cksum.c index b11f0ffe7884..2d6d77a13a94 100644 --- a/sys/i386/i386/in_cksum.c +++ b/sys/i386/i386/in_cksum.c @@ -32,12 +32,12 @@ * * from tahoe: in_cksum.c 1.2 86/01/05 * from: @(#)in_cksum.c 1.3 (Berkeley) 1/19/91 - * $Id: in_cksum.c,v 1.4 1993/12/19 00:50:02 wollman Exp $ + * $Id: in_cksum.c,v 1.5 1994/03/07 11:47:30 davidg Exp $ */ -#include "param.h" -#include "systm.h" -#include "sys/mbuf.h" +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/mbuf.h> /* * Checksum routine for Internet Protocol family headers. diff --git a/sys/i386/i386/locore.s b/sys/i386/i386/locore.s index c3a62ebcf541..f61c26f4bc90 100644 --- a/sys/i386/i386/locore.s +++ b/sys/i386/i386/locore.s @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)locore.s 7.3 (Berkeley) 5/13/91 - * $Id: locore.s,v 1.18 1994/06/06 14:12:48 davidg Exp $ + * $Id: locore.s,v 1.19 1994/08/10 03:51:05 wollman Exp $ */ /* @@ -45,15 +45,15 @@ * Bruce Evans, Wolfgang Solfrank, and many others. */ -#include "npx.h" /* for NNPX */ -#include "assym.s" /* system definitions */ -#include "machine/psl.h" /* processor status longword defs */ -#include "machine/pte.h" /* page table entry definitions */ -#include "errno.h" /* error return codes */ -#include "machine/specialreg.h" /* x86 special registers */ -#include "machine/cputypes.h" /* x86 cpu type definitions */ -#include "syscall.h" /* system call numbers */ -#include "machine/asmacros.h" /* miscellaneous asm macros */ +#include "npx.h" /* for NNPX */ +#include "assym.s" /* system definitions */ +#include <machine/psl.h> /* processor status longword defs */ +#include <machine/pte.h> /* page table entry definitions */ +#include <sys/errno.h> /* error return codes */ +#include <machine/specialreg.h> /* x86 special registers */ +#include <machine/cputypes.h> /* x86 cpu type definitions */ +#include <sys/syscall.h> /* system call numbers */ +#include <machine/asmacros.h> /* miscellaneous asm macros */ /* * XXX diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c index 2afe59a3e329..233e0048cc96 100644 --- a/sys/i386/i386/machdep.c +++ b/sys/i386/i386/machdep.c @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)machdep.c 7.4 (Berkeley) 6/3/91 - * $Id: machdep.c,v 1.49 1994/08/10 03:53:33 wollman Exp $ + * $Id: machdep.c,v 1.50 1994/08/10 23:28:26 wollman Exp $ */ #include "npx.h" @@ -61,35 +61,35 @@ #include <sys/sysctl.h> #ifdef SYSVSHM -#include "sys/shm.h" +#include <sys/shm.h> #endif #ifdef SYSVMSG -#include "msg.h" +#include <sys/msg.h> #endif #ifdef SYSVSEM -#include "sem.h" +#include <sys/sem.h> #endif -#include "vm/vm.h" -#include "vm/vm_kern.h" -#include "vm/vm_page.h" +#include <vm/vm.h> +#include <vm/vm_kern.h> +#include <vm/vm_page.h> -#include "sys/exec.h" -#include "sys/vnode.h" +#include <sys/exec.h> +#include <sys/vnode.h> extern vm_offset_t avail_start, avail_end; -#include "machine/cpu.h" -#include "machine/reg.h" -#include "machine/psl.h" -#include "machine/specialreg.h" -#include "machine/sysarch.h" -#include "machine/cons.h" +#include <machine/cpu.h> +#include <machine/reg.h> +#include <machine/psl.h> +#include <machine/specialreg.h> +#include <machine/sysarch.h> +#include <machine/cons.h> -#include "i386/isa/isa.h" -#include "i386/isa/rtc.h" +#include <i386/isa/isa.h> +#include <i386/isa/rtc.h> static void identifycpu(void); static void initcpu(void); diff --git a/sys/i386/i386/ns_cksum.c b/sys/i386/i386/ns_cksum.c index 6b56172fb061..142c9f827eec 100644 --- a/sys/i386/i386/ns_cksum.c +++ b/sys/i386/i386/ns_cksum.c @@ -32,12 +32,12 @@ * * from: @(#)ns_cksum.c 7.7 (Berkeley) 4/29/91 * from NetBSD: ns_cksum.c,v 1.2 1993/05/22 07:59:55 cgd Exp - * $Id: ns_cksum.c,v 1.1 1993/09/06 12:12:24 rgrimes Exp $ + * $Id: ns_cksum.c,v 1.2 1993/12/19 00:50:07 wollman Exp $ */ -#include "sys/param.h" -#include "systm.h" -#include "sys/mbuf.h" +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/mbuf.h> /* * Checksum routine for Network Systems Protocol Packets (Big-Endian). diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c index 06003c98f517..2a1011f02e52 100644 --- a/sys/i386/i386/pmap.c +++ b/sys/i386/i386/pmap.c @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 - * $Id: pmap.c,v 1.30 1994/08/07 13:10:19 davidg Exp $ + * $Id: pmap.c,v 1.31 1994/08/07 14:53:10 davidg Exp $ */ /* @@ -159,7 +159,7 @@ extern vm_offset_t clean_sva, clean_eva; extern int cpu_class; #if BSDVM_COMPAT -#include "msgbuf.h" +#include <sys/msgbuf.h> /* * All those kernel PT submaps that BSD is so fond of diff --git a/sys/i386/i386/swapgeneric.c b/sys/i386/i386/swapgeneric.c index b987afb4ffe3..2bad4b213b8e 100644 --- a/sys/i386/i386/swapgeneric.c +++ b/sys/i386/i386/swapgeneric.c @@ -34,17 +34,17 @@ * SUCH DAMAGE. * * from: @(#)swapgeneric.c 5.5 (Berkeley) 5/9/91 - * $Id: swapgeneric.c,v 1.2 1993/10/16 14:15:09 rgrimes Exp $ + * $Id: swapgeneric.c,v 1.3 1993/11/03 18:05:42 nate Exp $ */ -#include "machine/pte.h" +#include <machine/pte.h> -#include "sys/param.h" -#include "sys/conf.h" -#include "sys/buf.h" -#include "sys/vm.h" -#include "sys/systm.h" -#include "sys/reboot.h" +#include <sys/param.h> +#include <sys/conf.h> +#include <sys/buf.h> +#include <sys/vm.h> +#include <sys/systm.h> +#include <sys/reboot.h> /* * Generic configuration; all in one diff --git a/sys/i386/i386/sys_machdep.c b/sys/i386/i386/sys_machdep.c index 92758ad8481a..2ddc2b950683 100644 --- a/sys/i386/i386/sys_machdep.c +++ b/sys/i386/i386/sys_machdep.c @@ -34,26 +34,26 @@ * SUCH DAMAGE. * * from: @(#)sys_machdep.c 5.5 (Berkeley) 1/19/91 - * $Id: sys_machdep.c,v 1.3 1993/10/16 14:15:10 rgrimes Exp $ + * $Id: sys_machdep.c,v 1.4 1994/01/31 10:27:01 davidg Exp $ */ -#include "param.h" -#include "systm.h" -#include "ioctl.h" -#include "file.h" -#include "time.h" -#include "proc.h" -#include "uio.h" -#include "kernel.h" -#include "mtio.h" -#include "buf.h" -#include "trace.h" +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/ioctl.h> +#include <sys/file.h> +#include <sys/time.h> +#include <sys/proc.h> +#include <sys/uio.h> +#include <sys/kernel.h> +#include <sys/mtio.h> +#include <sys/buf.h> +#include <sys/trace.h> #ifdef USER_LDT -#include "user.h" -#include "machine/cpu.h" -#include "machine/sysarch.h" -#include "vm/vm_kern.h" /* for kernel_map */ +#include <sys/user.h> +#include <machine/cpu.h> +#include <machine/sysarch.h> +#include <vm/vm_kern.h> /* for kernel_map */ #endif #ifdef TRACE diff --git a/sys/i386/i386/tsc.c b/sys/i386/i386/tsc.c index b0ce0a7e9f85..cf0a7f66dfcf 100644 --- a/sys/i386/i386/tsc.c +++ b/sys/i386/i386/tsc.c @@ -34,22 +34,22 @@ * SUCH DAMAGE. * * from: @(#)clock.c 7.2 (Berkeley) 5/12/91 - * $Id: clock.c,v 1.10 1994/05/25 08:58:32 rgrimes Exp $ + * $Id: clock.c,v 1.12 1994/08/11 00:28:24 wollman Exp $ */ /* * Primitive clock interrupt routines. */ -#include "param.h" -#include "systm.h" -#include "time.h" -#include "kernel.h" -#include "machine/segments.h" -#include "machine/frame.h" -#include "i386/isa/icu.h" -#include "i386/isa/isa.h" -#include "i386/isa/rtc.h" -#include "i386/isa/timerreg.h" +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/time.h> +#include <sys/kernel.h> +#include <machine/segments.h> +#include <machine/frame.h> +#include <i386/isa/icu.h> +#include <i386/isa/isa.h> +#include <i386/isa/rtc.h> +#include <i386/isa/timerreg.h> #include <machine/cpu.h> /* X-tals being what they are, it's nice to be able to fudge this one... */ diff --git a/sys/i386/include/cpu.h b/sys/i386/include/cpu.h index 2216d71822c3..8bc20e276add 100644 --- a/sys/i386/include/cpu.h +++ b/sys/i386/include/cpu.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)cpu.h 5.4 (Berkeley) 5/9/91 - * $Id: cpu.h,v 1.4 1993/11/07 17:42:46 wollman Exp $ + * $Id: cpu.h,v 1.6 1994/05/25 08:55:47 rgrimes Exp $ */ #ifndef _MACHINE_CPU_H_ @@ -43,8 +43,8 @@ /* * Definitions unique to i386 cpu support. */ -#include "machine/frame.h" -#include "machine/segments.h" +#include <machine/frame.h> +#include <machine/segments.h> #include <machine/spl.h> /* diff --git a/sys/i386/include/cpufunc.h b/sys/i386/include/cpufunc.h index 87245968f505..77f921379418 100644 --- a/sys/i386/include/cpufunc.h +++ b/sys/i386/include/cpufunc.h @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: cpufunc.h,v 1.14 1994/08/04 19:46:57 davidg Exp $ + * $Id: cpufunc.h,v 1.15 1994/08/11 02:26:08 jkh Exp $ */ /* @@ -44,7 +44,7 @@ #include <sys/cdefs.h> #include <sys/types.h> -#include "machine/spl.h" +#include <machine/spl.h> #ifdef __GNUC__ diff --git a/sys/i386/include/pcb.h b/sys/i386/include/pcb.h index 990e5f90bf7c..953a9ef9b126 100644 --- a/sys/i386/include/pcb.h +++ b/sys/i386/include/pcb.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)pcb.h 5.10 (Berkeley) 5/12/91 - * $Id: pcb.h,v 1.3 1993/11/07 17:42:59 wollman Exp $ + * $Id: pcb.h,v 1.5 1994/05/25 08:56:19 rgrimes Exp $ */ #ifndef _I386_PCB_H_ @@ -43,8 +43,8 @@ /* * Intel 386 process control block */ -#include "machine/tss.h" -#include "machine/npx.h" +#include <machine/tss.h> +#include <machine/npx.h> struct pcb { struct i386tss pcb_tss; diff --git a/sys/i386/isa/aha1542.c b/sys/i386/isa/aha1542.c index 670f212352ea..786ae413ded5 100644 --- a/sys/i386/isa/aha1542.c +++ b/sys/i386/isa/aha1542.c @@ -12,7 +12,7 @@ * on the understanding that TFS is not responsible for the correct * functioning of this software in any circumstances. * - * $Id: aha1542.c,v 1.25 1994/05/03 05:44:53 rgrimes Exp $ + * $Id: aha1542.c,v 1.27 1994/05/25 08:57:57 rgrimes Exp $ */ /* @@ -21,7 +21,7 @@ #include <sys/types.h> #ifdef KERNEL /* don't laugh.. look for main() */ -#include <aha.h> +#include "aha.h" #include <sys/param.h> #include <sys/systm.h> @@ -38,7 +38,7 @@ #ifdef KERNEL #include "ddb.h" -#include "kernel.h" +#include <sys/kernel.h> #else /*KERNEL */ #define NAHA 1 #endif /*KERNEL */ diff --git a/sys/i386/isa/aha1742.c b/sys/i386/isa/aha1742.c index 27bce5f7c056..5ac65b85d5cb 100644 --- a/sys/i386/isa/aha1742.c +++ b/sys/i386/isa/aha1742.c @@ -14,13 +14,13 @@ * * commenced: Sun Sep 27 18:14:01 PDT 1992 * - * $Id: aha1742.c,v 1.14 1994/01/11 07:24:32 rgrimes Exp $ + * $Id: aha1742.c,v 1.16 1994/05/25 08:58:13 rgrimes Exp $ */ #include <sys/types.h> #ifdef KERNEL /* don't laugh, it compiles as a program too.. look */ -#include <ahb.h> +#include "ahb.h" #include <sys/param.h> #include <sys/systm.h> #include <sys/errno.h> @@ -56,7 +56,7 @@ typedef timeout_func_t timeout_t; #endif typedef unsigned long int physaddr; -#include "kernel.h" +#include <sys/kernel.h> #define KVTOPHYS(x) vtophys(x) diff --git a/sys/i386/isa/bt742a.c b/sys/i386/isa/bt742a.c index 9a53a7a61285..0759b89e917f 100644 --- a/sys/i386/isa/bt742a.c +++ b/sys/i386/isa/bt742a.c @@ -12,7 +12,7 @@ * on the understanding that TFS is not responsible for the correct * functioning of this software in any circumstances. * - * $Id: bt742a.c,v 1.14 1994/03/24 02:22:58 davidg Exp $ + * $Id: bt742a.c,v 1.17 1994/05/27 04:02:01 rgrimes Exp $ */ /* @@ -22,7 +22,7 @@ #include <sys/types.h> #ifdef KERNEL /* don't laugh.. it compiles to a program too.. look */ -#include <bt.h> +#include "bt.h" #include <sys/param.h> #include <sys/systm.h> #include <sys/errno.h> @@ -39,7 +39,7 @@ #ifdef KERNEL #include "ddb.h" -#include "kernel.h" +#include <sys/kernel.h> #else /*KERNEL */ #define NBT 1 #endif /*KERNEL */ diff --git a/sys/i386/isa/clock.c b/sys/i386/isa/clock.c index b0ce0a7e9f85..cf0a7f66dfcf 100644 --- a/sys/i386/isa/clock.c +++ b/sys/i386/isa/clock.c @@ -34,22 +34,22 @@ * SUCH DAMAGE. * * from: @(#)clock.c 7.2 (Berkeley) 5/12/91 - * $Id: clock.c,v 1.10 1994/05/25 08:58:32 rgrimes Exp $ + * $Id: clock.c,v 1.12 1994/08/11 00:28:24 wollman Exp $ */ /* * Primitive clock interrupt routines. */ -#include "param.h" -#include "systm.h" -#include "time.h" -#include "kernel.h" -#include "machine/segments.h" -#include "machine/frame.h" -#include "i386/isa/icu.h" -#include "i386/isa/isa.h" -#include "i386/isa/rtc.h" -#include "i386/isa/timerreg.h" +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/time.h> +#include <sys/kernel.h> +#include <machine/segments.h> +#include <machine/frame.h> +#include <i386/isa/icu.h> +#include <i386/isa/isa.h> +#include <i386/isa/rtc.h> +#include <i386/isa/timerreg.h> #include <machine/cpu.h> /* X-tals being what they are, it's nice to be able to fudge this one... */ diff --git a/sys/i386/isa/fd.c b/sys/i386/isa/fd.c index 259d451b7b5f..518aa38b11e7 100644 --- a/sys/i386/isa/fd.c +++ b/sys/i386/isa/fd.c @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)fd.c 7.4 (Berkeley) 5/25/91 - * $Id: fd.c,v 1.24 1994/03/08 16:25:29 nate Exp $ + * $Id: fd.c,v 1.26 1994/05/25 08:58:39 rgrimes Exp $ * */ @@ -60,12 +60,12 @@ #include <sys/uio.h> #include <sys/malloc.h> #include <sys/syslog.h> -#include "i386/isa/isa.h" -#include "i386/isa/isa_device.h" -#include "i386/isa/fdreg.h" -#include "i386/isa/fdc.h" -#include "i386/isa/icu.h" -#include "i386/isa/rtc.h" +#include <i386/isa/isa.h> +#include <i386/isa/isa_device.h> +#include <i386/isa/fdreg.h> +#include <i386/isa/fdc.h> +#include <i386/isa/icu.h> +#include <i386/isa/rtc.h> #if NFT > 0 extern int ftopen(), ftintr(), ftattach(), ftclose(), ftioctl(); diff --git a/sys/i386/isa/fdreg.h b/sys/i386/isa/fdreg.h index 5deb02cce8b3..d0d69e283a88 100644 --- a/sys/i386/isa/fdreg.h +++ b/sys/i386/isa/fdreg.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)fdreg.h 7.1 (Berkeley) 5/9/91 - * $Id: fdreg.h,v 1.3 1994/02/07 04:27:10 alm Exp $ + * $Id: fdreg.h,v 1.4 1994/02/07 22:12:42 alm Exp $ */ /* @@ -39,7 +39,7 @@ */ /* uses NEC765 controller */ -#include "../i386/isa/ic/nec765.h" +#include <i386/isa/ic/nec765.h> /* registers */ #define fdout 2 /* Digital Output Register (W) */ diff --git a/sys/i386/isa/ft.c b/sys/i386/isa/ft.c index bc5d7ccb6a10..b7ca761f1862 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.6 1994/05/25 08:58:47 rgrimes Exp $ + * $Id: ft.c,v 1.7 1994/08/02 07:39:22 davidg Exp $ * * * 01/26/94 v0.3b - Jim Babb @@ -52,7 +52,7 @@ * 06/03/93 v0.1 Alpha release * Hopefully the last re-write. Many bugs fixed, many remain. * - * $Id$ + * $Id: ft.c,v 1.7 1994/08/02 07:39:22 davidg Exp $ */ #include "ft.h" @@ -70,12 +70,12 @@ #include <sys/uio.h> #include <sys/ftape.h> #include <machine/pio.h> -#include "i386/isa/isa_device.h" -#include "i386/isa/fdreg.h" -#include "i386/isa/fdc.h" -#include "i386/isa/icu.h" -#include "i386/isa/rtc.h" -#include "ftreg.h" +#include <i386/isa/isa_device.h> +#include <i386/isa/fdreg.h> +#include <i386/isa/fdc.h> +#include <i386/isa/icu.h> +#include <i386/isa/rtc.h> +#include <i386/isa/ftreg.h> /* Enable or disable debugging messages. */ #define FTDBGALL 0 /* everything */ diff --git a/sys/i386/isa/icu.s b/sys/i386/isa/icu.s index c71380607c67..6d897d705133 100644 --- a/sys/i386/isa/icu.s +++ b/sys/i386/isa/icu.s @@ -36,7 +36,7 @@ * * @(#)icu.s 7.2 (Berkeley) 5/21/91 * - * $Id: icu.s,v 1.7 1993/12/20 14:58:21 wollman Exp $ + * $Id: icu.s,v 1.9 1994/05/25 08:58:55 rgrimes Exp $ */ /* @@ -50,7 +50,7 @@ * numbers are used without translation in the masks. */ -#include "../net/netisr.h" +#include <net/netisr.h> .data .globl _cpl diff --git a/sys/i386/isa/if_ed.c b/sys/i386/isa/if_ed.c index 71d8a30339a0..bca7f31cb1a3 100644 --- a/sys/i386/isa/if_ed.c +++ b/sys/i386/isa/if_ed.c @@ -13,7 +13,7 @@ * the SMC Elite Ultra (8216), the 3Com 3c503, the NE1000 and NE2000, * and a variety of similar clones. * - * $Id: if_ed.c,v 1.42 1994/08/08 16:45:11 jkh Exp $ + * $Id: if_ed.c,v 1.43 1994/08/12 06:36:51 davidg Exp $ */ #include "ed.h" @@ -21,42 +21,42 @@ /* bpfilter included here in case it is needed in future net includes */ #include "bpfilter.h" -#include "param.h" -#include "systm.h" -#include "errno.h" -#include "ioctl.h" -#include "mbuf.h" -#include "socket.h" -#include "syslog.h" +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/errno.h> +#include <sys/ioctl.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/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" +#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" +#include <netns/ns.h> +#include <netns/ns_if.h> #endif #if NBPFILTER > 0 -#include "net/bpf.h" -#include "net/bpfdesc.h" +#include <net/bpf.h> +#include <net/bpfdesc.h> #endif -#include "i386/isa/isa.h" -#include "i386/isa/isa_device.h" -#include "i386/isa/icu.h" -#include "i386/isa/if_edreg.h" +#include <i386/isa/isa.h> +#include <i386/isa/isa_device.h> +#include <i386/isa/icu.h> +#include <i386/isa/if_edreg.h> -#include "i386/include/pio.h" +#include <i386/include/pio.h> /* For backwards compatibility */ #ifndef IFF_ALTPHYS diff --git a/sys/i386/isa/if_el.c b/sys/i386/isa/if_el.c index be1809919583..ceaac8fe5eef 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.3 1994/08/02 07:39:32 davidg Exp $ + * $Id: if_el.c,v 1.4 1994/08/08 13:33:12 davidg Exp $ */ /* Except of course for the portions of code lifted from other FreeBSD * drivers (mainly elread, elget and el_ioctl) @@ -23,40 +23,40 @@ #if NEL > 0 #include "bpfilter.h" -#include "param.h" -#include "systm.h" -#include "errno.h" -#include "ioctl.h" -#include "mbuf.h" -#include "socket.h" -#include "syslog.h" +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/errno.h> +#include <sys/ioctl.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/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" +#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" +#include <netns/ns.h> +#include <netns/ns_if.h> #endif #if NBPFILTER > 0 -#include "net/bpf.h" -#include "net/bpfdesc.h" +#include <net/bpf.h> +#include <net/bpfdesc.h> #endif -#include "i386/isa/isa.h" -#include "i386/isa/isa_device.h" -#include "i386/isa/icu.h" -#include "i386/isa/if_elreg.h" +#include <i386/isa/isa.h> +#include <i386/isa/isa_device.h> +#include <i386/isa/icu.h> +#include <i386/isa/if_elreg.h> #define ETHER_MIN_LEN 64 #define ETHER_MAX_LEN 1518 diff --git a/sys/i386/isa/if_ie.c b/sys/i386/isa/if_ie.c index 348be728465e..2fbf28998f94 100644 --- a/sys/i386/isa/if_ie.c +++ b/sys/i386/isa/if_ie.c @@ -39,7 +39,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: if_ie.c,v 1.7 1994/08/08 13:33:15 davidg Exp $ + * $Id: if_ie.c,v 1.8 1994/08/12 06:06:19 davidg Exp $ */ /* @@ -103,46 +103,46 @@ iomem, and to make 16-pointers, we subtract iomem and and with 0xffff. #include "ie.h" #if NIE > 0 -#include "param.h" -#include "systm.h" -#include "mbuf.h" -#include "protosw.h" -#include "socket.h" -#include "ioctl.h" -#include "errno.h" -#include "syslog.h" +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/mbuf.h> +#include <sys/protosw.h> +#include <sys/socket.h> +#include <sys/ioctl.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 <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" +#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" +#include <netns/ns.h> +#include <netns/ns_if.h> #endif -#include "i386/isa/isa.h" -#include "i386/isa/isa_device.h" -#include "i386/isa/ic/i82586.h" -#include "i386/isa/if_iereg.h" -#include "i386/isa/icu.h" +#include <i386/isa/isa.h> +#include <i386/isa/isa_device.h> +#include <i386/isa/ic/i82586.h> +#include <i386/isa/if_iereg.h> +#include <i386/isa/icu.h> -#include "vm/vm.h" +#include <vm/vm.h> #if NBPFILTER > 0 -#include "net/bpf.h" -#include "net/bpfdesc.h" +#include <net/bpf.h> +#include <net/bpfdesc.h> #endif #if (NBPFILTER > 0) || defined(MULTICAST) diff --git a/sys/i386/isa/if_is.c b/sys/i386/isa/if_is.c index 021725539278..b2a6e874ec82 100644 --- a/sys/i386/isa/if_is.c +++ b/sys/i386/isa/if_is.c @@ -11,7 +11,7 @@ * of this software, nor does the author assume any responsibility * for damages incurred with its use. * - * $Id: if_is.c,v 1.24 1994/08/02 07:39:37 davidg Exp $ + * $Id: if_is.c,v 1.25 1994/08/08 13:33:16 davidg Exp $ */ /* TODO @@ -27,41 +27,41 @@ #include "bpfilter.h" -#include "param.h" -#include "systm.h" -#include "errno.h" -#include "ioctl.h" -#include "mbuf.h" -#include "socket.h" -#include "syslog.h" +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/errno.h> +#include <sys/ioctl.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/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" +#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" +#include <netns/ns.h> +#include <netns/ns_if.h> #endif #if NBPFILTER > 0 -#include "net/bpf.h" -#include "net/bpfdesc.h" +#include <net/bpf.h> +#include <net/bpfdesc.h> #endif -#include "i386/isa/isa_device.h" -#include "i386/isa/if_isreg.h" -#include "i386/isa/icu.h" +#include <i386/isa/isa_device.h> +#include <i386/isa/if_isreg.h> +#include <i386/isa/icu.h> -#include "vm/vm.h" +#include <vm/vm.h> #define ETHER_MIN_LEN 64 #define ETHER_MAX_LEN 1518 diff --git a/sys/i386/isa/isa.c b/sys/i386/isa/isa.c index 0daec32bd666..80be9a5f4f6f 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.18 1994/05/25 08:59:24 rgrimes Exp $ + * $Id: isa.c,v 1.19 1994/08/10 04:39:52 wollman Exp $ */ /* @@ -47,24 +47,24 @@ * isa_dmastart() */ -#include "param.h" -#include "systm.h" /* isn't it a joy */ -#include "kernel.h" /* to have three of these */ -#include "conf.h" -#include "file.h" -#include "buf.h" -#include "uio.h" -#include "syslog.h" -#include "malloc.h" -#include "rlist.h" -#include "machine/segments.h" -#include "vm/vm.h" +#include <sys/param.h> +#include <sys/systm.h> /* isn't it a joy */ +#include <sys/kernel.h> /* to have three of these */ +#include <sys/conf.h> +#include <sys/file.h> +#include <sys/buf.h> +#include <sys/uio.h> +#include <sys/syslog.h> +#include <sys/malloc.h> +#include <sys/rlist.h> +#include <machine/segments.h> +#include <vm/vm.h> #include <machine/spl.h> -#include "i386/isa/isa_device.h" -#include "i386/isa/isa.h" -#include "i386/isa/icu.h" -#include "i386/isa/ic/i8237.h" -#include "i386/isa/ic/i8042.h" +#include <i386/isa/isa_device.h> +#include <i386/isa/isa.h> +#include <i386/isa/icu.h> +#include <i386/isa/ic/i8237.h> +#include <i386/isa/ic/i8042.h> /* ** Register definitions for DMA controller 1 (channels 0..3): diff --git a/sys/i386/isa/lpt.c b/sys/i386/isa/lpt.c index 786c0bfcda6e..884476d202f3 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.13 1994/06/08 14:34:54 davidg Exp $ + * $Id: lpt.c,v 1.13 1994/08/13 00:37:03 phk Exp $ */ /* @@ -102,34 +102,34 @@ #include "lpt.h" #if NLPT > 0 -#include "param.h" -#include "systm.h" -#include "proc.h" -#include "user.h" -#include "buf.h" -#include "kernel.h" -#include "ioctl.h" -#include "tty.h" -#include "uio.h" -#include "syslog.h" +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/proc.h> +#include <sys/user.h> +#include <sys/buf.h> +#include <sys/kernel.h> +#include <sys/ioctl.h> +#include <sys/tty.h> +#include <sys/uio.h> +#include <sys/syslog.h> -#include "i386/isa/isa.h" -#include "i386/isa/isa_device.h" -#include "i386/isa/lptreg.h" +#include <i386/isa/isa.h> +#include <i386/isa/isa_device.h> +#include <i386/isa/lptreg.h> -#include "i386/include/lpt.h" +#include <i386/include/lpt.h> #ifdef INET -#include "mbuf.h" -#include "socket.h" -#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 <sys/mbuf.h> +#include <sys/socket.h> +#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> #endif /* INET */ #define LPINITRDY 4 /* wait up to 4 seconds for a ready */ diff --git a/sys/i386/isa/mcd.c b/sys/i386/isa/mcd.c index 683b0e1798c2..6722c5a26ab4 100644 --- a/sys/i386/isa/mcd.c +++ b/sys/i386/isa/mcd.c @@ -39,28 +39,28 @@ * 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.15 1994/04/20 07:06:41 davidg Exp $ + * $Id: mcd.c,v 1.17 1994/05/25 08:59:30 rgrimes Exp $ */ static char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore"; #include "mcd.h" #if NMCD > 0 -#include "types.h" -#include "param.h" -#include "systm.h" -#include "conf.h" -#include "file.h" -#include "buf.h" -#include "stat.h" -#include "uio.h" -#include "ioctl.h" -#include "cdio.h" -#include "errno.h" -#include "dkbad.h" -#include "disklabel.h" -#include "i386/isa/isa.h" -#include "i386/isa/isa_device.h" -#include "mcdreg.h" +#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/stat.h> +#include <sys/uio.h> +#include <sys/ioctl.h> +#include <sys/cdio.h> +#include <sys/errno.h> +#include <sys/dkbad.h> +#include <sys/disklabel.h> +#include <i386/isa/isa.h> +#include <i386/isa/isa_device.h> +#include <i386/isa/mcdreg.h> /* user definable options */ /*#define MCD_TO_WARNING_ON*/ /* define to get timeout messages */ diff --git a/sys/i386/isa/mse.c b/sys/i386/isa/mse.c index 3653610371b4..5ce5c030e331 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$ + * $Id: mse.c,v 1.5 1994/08/02 07:39:39 davidg Exp $ */ /* * Driver for the Logitech and ATI Inport Bus mice for use with 386bsd and @@ -44,18 +44,18 @@ #include "mse.h" #if NMSE > 0 -#include "param.h" -#include "proc.h" -#include "user.h" -#include "buf.h" -#include "systm.h" -#include "kernel.h" -#include "ioctl.h" -#include "tty.h" -#include "uio.h" - -#include "i386/isa/isa_device.h" -#include "i386/isa/icu.h" +#include <sys/param.h> +#include <sys/proc.h> +#include <sys/user.h> +#include <sys/buf.h> +#include <sys/systm.h> +#include <sys/kernel.h> +#include <sys/ioctl.h> +#include <sys/tty.h> +#include <sys/uio.h> + +#include <i386/isa/isa_device.h> +#include <i386/isa/icu.h> static int mseprobe(struct isa_device *); static int mseattach(struct isa_device *); diff --git a/sys/i386/isa/npx.c b/sys/i386/isa/npx.c index a3ce1e2bad78..f7f9b27f9c75 100644 --- a/sys/i386/isa/npx.c +++ b/sys/i386/isa/npx.c @@ -32,25 +32,25 @@ * SUCH DAMAGE. * * from: @(#)npx.c 7.2 (Berkeley) 5/12/91 - * $Id: npx.c,v 1.6 1994/01/03 07:55:43 davidg Exp $ + * $Id: npx.c,v 1.9 1994/06/11 05:17:15 davidg Exp $ */ #include "npx.h" #if NNPX > 0 -#include "param.h" -#include "systm.h" -#include "conf.h" -#include "file.h" -#include "proc.h" -#include "machine/cpu.h" -#include "machine/pcb.h" -#include "machine/trap.h" -#include "ioctl.h" -#include "machine/specialreg.h" -#include "i386/isa/icu.h" -#include "i386/isa/isa_device.h" -#include "i386/isa/isa.h" +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/conf.h> +#include <sys/file.h> +#include <sys/proc.h> +#include <machine/cpu.h> +#include <machine/pcb.h> +#include <machine/trap.h> +#include <sys/ioctl.h> +#include <machine/specialreg.h> +#include <i386/isa/icu.h> +#include <i386/isa/isa_device.h> +#include <i386/isa/isa.h> /* * 387 and 287 Numeric Coprocessor Extension (NPX) Driver. diff --git a/sys/i386/isa/pcaudio.c b/sys/i386/isa/pcaudio.c index 32995b331dd7..5d5121812bb3 100644 --- a/sys/i386/isa/pcaudio.c +++ b/sys/i386/isa/pcaudio.c @@ -24,23 +24,23 @@ * (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: pcaudio.c,v 1.3 1994/05/20 12:24:15 sos Exp $ */ -#include "param.h" -#include "uio.h" -#include "ioctl.h" -#include "sound/ulaw.h" -#include "machine/cpufunc.h" -#include "machine/pio.h" -#include "machine/pcaudioio.h" -#include "i386/isa/isa.h" -#include "i386/isa/isa_device.h" -#include "i386/isa/timerreg.h" - #include "pca.h" #if NPCA > 0 +#include <sys/param.h> +#include <sys/uio.h> +#include <sys/ioctl.h> +#include <sound/ulaw.h> +#include <machine/cpufunc.h> +#include <machine/pio.h> +#include <machine/pcaudioio.h> +#include <i386/isa/isa.h> +#include <i386/isa/isa_device.h> +#include <i386/isa/timerreg.h> + #define BUF_SIZE 8192 #define SAMPLE_RATE 8000 #define INTERRUPT_RATE 16000 diff --git a/sys/i386/isa/sio.c b/sys/i386/isa/sio.c index dd4ee55cfcf0..de95e90b74ef 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.44 1994/04/03 12:25:57 ache Exp $ + * $Id: sio.c,v 1.47 1994/05/26 13:31:40 rgrimes Exp $ */ #include "sio.h" @@ -43,22 +43,22 @@ * Works for National Semiconductor NS8250-NS16550AF UARTs. * COM driver, based on HP dca driver. */ -#include "param.h" -#include "systm.h" -#include "ioctl.h" -#include "tty.h" -#include "proc.h" -#include "user.h" -#include "conf.h" -#include "file.h" -#include "uio.h" -#include "kernel.h" -#include "syslog.h" - -#include "i386/isa/isa.h" -#include "i386/isa/isa_device.h" -#include "i386/isa/sioreg.h" -#include "i386/isa/ic/ns16550.h" +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/ioctl.h> +#include <sys/tty.h> +#include <sys/proc.h> +#include <sys/user.h> +#include <sys/conf.h> +#include <sys/file.h> +#include <sys/uio.h> +#include <sys/kernel.h> +#include <sys/syslog.h> + +#include <i386/isa/isa.h> +#include <i386/isa/isa_device.h> +#include <i386/isa/sioreg.h> +#include <i386/isa/ic/ns16550.h> #define FAKE_DCD(unit) ((unit) == comconsole) #define LOTS_OF_EVENTS 64 /* helps separate urgent events from input */ diff --git a/sys/i386/isa/spkr.c b/sys/i386/isa/spkr.c index d273f31104b9..4f9f2faff10c 100644 --- a/sys/i386/isa/spkr.c +++ b/sys/i386/isa/spkr.c @@ -4,22 +4,22 @@ * v1.4 by Eric S. Raymond (esr@snark.thyrsus.com) Aug 1993 * modified for FreeBSD by Andrew A. Chernov <ache@astral.msk.su> * - * $Id: spkr.c,v 1.7 1994/01/25 23:04:27 ache Exp $ + * $Id: spkr.c,v 1.8 1994/04/21 14:21:50 sos Exp $ */ #include "speaker.h" #if NSPEAKER > 0 -#include "param.h" -#include "systm.h" -#include "kernel.h" -#include "errno.h" -#include "buf.h" -#include "uio.h" -#include "i386/isa/isa.h" -#include "i386/isa/timerreg.h" -#include "machine/speaker.h" +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/kernel.h> +#include <sys/errno.h> +#include <sys/buf.h> +#include <sys/uio.h> +#include <i386/isa/isa.h> +#include <i386/isa/timerreg.h> +#include <machine/speaker.h> /**************** MACHINE DEPENDENT PART STARTS HERE ************************* * diff --git a/sys/i386/isa/syscons.c b/sys/i386/isa/syscons.c index a2a931c6c2b6..ce391cdd1973 100644 --- a/sys/i386/isa/syscons.c +++ b/sys/i386/isa/syscons.c @@ -35,40 +35,41 @@ * SUCH DAMAGE. * * from:@(#)syscons.c 1.3 940129 - * $Id: syscons.c,v 1.46 1994/05/25 08:59:56 rgrimes Exp $ + * $Id: syscons.c,v 1.47 1994/08/01 10:38:19 davidg Exp $ * */ +#include "sc.h" + +#if NSC > 0 + #if !defined(__FreeBSD__) #define FAT_CURSOR #endif -#include "param.h" +#include <sys/param.h> #include <sys/systm.h> -#include "conf.h" -#include "ioctl.h" -#include "proc.h" -#include "user.h" -#include "tty.h" -#include "uio.h" -#include "callout.h" -#include "kernel.h" -#include "syslog.h" -#include "errno.h" -#include "malloc.h" -#include "i386/isa/isa.h" -#include "i386/isa/isa_device.h" -#include "i386/isa/timerreg.h" -#include "i386/i386/cons.h" -#include "machine/console.h" -#include "machine/psl.h" -#include "machine/frame.h" -#include "machine/pc/display.h" -#include "iso8859.font" -#include "kbdtables.h" -#include "sc.h" - -#if NSC > 0 +#include <sys/conf.h> +#include <sys/ioctl.h> +#include <sys/proc.h> +#include <sys/user.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> +#include <i386/isa/isa.h> +#include <i386/isa/isa_device.h> +#include <i386/isa/timerreg.h> +#include <i386/i386/cons.h> +#include <machine/console.h> +#include <machine/psl.h> +#include <machine/frame.h> +#include <machine/pc/display.h> +#include <i386/isa/iso8859.font> +#include <i386/isa/kbdtables.h> #if !defined(NCONS) #define NCONS 12 diff --git a/sys/i386/isa/ultra14f.c b/sys/i386/isa/ultra14f.c index aa999174c0e3..a89eeca3b213 100644 --- a/sys/i386/isa/ultra14f.c +++ b/sys/i386/isa/ultra14f.c @@ -19,13 +19,13 @@ * commenced: Sun Sep 27 18:14:01 PDT 1992 * slight mod to make work with 34F as well: Wed Jun 2 18:05:48 WST 1993 * - * $Id: ultra14f.c,v 1.16 1994/03/20 00:30:04 wollman Exp $ + * $Id: ultra14f.c,v 1.19 1994/05/27 04:02:08 rgrimes Exp $ */ #include <sys/types.h> #ifdef KERNEL /* don't laugh.. this compiles to a program too.. look */ -#include <uha.h> +#include "uha.h" #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/i386/isa/wd.c b/sys/i386/isa/wd.c index 6524264a1acc..31c7e2894c35 100644 --- a/sys/i386/isa/wd.c +++ b/sys/i386/isa/wd.c @@ -37,7 +37,7 @@ static int wdtest = 0; * SUCH DAMAGE. * * from: @(#)wd.c 7.2 (Berkeley) 5/9/91 - * $Id: wd.c,v 1.40 1994/08/08 13:53:33 davidg Exp $ + * $Id: wd.c,v 1.41 1994/08/08 13:56:46 davidg Exp $ */ /* TODO: @@ -64,24 +64,24 @@ static int wdtest = 0; #include "wd.h" #if NWDC > 0 -#include "param.h" -#include "dkbad.h" -#include "systm.h" -#include "kernel.h" -#include "conf.h" -#include "file.h" -#include "stat.h" -#include "ioctl.h" -#include "disklabel.h" -#include "buf.h" -#include "uio.h" -#include "malloc.h" -#include "machine/cpu.h" -#include "i386/isa/isa.h" -#include "i386/isa/isa_device.h" -#include "i386/isa/wdreg.h" -#include "syslog.h" -#include "vm/vm.h" +#include <sys/param.h> +#include <sys/dkbad.h> +#include <sys/systm.h> +#include <sys/kernel.h> +#include <sys/conf.h> +#include <sys/file.h> +#include <sys/stat.h> +#include <sys/ioctl.h> +#include <sys/disklabel.h> +#include <sys/buf.h> +#include <sys/uio.h> +#include <sys/malloc.h> +#include <machine/cpu.h> +#include <i386/isa/isa.h> +#include <i386/isa/isa_device.h> +#include <i386/isa/wdreg.h> +#include <sys/syslog.h> +#include <vm/vm.h> #define TIMEOUT 10000 #define RETRIES 5 /* number of retries before giving up */ diff --git a/sys/i386/isa/wt.c b/sys/i386/isa/wt.c index 21a6ed93578b..5b287a4bdb09 100644 --- a/sys/i386/isa/wt.c +++ b/sys/i386/isa/wt.c @@ -19,7 +19,7 @@ * the original CMU copyright notice. * * Version 1.3, Thu Nov 11 12:09:13 MSK 1993 - * $Id: wt.c,v 1.4 1993/12/13 18:38:43 alm Exp $ + * $Id: wt.c,v 1.7 1994/05/27 04:02:10 rgrimes Exp $ * */ @@ -53,18 +53,18 @@ #include "wt.h" #if NWT > 0 -#include "sys/param.h" -#include "systm.h" -#include "kernel.h" -#include "sys/buf.h" -#include "sys/fcntl.h" -#include "sys/malloc.h" -#include "sys/ioctl.h" -#include "sys/mtio.h" -#include "vm/vm_param.h" -#include "i386/include/pio.h" -#include "i386/isa/isa_device.h" -#include "i386/isa/wtreg.h" +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/kernel.h> +#include <sys/buf.h> +#include <sys/fcntl.h> +#include <sys/malloc.h> +#include <sys/ioctl.h> +#include <sys/mtio.h> +#include <vm/vm_param.h> +#include <i386/include/pio.h> +#include <i386/isa/isa_device.h> +#include <i386/isa/wtreg.h> /* * Uncomment this to enable internal device tracing. |