diff options
Diffstat (limited to 'sys')
116 files changed, 457 insertions, 448 deletions
diff --git a/sys/amd64/amd64/support.S b/sys/amd64/amd64/support.S index 751e923..0874d2b 100644 --- a/sys/amd64/amd64/support.S +++ b/sys/amd64/amd64/support.S @@ -30,14 +30,16 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: support.s,v 1.36 1996/05/31 01:08:03 peter Exp $ + * $Id: support.s,v 1.37 1996/06/13 07:17:20 asami Exp $ */ -#include "assym.s" /* system definitions */ -#include "errno.h" /* error return codes */ -#include "machine/asmacros.h" /* miscellaneous asm macros */ -#include "machine/cputypes.h" /* types of CPUs */ -#include "machine/specialreg.h" +#include <sys/errno.h> + +#include <machine/asmacros.h> +#include <machine/cputypes.h> +#include <machine/specialreg.h> + +#include "assym.s" #define KDSEL 0x10 /* kernel data selector */ #define IDXSHIFT 10 diff --git a/sys/amd64/amd64/support.s b/sys/amd64/amd64/support.s index 751e923..0874d2b 100644 --- a/sys/amd64/amd64/support.s +++ b/sys/amd64/amd64/support.s @@ -30,14 +30,16 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: support.s,v 1.36 1996/05/31 01:08:03 peter Exp $ + * $Id: support.s,v 1.37 1996/06/13 07:17:20 asami Exp $ */ -#include "assym.s" /* system definitions */ -#include "errno.h" /* error return codes */ -#include "machine/asmacros.h" /* miscellaneous asm macros */ -#include "machine/cputypes.h" /* types of CPUs */ -#include "machine/specialreg.h" +#include <sys/errno.h> + +#include <machine/asmacros.h> +#include <machine/cputypes.h> +#include <machine/specialreg.h> + +#include "assym.s" #define KDSEL 0x10 /* kernel data selector */ #define IDXSHIFT 10 diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c index 5ff8acd..c86e7fd 100644 --- a/sys/amd64/amd64/trap.c +++ b/sys/amd64/amd64/trap.c @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)trap.c 7.4 (Berkeley) 5/13/91 - * $Id: trap.c,v 1.81 1996/08/11 17:41:25 davidg Exp $ + * $Id: trap.c,v 1.82 1996/09/01 10:10:12 davidg Exp $ */ /* @@ -78,8 +78,8 @@ #include <machine/../isa/isa_device.h> #ifdef POWERFAIL_NMI -# include <syslog.h> -# include <machine/clock.h> +#include <sys/syslog.h> +#include <machine/clock.h> #endif #include "isa.h" diff --git a/sys/dev/joy/joy.c b/sys/dev/joy/joy.c index 350d784..5f6ca2e 100644 --- a/sys/dev/joy/joy.c +++ b/sys/dev/joy/joy.c @@ -30,8 +30,7 @@ #if NJOY > 0 -#include <errno.h> - +#include <sys/errno.h> #include <sys/param.h> #include <sys/systm.h> #include <sys/conf.h> diff --git a/sys/dev/lnc/if_lncvar.h b/sys/dev/lnc/if_lncvar.h index c6fd165..843f5a5 100644 --- a/sys/dev/lnc/if_lncvar.h +++ b/sys/dev/lnc/if_lncvar.h @@ -8,7 +8,7 @@ * */ -#include "ic/Am7990.h" +#include <i386/isa/ic/Am7990.h> /* * Initialize multicast address hashing registers to accept diff --git a/sys/gnu/ext2fs/ext2_vnops.c b/sys/gnu/ext2fs/ext2_vnops.c index bdbafa0..6507a87 100644 --- a/sys/gnu/ext2fs/ext2_vnops.c +++ b/sys/gnu/ext2fs/ext2_vnops.c @@ -66,7 +66,7 @@ #if !defined(__FreeBSD__) #include <ufs/ufs/lockf.h> #else -#include <lockf.h> +#include <sys/lockf.h> #include <sys/signalvar.h> #endif #include <ufs/ufs/quota.h> diff --git a/sys/gnu/fs/ext2fs/ext2_vnops.c b/sys/gnu/fs/ext2fs/ext2_vnops.c index bdbafa0..6507a87 100644 --- a/sys/gnu/fs/ext2fs/ext2_vnops.c +++ b/sys/gnu/fs/ext2fs/ext2_vnops.c @@ -66,7 +66,7 @@ #if !defined(__FreeBSD__) #include <ufs/ufs/lockf.h> #else -#include <lockf.h> +#include <sys/lockf.h> #include <sys/signalvar.h> #endif #include <ufs/ufs/quota.h> diff --git a/sys/gnu/i386/fpemul/div_small.s b/sys/gnu/i386/fpemul/div_small.s index d25313b..cf875db 100644 --- a/sys/gnu/i386/fpemul/div_small.s +++ b/sys/gnu/i386/fpemul/div_small.s @@ -57,7 +57,7 @@ * W. Metzenthen June 1994. * * - * $Id: div_small.s,v 1.2 1994/04/29 21:07:11 gclarkii Exp $ + * $Id: div_small.s,v 1.3 1994/06/10 07:44:08 rich Exp $ * */ @@ -65,7 +65,7 @@ | unsigned long div_small(unsigned long long *x, unsigned long y) | +---------------------------------------------------------------------------*/ -#include "fpu_asm.h" +#include <gnu/i386/fpemul/fpu_asm.h> .text .align 2,144 diff --git a/sys/gnu/i386/fpemul/errors.c b/sys/gnu/i386/fpemul/errors.c index a303b34..378eb61 100644 --- a/sys/gnu/i386/fpemul/errors.c +++ b/sys/gnu/i386/fpemul/errors.c @@ -56,7 +56,7 @@ * W. Metzenthen June 1994. * * - * $Id: errors.c,v 1.3 1994/06/10 07:44:10 rich Exp $ + * $Id: errors.c,v 1.4 1995/03/16 18:11:10 bde Exp $ * */ @@ -71,19 +71,19 @@ -#include "param.h" -#include "systm.h" -#include "proc.h" -#include "machine/cpu.h" -#include "machine/pcb.h" +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/proc.h> +#include <machine/cpu.h> +#include <machine/pcb.h> -#include "fpu_emu.h" -#include "fpu_system.h" -#include "exception.h" -#include "status_w.h" -#include "control_w.h" -#include "reg_constant.h" -#include "version.h" +#include <gnu/i386/fpemul/fpu_emu.h> +#include <gnu/i386/fpemul/fpu_system.h> +#include <gnu/i386/fpemul/exception.h> +#include <gnu/i386/fpemul/status_w.h> +#include <gnu/i386/fpemul/control_w.h> +#include <gnu/i386/fpemul/reg_constant.h> +#include <gnu/i386/fpemul/version.h> /* */ #undef PRINT_MESSAGES diff --git a/sys/gnu/i386/fpemul/exception.h b/sys/gnu/i386/fpemul/exception.h index 68280e7..d461115 100644 --- a/sys/gnu/i386/fpemul/exception.h +++ b/sys/gnu/i386/fpemul/exception.h @@ -54,7 +54,7 @@ * W. Metzenthen June 1994. * * - * $Id: exception.h,v 1.3 1994/06/10 07:44:12 rich Exp $ + * $Id: exception.h,v 1.4 1995/12/22 16:53:48 bde Exp $ * * */ @@ -70,7 +70,7 @@ #endif #ifndef SW_C1 -#include "fpu_emu.h" +#include <gnu/i386/fpemul/fpu_emu.h> #endif /* SW_C1 */ #define FPU_BUSY Const_(0x8000) /* FPU busy bit (8087 compatibility) */ diff --git a/sys/gnu/i386/fpemul/fpu_arith.c b/sys/gnu/i386/fpemul/fpu_arith.c index 5745e1b..7feaad6 100644 --- a/sys/gnu/i386/fpemul/fpu_arith.c +++ b/sys/gnu/i386/fpemul/fpu_arith.c @@ -56,21 +56,21 @@ * W. Metzenthen June 1994. * * - * $Id: fpu_arith.c,v 1.3 1994/06/10 07:44:14 rich Exp $ + * $Id: fpu_arith.c,v 1.4 1995/05/30 07:57:43 rgrimes Exp $ * */ -#include "param.h" -#include "proc.h" -#include "machine/cpu.h" -#include "machine/pcb.h" +#include <sys/param.h> +#include <sys/proc.h> +#include <machine/cpu.h> +#include <machine/pcb.h> -#include "fpu_emu.h" -#include "fpu_system.h" -#include "control_w.h" +#include <gnu/i386/fpemul/fpu_emu.h> +#include <gnu/i386/fpemul/fpu_system.h> +#include <gnu/i386/fpemul/control_w.h> void diff --git a/sys/gnu/i386/fpemul/fpu_asm.h b/sys/gnu/i386/fpemul/fpu_asm.h index e618c04..935a316 100644 --- a/sys/gnu/i386/fpemul/fpu_asm.h +++ b/sys/gnu/i386/fpemul/fpu_asm.h @@ -54,14 +54,14 @@ * W. Metzenthen June 1994. * * - * $Id: fpu_asm.h,v 1.2 1994/04/29 21:07:14 gclarkii Exp $ + * $Id: fpu_asm.h,v 1.3 1994/06/10 07:44:16 rich Exp $ * */ #ifndef _FPU_ASM_H_ #define _FPU_ASM_H_ -#include "fpu_emu.h" +#include <gnu/i386/fpemul/fpu_emu.h> #define EXCEPTION _exception diff --git a/sys/gnu/i386/fpemul/fpu_aux.c b/sys/gnu/i386/fpemul/fpu_aux.c index ce64a08..71d68e1 100644 --- a/sys/gnu/i386/fpemul/fpu_aux.c +++ b/sys/gnu/i386/fpemul/fpu_aux.c @@ -56,20 +56,20 @@ * W. Metzenthen June 1994. * * - * $Id: fpu_aux.c,v 1.3 1994/06/10 07:44:17 rich Exp $ + * $Id: fpu_aux.c,v 1.4 1995/12/14 09:50:21 phk Exp $ * */ -#include "param.h" -#include "proc.h" -#include "machine/cpu.h" -#include "machine/pcb.h" +#include <sys/param.h> +#include <sys/proc.h> +#include <machine/cpu.h> +#include <machine/pcb.h> -#include "fpu_emu.h" -#include "fpu_system.h" -#include "exception.h" -#include "status_w.h" +#include <gnu/i386/fpemul/fpu_emu.h> +#include <gnu/i386/fpemul/fpu_system.h> +#include <gnu/i386/fpemul/exception.h> +#include <gnu/i386/fpemul/status_w.h> static void diff --git a/sys/gnu/i386/fpemul/fpu_emu.h b/sys/gnu/i386/fpemul/fpu_emu.h index b62a9cf..23f2748 100644 --- a/sys/gnu/i386/fpemul/fpu_emu.h +++ b/sys/gnu/i386/fpemul/fpu_emu.h @@ -54,7 +54,7 @@ * W. Metzenthen June 1994. * * - * $Id: fpu_emu.h,v 1.2 1994/04/29 21:16:20 gclarkii Exp $ + * $Id: fpu_emu.h,v 1.3 1994/06/10 07:44:19 rich Exp $ * */ @@ -80,7 +80,7 @@ #define PECULIAR_486 #ifdef LOCORE -#include "fpu_asm.h" +#include <gnu/i386/fpemul/fpu_asm.h> #define Const(x) $/**/x #else #define Const(x) x @@ -108,8 +108,8 @@ #ifndef LOCORE -#include "types.h" -#include "math_emu.h" +#include <sys/types.h> +#include <gnu/i386/fpemul/math_emu.h> #ifdef PARANOID extern char emulating; @@ -180,7 +180,7 @@ polynomial(unsigned accum[], unsigned x[], unsigned int control_w); #ifndef MAKING_PROTO -#include "fpu_proto.h" +#include <gnu/i386/fpemul/fpu_proto.h> #endif #endif /* LOCORE */ diff --git a/sys/gnu/i386/fpemul/fpu_entry.c b/sys/gnu/i386/fpemul/fpu_entry.c index 9c82eea..2634017 100644 --- a/sys/gnu/i386/fpemul/fpu_entry.c +++ b/sys/gnu/i386/fpemul/fpu_entry.c @@ -55,7 +55,7 @@ * * W. Metzenthen June 1994. * - * $Id: fpu_entry.c,v 1.7 1995/12/14 08:21:17 phk Exp $ + * $Id: fpu_entry.c,v 1.8 1995/12/14 20:21:49 bde Exp $ * */ @@ -83,11 +83,11 @@ #include <machine/cpu.h> #include <machine/pcb.h> -#include "fpu_emu.h" -#include "fpu_system.h" -#include "exception.h" -#include "control_w.h" -#include "status_w.h" +#include <gnu/i386/fpemul/fpu_emu.h> +#include <gnu/i386/fpemul/fpu_system.h> +#include <gnu/i386/fpemul/exception.h> +#include <gnu/i386/fpemul/control_w.h> +#include <gnu/i386/fpemul/status_w.h> #define __BAD__ Un_impl /* Not implemented */ diff --git a/sys/gnu/i386/fpemul/fpu_etc.c b/sys/gnu/i386/fpemul/fpu_etc.c index 936e39a..3b3897a 100644 --- a/sys/gnu/i386/fpemul/fpu_etc.c +++ b/sys/gnu/i386/fpemul/fpu_etc.c @@ -56,20 +56,20 @@ * W. Metzenthen June 1994. * * - * $Id: fpu_etc.c,v 1.2 1994/04/29 21:16:22 gclarkii Exp $ + * $Id: fpu_etc.c,v 1.3 1994/06/10 07:44:24 rich Exp $ * */ -#include "param.h" -#include "proc.h" -#include "machine/cpu.h" -#include "machine/pcb.h" +#include <sys/param.h> +#include <sys/proc.h> +#include <machine/cpu.h> +#include <machine/pcb.h> -#include "fpu_emu.h" -#include "fpu_system.h" -#include "exception.h" -#include "status_w.h" -#include "reg_constant.h" +#include <gnu/i386/fpemul/fpu_emu.h> +#include <gnu/i386/fpemul/fpu_system.h> +#include <gnu/i386/fpemul/exception.h> +#include <gnu/i386/fpemul/status_w.h> +#include <gnu/i386/fpemul/reg_constant.h> static void diff --git a/sys/gnu/i386/fpemul/fpu_trig.c b/sys/gnu/i386/fpemul/fpu_trig.c index 4dc8101..63a1341 100644 --- a/sys/gnu/i386/fpemul/fpu_trig.c +++ b/sys/gnu/i386/fpemul/fpu_trig.c @@ -56,22 +56,22 @@ * W. Metzenthen June 1994. * * - * $Id: fpu_trig.c,v 1.4 1994/06/10 07:44:27 rich Exp $ + * $Id: fpu_trig.c,v 1.5 1995/12/17 21:13:58 phk Exp $ * */ -#include "param.h" -#include "proc.h" -#include "machine/cpu.h" -#include "machine/pcb.h" +#include <sys/param.h> +#include <sys/proc.h> +#include <machine/cpu.h> +#include <machine/pcb.h> -#include "fpu_emu.h" -#include "fpu_system.h" -#include "exception.h" -#include "status_w.h" -#include "reg_constant.h" -#include "control_w.h" +#include <gnu/i386/fpemul/fpu_emu.h> +#include <gnu/i386/fpemul/fpu_system.h> +#include <gnu/i386/fpemul/exception.h> +#include <gnu/i386/fpemul/status_w.h> +#include <gnu/i386/fpemul/reg_constant.h> +#include <gnu/i386/fpemul/control_w.h> static void convert_l2reg(long *arg, FPU_REG * dest); diff --git a/sys/gnu/i386/fpemul/get_address.c b/sys/gnu/i386/fpemul/get_address.c index 5839e57..5c60050 100644 --- a/sys/gnu/i386/fpemul/get_address.c +++ b/sys/gnu/i386/fpemul/get_address.c @@ -56,7 +56,7 @@ * W. Metzenthen June 1994. * * - * $Id: get_address.c,v 1.2 1994/04/29 21:16:26 gclarkii Exp $ + * $Id: get_address.c,v 1.3 1994/06/10 07:44:29 rich Exp $ * */ @@ -67,16 +67,16 @@ | other processes using the emulator while swapping is in progress. | +---------------------------------------------------------------------------*/ -#include "param.h" -#include "proc.h" -#include "systm.h" -#include "machine/cpu.h" -#include "machine/pcb.h" -#include "machine/reg.h" +#include <sys/param.h> +#include <sys/proc.h> +#include <sys/systm.h> +#include <machine/cpu.h> +#include <machine/pcb.h> +#include <machine/reg.h> -#include "fpu_emu.h" -#include "fpu_system.h" -#include "exception.h" +#include <gnu/i386/fpemul/fpu_emu.h> +#include <gnu/i386/fpemul/fpu_system.h> +#include <gnu/i386/fpemul/exception.h> static int reg_offset[] = { tEAX, tECX, tEDX, tEBX, tESP, tEBP, tESI, tEDI}; diff --git a/sys/gnu/i386/fpemul/load_store.c b/sys/gnu/i386/fpemul/load_store.c index 94f61b6..9ad91dd 100644 --- a/sys/gnu/i386/fpemul/load_store.c +++ b/sys/gnu/i386/fpemul/load_store.c @@ -57,7 +57,7 @@ * W. Metzenthen June 1994. * * - * $Id: load_store.c,v 1.4 1994/09/21 22:22:46 bde Exp $ + * $Id: load_store.c,v 1.5 1996/06/25 20:29:21 bde Exp $ * */ @@ -68,17 +68,17 @@ | other processes using the emulator while swapping is in progress. | +---------------------------------------------------------------------------*/ -#include "param.h" -#include "proc.h" -#include "systm.h" -#include "machine/cpu.h" -#include "machine/md_var.h" -#include "machine/pcb.h" +#include <sys/param.h> +#include <sys/proc.h> +#include <sys/systm.h> +#include <machine/cpu.h> +#include <machine/md_var.h> +#include <machine/pcb.h> -#include "fpu_emu.h" -#include "fpu_system.h" -#include "exception.h" -#include "status_w.h" +#include <gnu/i386/fpemul/fpu_emu.h> +#include <gnu/i386/fpemul/fpu_system.h> +#include <gnu/i386/fpemul/exception.h> +#include <gnu/i386/fpemul/status_w.h> #define _NONE_ 0 /* FPU_st0_ptr etc not needed */ diff --git a/sys/gnu/i386/fpemul/poly_2xm1.c b/sys/gnu/i386/fpemul/poly_2xm1.c index b7e81f2..ad268e7 100644 --- a/sys/gnu/i386/fpemul/poly_2xm1.c +++ b/sys/gnu/i386/fpemul/poly_2xm1.c @@ -56,13 +56,13 @@ * W. Metzenthen June 1994. * * - * $Id: poly_2xm1.c,v 1.2 1994/04/29 21:23:25 gclarkii Exp $ + * $Id: poly_2xm1.c,v 1.3 1994/06/10 07:44:32 rich Exp $ * */ -#include "exception.h" -#include "reg_constant.h" -#include "fpu_emu.h" +#include <gnu/i386/fpemul/exception.h> +#include <gnu/i386/fpemul/reg_constant.h> +#include <gnu/i386/fpemul/fpu_emu.h> diff --git a/sys/gnu/i386/fpemul/poly_atan.c b/sys/gnu/i386/fpemul/poly_atan.c index 4c16c88..5042151 100644 --- a/sys/gnu/i386/fpemul/poly_atan.c +++ b/sys/gnu/i386/fpemul/poly_atan.c @@ -56,14 +56,14 @@ * W. Metzenthen June 1994. * * - * $Id: poly_atan.c,v 1.4 1994/06/10 07:44:34 rich Exp $ + * $Id: poly_atan.c,v 1.5 1995/12/14 09:50:24 phk Exp $ * */ -#include "exception.h" -#include "reg_constant.h" -#include "fpu_emu.h" -#include "control_w.h" +#include <gnu/i386/fpemul/exception.h> +#include <gnu/i386/fpemul/reg_constant.h> +#include <gnu/i386/fpemul/fpu_emu.h> +#include <gnu/i386/fpemul/control_w.h> #define HIPOWERon 6 /* odd poly, negative terms */ diff --git a/sys/gnu/i386/fpemul/poly_div.s b/sys/gnu/i386/fpemul/poly_div.s index 3ac5bf0..25dd507 100644 --- a/sys/gnu/i386/fpemul/poly_div.s +++ b/sys/gnu/i386/fpemul/poly_div.s @@ -57,11 +57,11 @@ * W. Metzenthen June 1994. * * - * $Id: poly_div.s,v 1.2 1994/04/29 21:23:27 gclarkii Exp $ + * $Id: poly_div.s,v 1.3 1994/06/10 07:44:36 rich Exp $ * */ -#include "fpu_asm.h" +#include <gnu/i386/fpemul/fpu_asm.h> .text diff --git a/sys/gnu/i386/fpemul/poly_l2.c b/sys/gnu/i386/fpemul/poly_l2.c index 0607c16..fcf9f48 100644 --- a/sys/gnu/i386/fpemul/poly_l2.c +++ b/sys/gnu/i386/fpemul/poly_l2.c @@ -56,15 +56,15 @@ * W. Metzenthen June 1994. * * - * $Id: poly_l2.c,v 1.4 1994/04/30 16:47:08 gclarkii Exp $ + * $Id: poly_l2.c,v 1.5 1994/06/10 07:44:38 rich Exp $ * */ -#include "exception.h" -#include "reg_constant.h" -#include "fpu_emu.h" -#include "control_w.h" +#include <gnu/i386/fpemul/exception.h> +#include <gnu/i386/fpemul/reg_constant.h> +#include <gnu/i386/fpemul/fpu_emu.h> +#include <gnu/i386/fpemul/control_w.h> diff --git a/sys/gnu/i386/fpemul/poly_mul64.s b/sys/gnu/i386/fpemul/poly_mul64.s index c0f5d0f..a80a13f 100644 --- a/sys/gnu/i386/fpemul/poly_mul64.s +++ b/sys/gnu/i386/fpemul/poly_mul64.s @@ -59,12 +59,12 @@ * W. Metzenthen June 1994. * * - * $Id: poly_mul64.s,v 1.2 1994/04/29 21:23:29 gclarkii Exp $ + * $Id: poly_mul64.s,v 1.3 1994/06/10 07:44:39 rich Exp $ * */ -#include "fpu_asm.h" +#include <gnu/i386/fpemul/fpu_asm.h> .text .align 2,144 diff --git a/sys/gnu/i386/fpemul/poly_sin.c b/sys/gnu/i386/fpemul/poly_sin.c index a1aa11c..f5e1dcb 100644 --- a/sys/gnu/i386/fpemul/poly_sin.c +++ b/sys/gnu/i386/fpemul/poly_sin.c @@ -56,15 +56,15 @@ * W. Metzenthen June 1994. * * - * $Id: poly_sin.c,v 1.4 1994/06/10 07:44:41 rich Exp $ + * $Id: poly_sin.c,v 1.5 1994/08/31 04:45:22 davidg Exp $ * */ -#include "exception.h" -#include "reg_constant.h" -#include "fpu_emu.h" -#include "control_w.h" +#include <gnu/i386/fpemul/exception.h> +#include <gnu/i386/fpemul/reg_constant.h> +#include <gnu/i386/fpemul/fpu_emu.h> +#include <gnu/i386/fpemul/control_w.h> #define HIPOWER 5 diff --git a/sys/gnu/i386/fpemul/poly_tan.c b/sys/gnu/i386/fpemul/poly_tan.c index 6098c81..a052381 100644 --- a/sys/gnu/i386/fpemul/poly_tan.c +++ b/sys/gnu/i386/fpemul/poly_tan.c @@ -56,14 +56,14 @@ * W. Metzenthen June 1994. * * - * $Id: poly_tan.c,v 1.4 1994/06/10 07:44:42 rich Exp $ + * $Id: poly_tan.c,v 1.5 1995/05/30 07:57:52 rgrimes Exp $ * */ -#include "exception.h" -#include "reg_constant.h" -#include "fpu_emu.h" -#include "control_w.h" +#include <gnu/i386/fpemul/exception.h> +#include <gnu/i386/fpemul/reg_constant.h> +#include <gnu/i386/fpemul/fpu_emu.h> +#include <gnu/i386/fpemul/control_w.h> #define HIPOWERop 3 /* odd poly, positive terms */ diff --git a/sys/gnu/i386/fpemul/polynomial.s b/sys/gnu/i386/fpemul/polynomial.s index f54c729..b2e808f 100644 --- a/sys/gnu/i386/fpemul/polynomial.s +++ b/sys/gnu/i386/fpemul/polynomial.s @@ -64,13 +64,13 @@ * W. Metzenthen June 1994. * * - * $Id: polynomial.s,v 1.2 1994/04/29 21:23:31 gclarkii Exp $ + * $Id: polynomial.s,v 1.3 1994/06/10 07:44:43 rich Exp $ * */ .file "fpolynom.s" -#include "fpu_asm.h" +#include <gnu/i386/fpemul/fpu_asm.h> /* #define EXTRA_PRECISE*/ diff --git a/sys/gnu/i386/fpemul/reg_add_sub.c b/sys/gnu/i386/fpemul/reg_add_sub.c index a122452..9e11c0b 100644 --- a/sys/gnu/i386/fpemul/reg_add_sub.c +++ b/sys/gnu/i386/fpemul/reg_add_sub.c @@ -55,7 +55,7 @@ * W. Metzenthen June 1994. * * - * $Id: reg_add_sub.c,v 1.2 1994/04/29 21:30:15 gclarkii Exp $ + * $Id: reg_add_sub.c,v 1.3 1994/06/10 07:44:44 rich Exp $ * */ @@ -64,11 +64,11 @@ | the source FPU_REGs. | +---------------------------------------------------------------------------*/ -#include "exception.h" -#include "reg_constant.h" -#include "fpu_emu.h" -#include "control_w.h" -#include "fpu_system.h" +#include <gnu/i386/fpemul/exception.h> +#include <gnu/i386/fpemul/reg_constant.h> +#include <gnu/i386/fpemul/fpu_emu.h> +#include <gnu/i386/fpemul/control_w.h> +#include <gnu/i386/fpemul/fpu_system.h> void diff --git a/sys/gnu/i386/fpemul/reg_compare.c b/sys/gnu/i386/fpemul/reg_compare.c index 52623f7..db4eb9d 100644 --- a/sys/gnu/i386/fpemul/reg_compare.c +++ b/sys/gnu/i386/fpemul/reg_compare.c @@ -56,24 +56,24 @@ * W. Metzenthen June 1994. * * - * $Id: reg_compare.c,v 1.4 1994/08/31 04:45:23 davidg Exp $ + * $Id: reg_compare.c,v 1.5 1995/05/30 07:57:54 rgrimes Exp $ * */ /*---------------------------------------------------------------------------+ | compare() is the core FPU_REG comparison function | +---------------------------------------------------------------------------*/ -#include "param.h" -#include "proc.h" -#include "systm.h" -#include "machine/cpu.h" -#include "machine/pcb.h" +#include <sys/param.h> +#include <sys/proc.h> +#include <sys/systm.h> +#include <machine/cpu.h> +#include <machine/pcb.h> -#include "fpu_emu.h" -#include "fpu_system.h" -#include "exception.h" -#include "control_w.h" -#include "status_w.h" +#include <gnu/i386/fpemul/fpu_emu.h> +#include <gnu/i386/fpemul/fpu_system.h> +#include <gnu/i386/fpemul/exception.h> +#include <gnu/i386/fpemul/control_w.h> +#include <gnu/i386/fpemul/status_w.h> int diff --git a/sys/gnu/i386/fpemul/reg_constant.c b/sys/gnu/i386/fpemul/reg_constant.c index e617b36..cd3353a 100644 --- a/sys/gnu/i386/fpemul/reg_constant.c +++ b/sys/gnu/i386/fpemul/reg_constant.c @@ -62,16 +62,16 @@ -#include "param.h" -#include "proc.h" -#include "systm.h" -#include "machine/cpu.h" -#include "machine/pcb.h" - -#include "fpu_emu.h" -#include "fpu_system.h" -#include "status_w.h" -#include "reg_constant.h" +#include <sys/param.h> +#include <sys/proc.h> +#include <sys/systm.h> +#include <machine/cpu.h> +#include <machine/pcb.h> + +#include <gnu/i386/fpemul/fpu_emu.h> +#include <gnu/i386/fpemul/fpu_system.h> +#include <gnu/i386/fpemul/status_w.h> +#include <gnu/i386/fpemul/reg_constant.h> FPU_REG CONST_1 = {SIGN_POS, TW_Valid, EXP_BIAS, diff --git a/sys/gnu/i386/fpemul/reg_constant.h b/sys/gnu/i386/fpemul/reg_constant.h index 6e4ffa8..a3bc57f 100644 --- a/sys/gnu/i386/fpemul/reg_constant.h +++ b/sys/gnu/i386/fpemul/reg_constant.h @@ -54,14 +54,14 @@ * W. Metzenthen June 1994. * * - * $Id: reg_constant.h,v 1.2 1994/04/29 21:30:18 gclarkii Exp $ + * $Id: reg_constant.h,v 1.3 1994/06/10 07:44:49 rich Exp $ * */ #ifndef _REG_CONSTANT_H_ #define _REG_CONSTANT_H_ -#include "fpu_emu.h" +#include <gnu/i386/fpemul/fpu_emu.h> extern FPU_REG CONST_1; extern FPU_REG CONST_2; diff --git a/sys/gnu/i386/fpemul/reg_div.s b/sys/gnu/i386/fpemul/reg_div.s index 5de5a46..d9360e6 100644 --- a/sys/gnu/i386/fpemul/reg_div.s +++ b/sys/gnu/i386/fpemul/reg_div.s @@ -60,13 +60,13 @@ * W. Metzenthen June 1994. * * - * $Id: reg_div.s,v 1.2 1994/04/29 21:30:19 gclarkii Exp $ + * $Id: reg_div.s,v 1.3 1994/06/10 07:44:50 rich Exp $ * */ -#include "exception.h" -#include "fpu_asm.h" -#include "control_w.h" +#include <gnu/i386/fpemul/exception.h> +#include <gnu/i386/fpemul/fpu_asm.h> +#include <gnu/i386/fpemul/control_w.h> .text .align 2 diff --git a/sys/gnu/i386/fpemul/reg_ld_str.c b/sys/gnu/i386/fpemul/reg_ld_str.c index f087b33..418661a 100644 --- a/sys/gnu/i386/fpemul/reg_ld_str.c +++ b/sys/gnu/i386/fpemul/reg_ld_str.c @@ -56,7 +56,7 @@ * W. Metzenthen June 1994. * * - * $Id: reg_ld_str.c,v 1.5 1994/09/21 22:22:48 bde Exp $ + * $Id: reg_ld_str.c,v 1.6 1996/06/25 20:29:26 bde Exp $ * */ @@ -67,19 +67,19 @@ | Emulator static data may change when user memory is accessed, due to | | other processes using the emulator while swapping is in progress. | +---------------------------------------------------------------------------*/ -#include "param.h" -#include "proc.h" -#include "systm.h" -#include "machine/cpu.h" -#include "machine/md_var.h" -#include "machine/pcb.h" - -#include "fpu_emu.h" -#include "fpu_system.h" -#include "exception.h" -#include "reg_constant.h" -#include "control_w.h" -#include "status_w.h" +#include <sys/param.h> +#include <sys/proc.h> +#include <sys/systm.h> +#include <machine/cpu.h> +#include <machine/md_var.h> +#include <machine/pcb.h> + +#include <gnu/i386/fpemul/fpu_emu.h> +#include <gnu/i386/fpemul/fpu_system.h> +#include <gnu/i386/fpemul/exception.h> +#include <gnu/i386/fpemul/reg_constant.h> +#include <gnu/i386/fpemul/control_w.h> +#include <gnu/i386/fpemul/status_w.h> #define EXTENDED_Emax 0x3fff /* largest valid exponent */ diff --git a/sys/gnu/i386/fpemul/reg_mul.c b/sys/gnu/i386/fpemul/reg_mul.c index b51e9fc..1a40eee 100644 --- a/sys/gnu/i386/fpemul/reg_mul.c +++ b/sys/gnu/i386/fpemul/reg_mul.c @@ -56,7 +56,7 @@ * W. Metzenthen June 1994. * * - * $Id: reg_mul.c,v 1.2 1994/04/29 21:30:21 gclarkii Exp $ + * $Id: reg_mul.c,v 1.3 1994/06/10 07:44:53 rich Exp $ * */ @@ -64,10 +64,10 @@ | The destination may be any FPU_REG, including one of the source FPU_REGs. | +---------------------------------------------------------------------------*/ -#include "exception.h" -#include "reg_constant.h" -#include "fpu_emu.h" -#include "fpu_system.h" +#include <gnu/i386/fpemul/exception.h> +#include <gnu/i386/fpemul/reg_constant.h> +#include <gnu/i386/fpemul/fpu_emu.h> +#include <gnu/i386/fpemul/fpu_system.h> /* This routine must be called with non-empty source registers */ diff --git a/sys/gnu/i386/fpemul/reg_norm.s b/sys/gnu/i386/fpemul/reg_norm.s index 6f9dd7c..98f0721 100644 --- a/sys/gnu/i386/fpemul/reg_norm.s +++ b/sys/gnu/i386/fpemul/reg_norm.s @@ -61,12 +61,12 @@ * W. Metzenthen June 1994. * * - * $Id: reg_norm.s,v 1.2 1994/04/29 21:30:22 gclarkii Exp $ + * $Id: reg_norm.s,v 1.3 1994/06/10 07:44:54 rich Exp $ * */ -#include "fpu_asm.h" +#include <gnu/i386/fpemul/fpu_asm.h> .text diff --git a/sys/gnu/i386/fpemul/reg_round.s b/sys/gnu/i386/fpemul/reg_round.s index 99a2a8a..51e9b87 100644 --- a/sys/gnu/i386/fpemul/reg_round.s +++ b/sys/gnu/i386/fpemul/reg_round.s @@ -65,7 +65,7 @@ * W. Metzenthen June 1994. * * - * $Id: reg_round.s,v 1.2 1994/04/29 21:30:23 gclarkii Exp $ + * $Id: reg_round.s,v 1.3 1994/06/10 07:44:55 rich Exp $ * */ @@ -118,9 +118,9 @@ +---------------------------------------------------------------------------*/ -#include "fpu_asm.h" -#include "exception.h" -#include "control_w.h" +#include <gnu/i386/fpemul/fpu_asm.h> +#include <gnu/i386/fpemul/exception.h> +#include <gnu/i386/fpemul/control_w.h> #define LOST_DOWN $1 #define LOST_UP $2 diff --git a/sys/gnu/i386/fpemul/reg_u_add.s b/sys/gnu/i386/fpemul/reg_u_add.s index 86c8475..2170742 100644 --- a/sys/gnu/i386/fpemul/reg_u_add.s +++ b/sys/gnu/i386/fpemul/reg_u_add.s @@ -62,7 +62,7 @@ * W. Metzenthen June 1994. * * - * $Id: reg_u_add.s,v 1.2 1994/04/29 21:34:23 gclarkii Exp $ + * $Id: reg_u_add.s,v 1.3 1994/06/10 07:44:56 rich Exp $ * */ @@ -76,9 +76,9 @@ | Basic checks are performed if PARANOID is defined. */ -#include "exception.h" -#include "fpu_asm.h" -#include "control_w.h" +#include <gnu/i386/fpemul/exception.h> +#include <gnu/i386/fpemul/fpu_asm.h> +#include <gnu/i386/fpemul/control_w.h> .text .align 2,144 diff --git a/sys/gnu/i386/fpemul/reg_u_div.s b/sys/gnu/i386/fpemul/reg_u_div.s index 4952923..e49c58e 100644 --- a/sys/gnu/i386/fpemul/reg_u_div.s +++ b/sys/gnu/i386/fpemul/reg_u_div.s @@ -57,7 +57,7 @@ * W. Metzenthen June 1994. * * - * $Id: reg_u_div.s,v 1.2 1994/04/29 21:34:24 gclarkii Exp $ + * $Id: reg_u_div.s,v 1.3 1994/06/10 07:44:57 rich Exp $ * */ @@ -70,9 +70,9 @@ | Does not compute the destination exponent, but does adjust it. | +---------------------------------------------------------------------------*/ -#include "exception.h" -#include "fpu_asm.h" -#include "control_w.h" +#include <gnu/i386/fpemul/exception.h> +#include <gnu/i386/fpemul/fpu_asm.h> +#include <gnu/i386/fpemul/control_w.h> /* #define dSIGL(x) (x) */ diff --git a/sys/gnu/i386/fpemul/reg_u_mul.s b/sys/gnu/i386/fpemul/reg_u_mul.s index 798f204..4cd129b 100644 --- a/sys/gnu/i386/fpemul/reg_u_mul.s +++ b/sys/gnu/i386/fpemul/reg_u_mul.s @@ -57,7 +57,7 @@ * W. Metzenthen June 1994. * * - * $Id: reg_u_mul.s,v 1.2 1994/04/29 21:34:25 gclarkii Exp $ + * $Id: reg_u_mul.s,v 1.3 1994/06/10 07:44:58 rich Exp $ * */ @@ -71,9 +71,9 @@ | Result is rounded to nearest 53 or 64 bits, using "nearest or even". | +---------------------------------------------------------------------------*/ -#include "exception.h" -#include "fpu_asm.h" -#include "control_w.h" +#include <gnu/i386/fpemul/exception.h> +#include <gnu/i386/fpemul/fpu_asm.h> +#include <gnu/i386/fpemul/control_w.h> .data diff --git a/sys/gnu/i386/fpemul/reg_u_sub.s b/sys/gnu/i386/fpemul/reg_u_sub.s index 3161e19..a899de5 100644 --- a/sys/gnu/i386/fpemul/reg_u_sub.s +++ b/sys/gnu/i386/fpemul/reg_u_sub.s @@ -61,7 +61,7 @@ * W. Metzenthen June 1994. * * - * $Id: reg_u_sub.s,v 1.2 1994/04/29 21:34:26 gclarkii Exp $ + * $Id: reg_u_sub.s,v 1.3 1994/06/10 07:44:59 rich Exp $ * */ @@ -76,9 +76,9 @@ | Basic checks are performed if PARANOID is defined. */ -#include "exception.h" -#include "fpu_asm.h" -#include "control_w.h" +#include <gnu/i386/fpemul/exception.h> +#include <gnu/i386/fpemul/fpu_asm.h> +#include <gnu/i386/fpemul/control_w.h> .text .align 2,144 diff --git a/sys/gnu/i386/fpemul/wm_shrx.s b/sys/gnu/i386/fpemul/wm_shrx.s index 9de9464..7920a08 100644 --- a/sys/gnu/i386/fpemul/wm_shrx.s +++ b/sys/gnu/i386/fpemul/wm_shrx.s @@ -62,12 +62,12 @@ * W. Metzenthen June 1994. * * - * $Id: wm_shrx.s,v 1.2 1994/04/29 21:34:29 gclarkii Exp $ + * $Id: wm_shrx.s,v 1.3 1994/06/10 07:45:03 rich Exp $ * */ -#include "fpu_asm.h" +#include <gnu/i386/fpemul/fpu_asm.h> .text .align 2,144 diff --git a/sys/gnu/i386/fpemul/wm_sqrt.s b/sys/gnu/i386/fpemul/wm_sqrt.s index b1bc03b..db55921 100644 --- a/sys/gnu/i386/fpemul/wm_sqrt.s +++ b/sys/gnu/i386/fpemul/wm_sqrt.s @@ -60,7 +60,7 @@ * W. Metzenthen June 1994. * * - * $Id: wm_sqrt.s,v 1.2 1994/04/29 21:34:30 gclarkii Exp $ + * $Id: wm_sqrt.s,v 1.3 1994/06/10 07:45:04 rich Exp $ * */ @@ -77,8 +77,8 @@ | The guess is kept in %esi:%edi | +---------------------------------------------------------------------------*/ -#include "exception.h" -#include "fpu_asm.h" +#include <gnu/i386/fpemul/exception.h> +#include <gnu/i386/fpemul/fpu_asm.h> .data diff --git a/sys/gnu/isdn/if_ii.c b/sys/gnu/isdn/if_ii.c index cdfe768..d9da5fd 100644 --- a/sys/gnu/isdn/if_ii.c +++ b/sys/gnu/isdn/if_ii.c @@ -1,6 +1,6 @@ -/* @(#)$Id: if_ii.c,v 1.5 1995/12/17 21:17:41 phk Exp $ +/* @(#)$Id: if_ii.c,v 1.6 1996/06/12 05:02:18 gpalmer Exp $ ******************************************************************************* - * II - Version 0.1 $Revision: 1.5 $ $State: Exp $ + * II - Version 0.1 $Revision: 1.6 $ $State: Exp $ * * Copyright 1994 Dietmar Friede ******************************************************************************* @@ -20,28 +20,28 @@ * Uses loop driver as template. Small - and simple - is beautiful. */ -#include "param.h" -#include "systm.h" -#include "mbuf.h" -#include "socket.h" -#include "errno.h" -#include "ioctl.h" -#include "protosw.h" +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/mbuf.h> +#include <sys/socket.h> +#include <sys/errno.h> +#include <sys/ioctl.h> +#include <sys/protosw.h> -#include "net/if.h" -#include "net/if_types.h" -#include "net/netisr.h" -#include "net/route.h" +#include <net/if.h> +#include <net/if_types.h> +#include <net/netisr.h> +#include <net/route.h> #ifdef INET -#include "netinet/in.h" -#include "netinet/in_systm.h" -#include "netinet/in_var.h" -#include "netinet/ip.h" +#include <netinet/in.h> +#include <netinet/in_systm.h> +#include <netinet/in_var.h> +#include <netinet/ip.h> #endif #include "ii.h" -#include "gnu/isdn/isdn_ioctl.h" +#include <gnu/isdn/isdn_ioctl.h> #define IIMTU 1500 diff --git a/sys/i386/i386/math_emulate.c b/sys/i386/i386/math_emulate.c index a45f7a8..16224ab 100644 --- a/sys/i386/i386/math_emulate.c +++ b/sys/i386/i386/math_emulate.c @@ -6,7 +6,7 @@ * [expediant "port" of linux 8087 emulator to 386BSD, with apologies -wfj] * * from: 386BSD 0.1 - * $Id: math_emulate.c,v 1.16 1995/12/14 08:21:27 phk Exp $ + * $Id: math_emulate.c,v 1.17 1995/12/14 20:21:58 bde Exp $ */ /* @@ -62,7 +62,7 @@ #include <sys/user.h> #define __ALIGNED_TEMP_REAL 1 -#include "math_emu.h" +#include <i386/i386/math_emu.h> #define bswapw(x) __asm__("xchgb %%al,%%ah":"=a" (x):"0" ((short)x)) #define ST(x) (*__st((x))) diff --git a/sys/i386/i386/support.s b/sys/i386/i386/support.s index 751e923..0874d2b 100644 --- a/sys/i386/i386/support.s +++ b/sys/i386/i386/support.s @@ -30,14 +30,16 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: support.s,v 1.36 1996/05/31 01:08:03 peter Exp $ + * $Id: support.s,v 1.37 1996/06/13 07:17:20 asami Exp $ */ -#include "assym.s" /* system definitions */ -#include "errno.h" /* error return codes */ -#include "machine/asmacros.h" /* miscellaneous asm macros */ -#include "machine/cputypes.h" /* types of CPUs */ -#include "machine/specialreg.h" +#include <sys/errno.h> + +#include <machine/asmacros.h> +#include <machine/cputypes.h> +#include <machine/specialreg.h> + +#include "assym.s" #define KDSEL 0x10 /* kernel data selector */ #define IDXSHIFT 10 diff --git a/sys/i386/i386/trap.c b/sys/i386/i386/trap.c index 5ff8acd..c86e7fd 100644 --- a/sys/i386/i386/trap.c +++ b/sys/i386/i386/trap.c @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)trap.c 7.4 (Berkeley) 5/13/91 - * $Id: trap.c,v 1.81 1996/08/11 17:41:25 davidg Exp $ + * $Id: trap.c,v 1.82 1996/09/01 10:10:12 davidg Exp $ */ /* @@ -78,8 +78,8 @@ #include <machine/../isa/isa_device.h> #ifdef POWERFAIL_NMI -# include <syslog.h> -# include <machine/clock.h> +#include <sys/syslog.h> +#include <machine/clock.h> #endif #include "isa.h" diff --git a/sys/i386/include/pcvt_ioctl.h b/sys/i386/include/pcvt_ioctl.h index e6075c5..9a369da 100644 --- a/sys/i386/include/pcvt_ioctl.h +++ b/sys/i386/include/pcvt_ioctl.h @@ -70,12 +70,10 @@ #define PCVTIDMAJOR 3 /* driver id - major release */ #define PCVTIDMINOR 20 /* driver id - minor release */ -#if defined(KERNEL) || defined(_KERNEL) -#include "ioctl.h" -#else -#include <sys/ioctl.h> +#if !defined(KERNEL) && !defined(_KERNEL) #include <sys/types.h> #endif +#include <sys/ioctl.h> /*---------------------------------------------------------------------------* * IOCTLs for MF II and AT Keyboards diff --git a/sys/i386/isa/gpib.c b/sys/i386/isa/gpib.c index fbec137..503ac5c 100644 --- a/sys/i386/isa/gpib.c +++ b/sys/i386/isa/gpib.c @@ -24,15 +24,15 @@ #if NGP > 0 -#include "param.h" -#include "buf.h" -#include "systm.h" -#include "sys/ioctl.h" -#include "proc.h" -#include "conf.h" -#include "uio.h" -#include "kernel.h" -#include "malloc.h" +#include <sys/param.h> +#include <sys/buf.h> +#include <sys/systm.h> +#include <sys/ioctl.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 @@ -41,9 +41,9 @@ #include <machine/clock.h> -#include "i386/isa/gpibreg.h" -#include "i386/isa/gpib.h" -#include "i386/isa/isa_device.h" +#include <i386/isa/gpibreg.h> +#include <i386/isa/gpib.h> +#include <i386/isa/isa_device.h> #define MIN(a,b) ((a < b) ? a : b) diff --git a/sys/i386/isa/if_lnc.h b/sys/i386/isa/if_lnc.h index c6fd165..843f5a5 100644 --- a/sys/i386/isa/if_lnc.h +++ b/sys/i386/isa/if_lnc.h @@ -8,7 +8,7 @@ * */ -#include "ic/Am7990.h" +#include <i386/isa/ic/Am7990.h> /* * Initialize multicast address hashing registers to accept diff --git a/sys/i386/isa/joy.c b/sys/i386/isa/joy.c index 350d784..5f6ca2e 100644 --- a/sys/i386/isa/joy.c +++ b/sys/i386/isa/joy.c @@ -30,8 +30,7 @@ #if NJOY > 0 -#include <errno.h> - +#include <sys/errno.h> #include <sys/param.h> #include <sys/systm.h> #include <sys/conf.h> diff --git a/sys/i386/isa/pcic.h b/sys/i386/isa/pcic.h index bc5ae5e..055c5d8 100644 --- a/sys/i386/isa/pcic.h +++ b/sys/i386/isa/pcic.h @@ -44,7 +44,7 @@ * pcmcia controller chip (PCIC) support * * (eventually, move this to a separate file) * *****************************************************************************/ -#include "ic/i82365.h" +#include <i386/isa/ic/i82365.h> /* * Each PCIC chip (82365SL or clone) can handle two card slots, and there diff --git a/sys/i386/isa/pcvt/pcvt_drv.c b/sys/i386/isa/pcvt/pcvt_drv.c index 03ad4fc..10e14b7 100644 --- a/sys/i386/isa/pcvt/pcvt_drv.c +++ b/sys/i386/isa/pcvt/pcvt_drv.c @@ -81,7 +81,7 @@ #define EXTERN /* allocate mem */ -#include "pcvt_hdr.h" /* global include */ +#include <i386/isa/pcvt/pcvt_hdr.h> /* global include */ #ifdef DEVFS #include <sys/devfsext.h> #if !defined(MAXCONS) diff --git a/sys/i386/isa/pcvt/pcvt_ext.c b/sys/i386/isa/pcvt/pcvt_ext.c index f0b96c3..e8a75bb 100644 --- a/sys/i386/isa/pcvt/pcvt_ext.c +++ b/sys/i386/isa/pcvt/pcvt_ext.c @@ -70,7 +70,7 @@ #include "vt.h" #if NVT > 0 -#include "pcvt_hdr.h" /* global include */ +#include <i386/isa/pcvt/pcvt_hdr.h> /* global include */ static int s3testwritable( void ); static int et4000_col( int ); diff --git a/sys/i386/isa/pcvt/pcvt_hdr.h b/sys/i386/isa/pcvt/pcvt_hdr.h index 65abdf7..a4353e7 100644 --- a/sys/i386/isa/pcvt/pcvt_hdr.h +++ b/sys/i386/isa/pcvt/pcvt_hdr.h @@ -104,7 +104,7 @@ #endif /* PCVT_FREEBSD >= 200 */ -#include "pcvt_conf.h" +#include <i386/isa/pcvt/pcvt_conf.h> #if PCVT_NETBSD > 9 #include "device.h" @@ -158,7 +158,7 @@ #endif #if PCVT_NETBSD > 9 -#include "i386/isa/pcvt/pcvt_ioctl.h" +#include <i386/isa/pcvt/pcvt_ioctl.h> #elif PCVT_FREEBSD >= 200 #include <machine/pcvt_ioctl.h> #else diff --git a/sys/i386/isa/pcvt/pcvt_kbd.c b/sys/i386/isa/pcvt/pcvt_kbd.c index 14f83d7..540544f 100644 --- a/sys/i386/isa/pcvt/pcvt_kbd.c +++ b/sys/i386/isa/pcvt/pcvt_kbd.c @@ -71,7 +71,7 @@ #if NVT > 0 -#include "pcvt_hdr.h" /* global include */ +#include <i386/isa/pcvt/pcvt_hdr.h> /* global include */ extern int kbd_response __P((void)); @@ -107,7 +107,7 @@ static u_short altkpval = 0; u_char rawkeybuf[80]; #endif -#include "pcvt_kbd.h" /* tables etc */ +#include <i386/isa/pcvt/pcvt_kbd.h> /* tables etc */ #if PCVT_SHOWKEYS /*---------------------------------------------------------------------------* diff --git a/sys/i386/isa/pcvt/pcvt_out.c b/sys/i386/isa/pcvt/pcvt_out.c index c3c20ef..d80a8bd 100644 --- a/sys/i386/isa/pcvt/pcvt_out.c +++ b/sys/i386/isa/pcvt/pcvt_out.c @@ -64,7 +64,7 @@ #define PCVT_INCLUDE_VT_SELATTR /* get inline function from pcvt_hdr.h */ -#include "pcvt_hdr.h" /* global include */ +#include <i386/isa/pcvt/pcvt_hdr.h> /* global include */ #include <vm/vm.h> #include <vm/vm_param.h> #include <vm/pmap.h> diff --git a/sys/i386/isa/pcvt/pcvt_sup.c b/sys/i386/isa/pcvt/pcvt_sup.c index d3e94be..3686e91 100644 --- a/sys/i386/isa/pcvt/pcvt_sup.c +++ b/sys/i386/isa/pcvt/pcvt_sup.c @@ -64,7 +64,7 @@ #include "vt.h" #if NVT > 0 -#include "pcvt_hdr.h" /* global include */ +#include <i386/isa/pcvt/pcvt_hdr.h> /* global include */ static void vid_cursor ( struct cursorshape *data ); static void vgasetfontattr ( struct vgafontattr *data ); diff --git a/sys/i386/isa/pcvt/pcvt_vtf.c b/sys/i386/isa/pcvt/pcvt_vtf.c index 6dddd5d..1b51eb4 100644 --- a/sys/i386/isa/pcvt/pcvt_vtf.c +++ b/sys/i386/isa/pcvt/pcvt_vtf.c @@ -62,8 +62,8 @@ #define PCVT_INCLUDE_VT_SELATTR /* get inline function from pcvt_hdr.h */ -#include "pcvt_hdr.h" /* global include */ -#include "pcvt_tbl.h" /* character set conversion tables */ +#include <i386/isa/pcvt/pcvt_hdr.h> /* global include */ +#include <i386/isa/pcvt/pcvt_tbl.h> /* character set conversion tables */ static void clear_dld ( struct video_state *svsp ); static void init_dld ( struct video_state *svsp ); diff --git a/sys/i386/isa/qcamio.c b/sys/i386/isa/qcamio.c index e8adc30..931c78d 100644 --- a/sys/i386/isa/qcamio.c +++ b/sys/i386/isa/qcamio.c @@ -80,8 +80,13 @@ #include "qcam.h" #endif +#ifdef __FreeBSD__ +#include <i386/isa/qcamreg.h> +#include <i386/isa/qcamdefs.h> +#else #include "qcamreg.h" #include "qcamdefs.h" +#endif /* * There should be _NO_ operating system dependant code or definitions diff --git a/sys/i386/isa/sound/ad1848.c b/sys/i386/isa/sound/ad1848.c index 024b62f..8c385bd 100644 --- a/sys/i386/isa/sound/ad1848.c +++ b/sys/i386/isa/sound/ad1848.c @@ -36,11 +36,11 @@ #define DEB(x) #define DEB1(x) -#include "sound_config.h" +#include <i386/isa/sound/sound_config.h> #if defined(CONFIGURE_SOUNDCARD) && !defined(EXCLUDE_AD1848) -#include "ad1848_mixer.h" +#include <i386/isa/sound/ad1848_mixer.h> #define IMODE_NONE 0 #define IMODE_OUTPUT 1 @@ -1356,7 +1356,7 @@ mozart_init (int io_base) #endif /* MOZART_PORT */ #ifdef OPTI_MAD16_PORT -#include "mad16.h" +#include <i386/isa/sound/mad16.h> #endif /* diff --git a/sys/i386/isa/sound/adlib_card.c b/sys/i386/isa/sound/adlib_card.c index 6365069..aabd837 100644 --- a/sys/i386/isa/sound/adlib_card.c +++ b/sys/i386/isa/sound/adlib_card.c @@ -27,7 +27,7 @@ * */ -#include "sound_config.h" +#include <i386/isa/sound/sound_config.h> #if defined(CONFIGURE_SOUNDCARD) && !defined(EXCLUDE_YM3812) diff --git a/sys/i386/isa/sound/aedsp16.c b/sys/i386/isa/sound/aedsp16.c index b14a246..a292d9e 100644 --- a/sys/i386/isa/sound/aedsp16.c +++ b/sys/i386/isa/sound/aedsp16.c @@ -225,7 +225,7 @@ * Include the main voxware header file. It include all the os/voxware/etc * headers needed by this source. */ -#include "sound_config.h" +#include <i386/isa/sound/sound_config.h> /* * all but ioport.h :) */ diff --git a/sys/i386/isa/sound/audio.c b/sys/i386/isa/sound/audio.c index 770babc..c6f7972 100644 --- a/sys/i386/isa/sound/audio.c +++ b/sys/i386/isa/sound/audio.c @@ -27,13 +27,13 @@ * */ -#include "sound_config.h" +#include <i386/isa/sound/sound_config.h> #ifdef CONFIGURE_SOUNDCARD #ifndef EXCLUDE_AUDIO -#include "ulaw.h" -#include "coproc.h" +#include <i386/isa/sound/ulaw.h> +#include <i386/isa/sound/coproc.h> #define ON 1 #define OFF 0 diff --git a/sys/i386/isa/sound/dev_table.c b/sys/i386/isa/sound/dev_table.c index bfd8e58..4902324 100644 --- a/sys/i386/isa/sound/dev_table.c +++ b/sys/i386/isa/sound/dev_table.c @@ -28,7 +28,7 @@ */ #define _DEV_TABLE_C_ -#include "sound_config.h" +#include <i386/isa/sound/sound_config.h> #ifdef CONFIGURE_SOUNDCARD diff --git a/sys/i386/isa/sound/dmabuf.c b/sys/i386/isa/sound/dmabuf.c index bb64d7d..20095d2 100644 --- a/sys/i386/isa/sound/dmabuf.c +++ b/sys/i386/isa/sound/dmabuf.c @@ -27,7 +27,7 @@ * */ -#include "sound_config.h" +#include <i386/isa/sound/sound_config.h> #ifdef CONFIGURE_SOUNDCARD diff --git a/sys/i386/isa/sound/gus_card.c b/sys/i386/isa/sound/gus_card.c index 4a07fd3..0e96df1 100644 --- a/sys/i386/isa/sound/gus_card.c +++ b/sys/i386/isa/sound/gus_card.c @@ -27,11 +27,11 @@ * */ -#include "sound_config.h" +#include <i386/isa/sound/sound_config.h> #if defined(CONFIGURE_SOUNDCARD) && !defined(EXCLUDE_GUS) -#include "gus_hw.h" +#include <i386/isa/sound/gus_hw.h> int gus_base, gus_irq, gus_dma; extern int gus_wave_volume; diff --git a/sys/i386/isa/sound/gus_midi.c b/sys/i386/isa/sound/gus_midi.c index 66c81df..876c665 100644 --- a/sys/i386/isa/sound/gus_midi.c +++ b/sys/i386/isa/sound/gus_midi.c @@ -27,11 +27,11 @@ * */ -#include "sound_config.h" +#include <i386/isa/sound/sound_config.h> #ifdef CONFIGURE_SOUNDCARD -#include "gus_hw.h" +#include <i386/isa/sound/gus_hw.h> #if !defined(EXCLUDE_GUS) && !defined(EXCLUDE_MIDI) @@ -225,7 +225,7 @@ gus_midi_buffer_status (int dev) #define MIDI_SYNTH_NAME "Gravis Ultrasound Midi" #define MIDI_SYNTH_CAPS SYNTH_CAP_INPUT -#include "midi_synth.h" +#include <i386/isa/sound/midi_synth.h> static struct midi_operations gus_midi_operations = { diff --git a/sys/i386/isa/sound/gus_vol.c b/sys/i386/isa/sound/gus_vol.c index 3e58dce..a8f1121 100644 --- a/sys/i386/isa/sound/gus_vol.c +++ b/sys/i386/isa/sound/gus_vol.c @@ -3,9 +3,9 @@ * * Greg Lee 1993. */ -#include "sound_config.h" +#include <i386/isa/sound/sound_config.h> #ifndef EXCLUDE_GUS -#include "gus_linearvol.h" +#include <i386/isa/sound/gus_linearvol.h> extern unsigned short gus_adagio_vol (int vel, int mainv, int xpn, int voicev); extern unsigned short gus_linear_vol (int vol, int mainvol); diff --git a/sys/i386/isa/sound/gus_wave.c b/sys/i386/isa/sound/gus_wave.c index fe88539..e0f946d6 100644 --- a/sys/i386/isa/sound/gus_wave.c +++ b/sys/i386/isa/sound/gus_wave.c @@ -27,9 +27,9 @@ * */ -#include "sound_config.h" +#include <i386/isa/sound/sound_config.h> #include <machine/ultrasound.h> -#include "gus_hw.h" +#include <i386/isa/sound/gus_hw.h> static unsigned char gus_look8 __P((int reg)); static unsigned short gus_read16 __P((int reg)); diff --git a/sys/i386/isa/sound/ics2101.c b/sys/i386/isa/sound/ics2101.c index 3a76ea9..cec1e51 100644 --- a/sys/i386/isa/sound/ics2101.c +++ b/sys/i386/isa/sound/ics2101.c @@ -27,11 +27,11 @@ * */ -#include "sound_config.h" +#include <i386/isa/sound/sound_config.h> #if defined(CONFIGURE_SOUNDCARD) && !defined(EXCLUDE_GUS) #include <machine/ultrasound.h> -#include "gus_hw.h" +#include <i386/isa/sound/gus_hw.h> #define MIX_DEVS (SOUND_MASK_MIC|SOUND_MASK_LINE| \ SOUND_MASK_SYNTH| \ diff --git a/sys/i386/isa/sound/local.h b/sys/i386/isa/sound/local.h index 4cf2b46..e80b780 100644 --- a/sys/i386/isa/sound/local.h +++ b/sys/i386/isa/sound/local.h @@ -57,7 +57,7 @@ # define GUSMAX_MIXER #endif -#include <sb.h> +#include "sb.h" #if NSB == 0 && !defined(EXCLUDE_SB) #define EXCLUDE_SB #endif @@ -72,7 +72,7 @@ #define EXCLUDE_SB16MIDI #endif -#include <pas.h> +#include "pas.h" #if NPAS == 0 && !defined(EXCLUDE_PAS) #define EXCLUDE_PAS #endif diff --git a/sys/i386/isa/sound/midi_synth.c b/sys/i386/isa/sound/midi_synth.c index e2a1c2c..fb1fdc4 100644 --- a/sys/i386/isa/sound/midi_synth.c +++ b/sys/i386/isa/sound/midi_synth.c @@ -30,7 +30,7 @@ #define USE_SEQ_MACROS #define USE_SIMPLE_MACROS -#include "sound_config.h" +#include <i386/isa/sound/sound_config.h> #if defined(CONFIGURE_SOUNDCARD) && !defined(EXCLUDE_MIDI) @@ -38,7 +38,7 @@ DEFINE_WAIT_QUEUE (sysex_sleeper, sysex_sleep_flag); -#include "midi_synth.h" +#include <i386/isa/sound/midi_synth.h> static int midi2synth[MAX_MIDI_DEV]; static unsigned char prev_out_status[MAX_MIDI_DEV]; diff --git a/sys/i386/isa/sound/midibuf.c b/sys/i386/isa/sound/midibuf.c index f1a5cf2..c05d440 100644 --- a/sys/i386/isa/sound/midibuf.c +++ b/sys/i386/isa/sound/midibuf.c @@ -27,7 +27,7 @@ * */ -#include "sound_config.h" +#include <i386/isa/sound/sound_config.h> static void drain_midi_queue __P((int dev)); diff --git a/sys/i386/isa/sound/mpu401.c b/sys/i386/isa/sound/mpu401.c index 7b1616d..eaee157 100644 --- a/sys/i386/isa/sound/mpu401.c +++ b/sys/i386/isa/sound/mpu401.c @@ -33,12 +33,12 @@ #define USE_SEQ_MACROS #define USE_SIMPLE_MACROS -#include "sound_config.h" +#include <i386/isa/sound/sound_config.h> #ifdef CONFIGURE_SOUNDCARD #if (!defined(EXCLUDE_MPU401) || !defined(EXCLUDE_MPU_EMU)) && !defined(EXCLUDE_MIDI) -#include "coproc.h" +#include <i386/isa/sound/coproc.h> static int init_sequence[20]; /* NOTE! pos 0 = len, start pos 1. */ static int timer_mode = TMR_INTERNAL, timer_caps = TMR_INTERNAL; @@ -937,7 +937,7 @@ mpu_synth_close (int dev) #define MIDI_SYNTH_NAME "MPU-401 UART Midi" #define MIDI_SYNTH_CAPS SYNTH_CAP_INPUT -#include "midi_synth.h" +#include <i386/isa/sound/midi_synth.h> static struct synth_operations mpu401_synth_proto = { diff --git a/sys/i386/isa/sound/opl3.c b/sys/i386/isa/sound/opl3.c index 4b0771a..b3660b7 100644 --- a/sys/i386/isa/sound/opl3.c +++ b/sys/i386/isa/sound/opl3.c @@ -34,11 +34,11 @@ * hooft@chem.ruu.nl */ -#include "sound_config.h" +#include <i386/isa/sound/sound_config.h> #if defined(CONFIGURE_SOUNDCARD) && !defined(EXCLUDE_YM3812) -#include "opl3.h" +#include <i386/isa/sound/opl3.h> #define MAX_VOICE 18 #define OFFS_4OP 11 /* diff --git a/sys/i386/isa/sound/pas2_card.c b/sys/i386/isa/sound/pas2_card.c index 3f72359..eeff8ae 100644 --- a/sys/i386/isa/sound/pas2_card.c +++ b/sys/i386/isa/sound/pas2_card.c @@ -28,12 +28,12 @@ * */ -#include "sound_config.h" +#include <i386/isa/sound/sound_config.h> #if defined(CONFIGURE_SOUNDCARD) && !defined(EXCLUDE_PAS) #define DEFINE_TRANSLATIONS -#include "pas.h" +#include <i386/isa/sound/pas.h> static int config_pas_hw __P((struct address_info *hw_config)); static int detect_pas_hw __P((struct address_info *hw_config)); diff --git a/sys/i386/isa/sound/pas2_midi.c b/sys/i386/isa/sound/pas2_midi.c index 6db884b..a83158e 100644 --- a/sys/i386/isa/sound/pas2_midi.c +++ b/sys/i386/isa/sound/pas2_midi.c @@ -27,11 +27,11 @@ * */ -#include "sound_config.h" +#include <i386/isa/sound/sound_config.h> #ifdef CONFIGURE_SOUNDCARD -#include "pas.h" +#include <i386/isa/sound/pas.h> #if !defined(EXCLUDE_PAS) && !defined(EXCLUDE_MIDI) && defined(EXCLUDE_PRO_MIDI) @@ -233,7 +233,7 @@ pas_buffer_status (int dev) #define MIDI_SYNTH_NAME "Pro Audio Spectrum Midi" #define MIDI_SYNTH_CAPS SYNTH_CAP_INPUT -#include "midi_synth.h" +#include <i386/isa/sound/midi_synth.h> static struct midi_operations pas_midi_operations = { diff --git a/sys/i386/isa/sound/pas2_mixer.c b/sys/i386/isa/sound/pas2_mixer.c index f6fd0b6..c1ba76b 100644 --- a/sys/i386/isa/sound/pas2_mixer.c +++ b/sys/i386/isa/sound/pas2_mixer.c @@ -29,11 +29,11 @@ * */ -#include "sound_config.h" +#include <i386/isa/sound/sound_config.h> #if defined(CONFIGURE_SOUNDCARD) && !defined(EXCLUDE_PAS) -#include "pas.h" +#include <i386/isa/sound/pas.h> extern void mix_write __P((unsigned char data, int ioaddr)); static int pas_mixer_ioctl __P((int dev, unsigned int cmd, unsigned int arg)); diff --git a/sys/i386/isa/sound/pas2_pcm.c b/sys/i386/isa/sound/pas2_pcm.c index 8a9c172..97ae76c 100644 --- a/sys/i386/isa/sound/pas2_pcm.c +++ b/sys/i386/isa/sound/pas2_pcm.c @@ -28,11 +28,11 @@ * */ -#include "sound_config.h" +#include <i386/isa/sound/sound_config.h> #ifdef CONFIGURE_SOUNDCARD -#include "pas.h" +#include <i386/isa/sound/pas.h> static int pcm_set_bits __P((int arg)); static int pcm_set_channels __P((int arg)); diff --git a/sys/i386/isa/sound/patmgr.c b/sys/i386/isa/sound/patmgr.c index fc201dd..f013984 100644 --- a/sys/i386/isa/sound/patmgr.c +++ b/sys/i386/isa/sound/patmgr.c @@ -28,7 +28,7 @@ */ #define PATMGR_C -#include "sound_config.h" +#include <i386/isa/sound/sound_config.h> #if defined(CONFIGURE_SOUNDCARD) && !defined(EXCLUDE_SEQUENCER) diff --git a/sys/i386/isa/sound/sb16_dsp.c b/sys/i386/isa/sound/sb16_dsp.c index d093efb..d5af2c1 100644 --- a/sys/i386/isa/sound/sb16_dsp.c +++ b/sys/i386/isa/sound/sb16_dsp.c @@ -34,9 +34,9 @@ /* * #define DEB_DMARES */ -#include "sound_config.h" -#include "sb.h" -#include "sb_mixer.h" +#include <i386/isa/sound/sound_config.h> +#include <i386/isa/sound/sb.h> +#include <i386/isa/sound/sb_mixer.h> #if defined(CONFIGURE_SOUNDCARD) && !defined(EXCLUDE_SB16) && !defined(EXCLUDE_SB) && !defined(EXCLUDE_AUDIO) && !defined(EXCLUDE_SBPRO) diff --git a/sys/i386/isa/sound/sb16_midi.c b/sys/i386/isa/sound/sb16_midi.c index fd53cbe..4e45e2e 100644 --- a/sys/i386/isa/sound/sb16_midi.c +++ b/sys/i386/isa/sound/sb16_midi.c @@ -27,13 +27,13 @@ * */ -#include "sound_config.h" +#include <i386/isa/sound/sound_config.h> #ifdef CONFIGURE_SOUNDCARD #if !defined(EXCLUDE_SB) && !defined(EXCLUDE_SB16) && !defined(EXCLUDE_MIDI) -#include "sb.h" +#include <i386/isa/sound/sb.h> #define DATAPORT (sb16midi_base) #define COMDPORT (sb16midi_base+1) @@ -176,7 +176,7 @@ sb16midi_buffer_status (int dev) #define MIDI_SYNTH_NAME "SoundBlaster 16 Midi" #define MIDI_SYNTH_CAPS SYNTH_CAP_INPUT -#include "midi_synth.h" +#include <i386/isa/sound/midi_synth.h> static struct midi_operations sb16midi_operations = { diff --git a/sys/i386/isa/sound/sb_card.c b/sys/i386/isa/sound/sb_card.c index b8e5af2..37455d1 100644 --- a/sys/i386/isa/sound/sb_card.c +++ b/sys/i386/isa/sound/sb_card.c @@ -30,7 +30,7 @@ * - Added the Audio Excel DSP 16 initialization routine. */ -#include "sound_config.h" +#include <i386/isa/sound/sound_config.h> #if defined(CONFIGURE_SOUNDCARD) && !defined(EXCLUDE_SB) diff --git a/sys/i386/isa/sound/sb_dsp.c b/sys/i386/isa/sound/sb_dsp.c index f5507e9..560fc79 100644 --- a/sys/i386/isa/sound/sb_dsp.c +++ b/sys/i386/isa/sound/sb_dsp.c @@ -33,12 +33,12 @@ * Code added for MV ProSonic/Jazz 16 in 16 bit mode */ -#include "sound_config.h" +#include <i386/isa/sound/sound_config.h> #if defined(CONFIGURE_SOUNDCARD) && !defined(EXCLUDE_SB) -#include "sb.h" -#include "sb_mixer.h" +#include <i386/isa/sound/sb.h> +#include <i386/isa/sound/sb_mixer.h> #undef SB_TEST_IRQ int sbc_base = 0; @@ -901,7 +901,7 @@ static int initialize_smw (void) { #ifdef SMW_MIDI0001_INCLUDED -#include "smw-midi0001.h" +#include <i386/isa/sound/smw-midi0001.h> #else unsigned char smw_ucode[1]; int smw_ucodeLen = 0; diff --git a/sys/i386/isa/sound/sb_midi.c b/sys/i386/isa/sound/sb_midi.c index f94f2c4..de661ac 100644 --- a/sys/i386/isa/sound/sb_midi.c +++ b/sys/i386/isa/sound/sb_midi.c @@ -27,11 +27,11 @@ * */ -#include "sound_config.h" +#include <i386/isa/sound/sound_config.h> #if defined(CONFIGURE_SOUNDCARD) && !defined(EXCLUDE_SB) && !defined(EXCLUDE_MIDI) -#include "sb.h" +#include <i386/isa/sound/sb.h> #undef SB_TEST_IRQ /* @@ -211,7 +211,7 @@ sb_midi_interrupt (int dummy) #define MIDI_SYNTH_NAME "SoundBlaster Midi" #define MIDI_SYNTH_CAPS 0 -#include "midi_synth.h" +#include <i386/isa/sound/midi_synth.h> static struct midi_operations sb_midi_operations = { diff --git a/sys/i386/isa/sound/sb_mixer.c b/sys/i386/isa/sound/sb_mixer.c index b96c24c..4fd2db2 100644 --- a/sys/i386/isa/sound/sb_mixer.c +++ b/sys/i386/isa/sound/sb_mixer.c @@ -32,13 +32,13 @@ * */ -#include "sound_config.h" +#include <i386/isa/sound/sound_config.h> #if defined(CONFIGURE_SOUNDCARD) && !defined(EXCLUDE_SB) && !defined(EXCLUDE_SBPRO) #define __SB_MIXER_C__ -#include "sb.h" -#include "sb_mixer.h" +#include <i386/isa/sound/sb.h> +#include <i386/isa/sound/sb_mixer.h> #undef SB_TEST_IRQ extern int sbc_base; diff --git a/sys/i386/isa/sound/sequencer.c b/sys/i386/isa/sound/sequencer.c index f6356f1..b49baed 100644 --- a/sys/i386/isa/sound/sequencer.c +++ b/sys/i386/isa/sound/sequencer.c @@ -28,8 +28,8 @@ */ #define SEQUENCER_C -#include "sound_config.h" -#include "midi_ctrl.h" +#include <i386/isa/sound/sound_config.h> +#include <i386/isa/sound/midi_ctrl.h> extern void seq_drain_midi_queues __P((void)); @@ -71,7 +71,7 @@ static unsigned long prev_input_time = 0; static int prev_event_time; static unsigned long seq_time = 0; -#include "tuning.h" +#include <i386/isa/sound/tuning.h> #define EV_SZ 8 #define IEV_SZ 8 diff --git a/sys/i386/isa/sound/sound_config.h b/sys/i386/isa/sound/sound_config.h index 17810b8..daafcbe 100644 --- a/sys/i386/isa/sound/sound_config.h +++ b/sys/i386/isa/sound/sound_config.h @@ -28,9 +28,9 @@ * */ -#include "local.h" -#include "os.h" -#include "soundvers.h" +#include <i386/isa/sound/local.h> +#include <i386/isa/sound/os.h> +#include <i386/isa/sound/soundvers.h> #if !defined(PSS_MPU_BASE) && defined(EXCLUDE_SSCAPE) && defined(EXCLUDE_TRIX) #define EXCLUDE_MPU_EMU @@ -334,8 +334,8 @@ struct channel_info { #define OPEN_WRITE 2 #define OPEN_READWRITE 3 -#include "sound_calls.h" -#include "dev_table.h" +#include <i386/isa/sound/sound_calls.h> +#include <i386/isa/sound/dev_table.h> #ifndef DEB #define DEB(x) diff --git a/sys/i386/isa/sound/sound_switch.c b/sys/i386/isa/sound/sound_switch.c index 2b9233f..21bcd69 100644 --- a/sys/i386/isa/sound/sound_switch.c +++ b/sys/i386/isa/sound/sound_switch.c @@ -27,7 +27,7 @@ * */ -#include "sound_config.h" +#include <i386/isa/sound/sound_config.h> #ifdef CONFIGURE_SOUNDCARD diff --git a/sys/i386/isa/sound/sound_timer.c b/sys/i386/isa/sound/sound_timer.c index e318779..8e4e002 100644 --- a/sys/i386/isa/sound/sound_timer.c +++ b/sys/i386/isa/sound/sound_timer.c @@ -29,7 +29,7 @@ */ #define SEQUENCER_C -#include "sound_config.h" +#include <i386/isa/sound/sound_config.h> #ifdef CONFIGURE_SOUNDCARD diff --git a/sys/i386/isa/sound/soundcard.c b/sys/i386/isa/sound/soundcard.c index 1747749..c7af8ab 100644 --- a/sys/i386/isa/sound/soundcard.c +++ b/sys/i386/isa/sound/soundcard.c @@ -26,16 +26,16 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: soundcard.c,v 1.41 1996/01/18 20:54:15 ache Exp $ + * $Id: soundcard.c,v 1.42 1996/03/28 14:31:13 scrappy Exp $ */ -#include "sound_config.h" +#include <i386/isa/sound/sound_config.h> #include <vm/vm.h> #include <vm/vm_extern.h> #ifdef CONFIGURE_SOUNDCARD -#include "dev_table.h" +#include <i386/isa/sound/dev_table.h> #include <i386/isa/isa_device.h> #include <sys/conf.h> #include <sys/kernel.h> diff --git a/sys/i386/isa/sound/sscape.c b/sys/i386/isa/sound/sscape.c index 9204b18..23d39ce 100644 --- a/sys/i386/isa/sound/sscape.c +++ b/sys/i386/isa/sound/sscape.c @@ -27,11 +27,11 @@ * */ -#include "sound_config.h" +#include <i386/isa/sound/sound_config.h> #if defined(CONFIGURE_SOUNDCARD) && !defined(EXCLUDE_SSCAPE) -#include "coproc.h" +#include <i386/isa/sound/coproc.h> /* * I/O ports diff --git a/sys/i386/isa/sound/sys_timer.c b/sys/i386/isa/sound/sys_timer.c index 6366c22..2c752f7 100644 --- a/sys/i386/isa/sound/sys_timer.c +++ b/sys/i386/isa/sound/sys_timer.c @@ -29,7 +29,7 @@ */ #define SEQUENCER_C -#include "sound_config.h" +#include <i386/isa/sound/sound_config.h> #ifdef CONFIGURE_SOUNDCARD diff --git a/sys/i386/isa/sound/trix.c b/sys/i386/isa/sound/trix.c index 6e3db0f..21ca20a 100644 --- a/sys/i386/isa/sound/trix.c +++ b/sys/i386/isa/sound/trix.c @@ -28,12 +28,12 @@ * */ -#include "sound_config.h" +#include <i386/isa/sound/sound_config.h> #if defined(CONFIGURE_SOUNDCARD) && !defined(EXCLUDE_TRIX) #ifdef INCLUDE_TRIX_BOOT -#include "trix_boot.h" +#include <i386/isa/sound/trix_boot.h> #endif static int kilroy_was_here = 0; /* Don't detect twice */ diff --git a/sys/i386/isa/sound/uart6850.c b/sys/i386/isa/sound/uart6850.c index ba5aac6..d925727 100644 --- a/sys/i386/isa/sound/uart6850.c +++ b/sys/i386/isa/sound/uart6850.c @@ -28,7 +28,7 @@ * */ -#include "sound_config.h" +#include <i386/isa/sound/sound_config.h> #ifdef CONFIGURE_SOUNDCARD @@ -236,7 +236,7 @@ uart6850_buffer_status (int dev) #define MIDI_SYNTH_NAME "6850 UART Midi" #define MIDI_SYNTH_CAPS SYNTH_CAP_INPUT -#include "midi_synth.h" +#include <i386/isa/sound/midi_synth.h> static struct midi_operations uart6850_operations = { diff --git a/sys/i386/isa/tw.c b/sys/i386/isa/tw.c index ace3a30..eafa9b5 100644 --- a/sys/i386/isa/tw.c +++ b/sys/i386/isa/tw.c @@ -128,16 +128,16 @@ * situation (most likely by retrying the transmission). */ -#include "param.h" -#include "systm.h" -#include "proc.h" -#include "conf.h" -#include "buf.h" -#include "kernel.h" -#include "ioctl.h" -#include "uio.h" -#include "syslog.h" -#include "select.h" +#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/ioctl.h> +#include <sys/uio.h> +#include <sys/syslog.h> +#include <sys/select.h> #ifdef DEVFS #include <sys/devfsext.h> #endif /*DEVFS*/ @@ -148,7 +148,7 @@ #include <sys/time.h> #endif /* HIRESTIME */ -#include "i386/isa/isa_device.h" +#include <i386/isa/isa_device.h> diff --git a/sys/isa/joy.c b/sys/isa/joy.c index 350d784..5f6ca2e 100644 --- a/sys/isa/joy.c +++ b/sys/isa/joy.c @@ -30,8 +30,7 @@ #if NJOY > 0 -#include <errno.h> - +#include <sys/errno.h> #include <sys/param.h> #include <sys/systm.h> #include <sys/conf.h> diff --git a/sys/kern/subr_trap.c b/sys/kern/subr_trap.c index 5ff8acd..c86e7fd 100644 --- a/sys/kern/subr_trap.c +++ b/sys/kern/subr_trap.c @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)trap.c 7.4 (Berkeley) 5/13/91 - * $Id: trap.c,v 1.81 1996/08/11 17:41:25 davidg Exp $ + * $Id: trap.c,v 1.82 1996/09/01 10:10:12 davidg Exp $ */ /* @@ -78,8 +78,8 @@ #include <machine/../isa/isa_device.h> #ifdef POWERFAIL_NMI -# include <syslog.h> -# include <machine/clock.h> +#include <sys/syslog.h> +#include <machine/clock.h> #endif #include "isa.h" diff --git a/sys/libkern/divdi3.c b/sys/libkern/divdi3.c index f6687f9..fcc5ad4 100644 --- a/sys/libkern/divdi3.c +++ b/sys/libkern/divdi3.c @@ -34,10 +34,10 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: divdi3.c,v 1.2 1994/08/02 07:43:54 davidg Exp $ */ -#include "quad.h" +#include <libkern/quad.h> /* * Divide two signed quads. diff --git a/sys/libkern/moddi3.c b/sys/libkern/moddi3.c index efb6f92..b56798c 100644 --- a/sys/libkern/moddi3.c +++ b/sys/libkern/moddi3.c @@ -34,10 +34,10 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: moddi3.c,v 1.2 1994/08/02 07:44:11 davidg Exp $ */ -#include "quad.h" +#include <libkern/quad.h> /* * Return remainder after dividing two signed quads. diff --git a/sys/libkern/qdivrem.c b/sys/libkern/qdivrem.c index a2a64c4..ec5ce9a 100644 --- a/sys/libkern/qdivrem.c +++ b/sys/libkern/qdivrem.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: qdivrem.c,v 1.2 1994/08/02 07:44:19 davidg Exp $ + * $Id: qdivrem.c,v 1.3 1995/05/30 08:06:42 rgrimes Exp $ */ /* @@ -42,7 +42,7 @@ * section 4.3.1, pp. 257--259. */ -#include "quad.h" +#include <libkern/quad.h> #define B (1 << HALF_BITS) /* digit base */ diff --git a/sys/libkern/udivdi3.c b/sys/libkern/udivdi3.c index f9a77ec..dc66480 100644 --- a/sys/libkern/udivdi3.c +++ b/sys/libkern/udivdi3.c @@ -34,10 +34,10 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: udivdi3.c,v 1.2 1994/08/02 07:44:44 davidg Exp $ */ -#include "quad.h" +#include <libkern/quad.h> /* * Divide two unsigned quads. diff --git a/sys/libkern/umoddi3.c b/sys/libkern/umoddi3.c index ccd457d..22992f9 100644 --- a/sys/libkern/umoddi3.c +++ b/sys/libkern/umoddi3.c @@ -34,10 +34,10 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: umoddi3.c,v 1.2 1994/08/02 07:44:46 davidg Exp $ */ -#include "quad.h" +#include <libkern/quad.h> /* * Return remainder after dividing two unsigned quads. diff --git a/sys/miscfs/devfs/devfs_tree.c b/sys/miscfs/devfs/devfs_tree.c index 354434d..c9aa5d7 100644 --- a/sys/miscfs/devfs/devfs_tree.c +++ b/sys/miscfs/devfs/devfs_tree.c @@ -2,22 +2,23 @@ /* * Written by Julian Elischer (julian@DIALix.oz.au) * - * $Header: /home/ncvs/src/sys/miscfs/devfs/devfs_tree.c,v 1.28 1996/08/13 07:21:44 julian Exp $ + * $Header: /home/ncvs/src/sys/miscfs/devfs/devfs_tree.c,v 1.29 1996/08/13 19:48:40 julian Exp $ */ -#include "param.h" -#include "systm.h" -#include "types.h" -#include "kernel.h" -#include "file.h" /* define FWRITE ... */ -#include "conf.h" -#include "stat.h" -#include "mount.h" -#include "vnode.h" -#include "malloc.h" -#include "dir.h" /* defines dirent structure */ -#include "devfsdefs.h" -#include "sys/devfsext.h" +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/types.h> +#include <sys/kernel.h> +#include <sys/file.h> /* define FWRITE ... */ +#include <sys/conf.h> +#include <sys/stat.h> +#include <sys/mount.h> +#include <sys/vnode.h> +#include <sys/malloc.h> +#include <sys/dir.h> /* defines dirent structure */ +#include <sys/devfsext.h> + +#include <miscfs/devfs/devfsdefs.h> SYSINIT(devfs, SI_SUB_DEVFS, SI_ORDER_FIRST, devfs_sinit, NULL) diff --git a/sys/miscfs/devfs/devfs_vfsops.c b/sys/miscfs/devfs/devfs_vfsops.c index 7103f96..b752e19 100644 --- a/sys/miscfs/devfs/devfs_vfsops.c +++ b/sys/miscfs/devfs/devfs_vfsops.c @@ -1,23 +1,25 @@ /* * Written by Julian Elischer (julian@DIALix.oz.au) * - * $Header: /home/ncvs/src/sys/miscfs/devfs/devfs_vfsops.c,v 1.12 1996/06/12 05:08:30 gpalmer Exp $ + * $Header: /home/ncvs/src/sys/miscfs/devfs/devfs_vfsops.c,v 1.13 1996/06/15 20:37:22 gpalmer Exp $ * * */ -#include "param.h" -#include "systm.h" -#include "namei.h" -#include "proc.h" -#include "kernel.h" -#include "vnode.h" -#include "miscfs/specfs/specdev.h" /* defines v_rdev */ -#include "mount.h" -#include "buf.h" -#include "file.h" -#include "malloc.h" -#include "devfsdefs.h" +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/namei.h> +#include <sys/proc.h> +#include <sys/kernel.h> +#include <sys/vnode.h> +#include <sys/mount.h> +#include <sys/buf.h> +#include <sys/file.h> +#include <sys/malloc.h> + +#include <miscfs/devfs/devfsdefs.h> + +#include <miscfs/specfs/specdev.h> /* defines v_rdev */ static int devfs_statfs( struct mount *mp, struct statfs *sbp, struct proc *p); static int mountdevfs( struct mount *mp, struct proc *p); diff --git a/sys/miscfs/devfs/devfs_vnops.c b/sys/miscfs/devfs/devfs_vnops.c index 8f457ac..d84b374 100644 --- a/sys/miscfs/devfs/devfs_vnops.c +++ b/sys/miscfs/devfs/devfs_vnops.c @@ -1,7 +1,7 @@ /* * Written by Julian Elischer (julian@DIALix.oz.au) * - * $Header: /home/ncvs/src/sys/miscfs/devfs/devfs_vnops.c,v 1.23 1996/08/13 19:48:41 julian Exp $ + * $Header: /home/ncvs/src/sys/miscfs/devfs/devfs_vnops.c,v 1.24 1996/09/03 14:22:02 bde Exp $ * * symlinks can wait 'til later. */ @@ -20,7 +20,7 @@ #include <miscfs/specfs/specdev.h>/* definitions of spec functions we use */ #include <sys/malloc.h> #include <sys/dir.h> /* defines dirent structure */ -#include "devfsdefs.h" +#include <miscfs/devfs/devfsdefs.h> /* * Insert description here diff --git a/sys/miscfs/devfs/devfsdefs.h b/sys/miscfs/devfs/devfsdefs.h index dc46ac4..f3b91ac 100644 --- a/sys/miscfs/devfs/devfsdefs.h +++ b/sys/miscfs/devfs/devfsdefs.h @@ -7,7 +7,7 @@ /* * Written by Julian Elischer (julian@DIALIX.oz.au) * - * $Header: /home/ncvs/src/sys/miscfs/devfs/devfsdefs.h,v 1.8 1995/11/09 08:16:48 bde Exp $ + * $Header: /home/ncvs/src/sys/miscfs/devfs/devfsdefs.h,v 1.9 1996/01/30 22:57:01 mpp Exp $ */ /* first a couple of defines for compatibility with inodes */ @@ -180,4 +180,4 @@ extern struct vnodeops spec_vnodeops,devfs_vnodeops; /* * Prototypes for DEVFS virtual filesystem operations */ -#include "devfs_proto.h" +#include <miscfs/devfs/devfs_proto.h> diff --git a/sys/netatalk/at_control.c b/sys/netatalk/at_control.c index 9297089..6c5e61c 100644 --- a/sys/netatalk/at_control.c +++ b/sys/netatalk/at_control.c @@ -19,10 +19,10 @@ #undef s_net #include <netinet/if_ether.h> -#include "at.h" -#include "at_var.h" -#include "aarp.h" -#include "phase2.h" +#include <netatalk/at.h> +#include <netatalk/at_var.h> +#include <netatalk/aarp.h> +#include <netatalk/phase2.h> #include <netatalk/at_extern.h> static int aa_dorangeroute(struct ifaddr *ifa, diff --git a/sys/netatalk/at_proto.c b/sys/netatalk/at_proto.c index 2c65e5b..d6179b6 100644 --- a/sys/netatalk/at_proto.c +++ b/sys/netatalk/at_proto.c @@ -35,10 +35,10 @@ #include <netinet/if_ether.h> #include <net/route.h> -#include "at.h" -#include "ddp.h" -#include "at_var.h" -#include "ddp_var.h" +#include <netatalk/at.h> +#include <netatalk/ddp.h> +#include <netatalk/at_var.h> +#include <netatalk/ddp_var.h> #include <netatalk/at_extern.h> diff --git a/sys/netatalk/ddp_input.c b/sys/netatalk/ddp_input.c index ca8c0f1..05f04dc 100644 --- a/sys/netatalk/ddp_input.c +++ b/sys/netatalk/ddp_input.c @@ -17,11 +17,11 @@ #include <netinet/in.h> #include <netinet/if_ether.h> -#include "at.h" -#include "at_var.h" -#include "endian.h" -#include "ddp.h" -#include "ddp_var.h" +#include <netatalk/at.h> +#include <netatalk/at_var.h> +#include <netatalk/endian.h> +#include <netatalk/ddp.h> +#include <netatalk/ddp_var.h> #include <netatalk/at_extern.h> int ddp_forward = 1; diff --git a/sys/netatalk/ddp_output.c b/sys/netatalk/ddp_output.c index be39935..c5df845 100644 --- a/sys/netatalk/ddp_output.c +++ b/sys/netatalk/ddp_output.c @@ -36,11 +36,11 @@ #undef s_net #include <netinet/if_ether.h> -#include "at.h" -#include "at_var.h" -#include "endian.h" -#include "ddp.h" -#include "ddp_var.h" +#include <netatalk/at.h> +#include <netatalk/at_var.h> +#include <netatalk/endian.h> +#include <netatalk/ddp.h> +#include <netatalk/ddp_var.h> #include <netatalk/at_extern.h> int ddp_cksum = 1; diff --git a/sys/netatalk/ddp_pcb.c b/sys/netatalk/ddp_pcb.c index a9886b8..7a89a94 100644 --- a/sys/netatalk/ddp_pcb.c +++ b/sys/netatalk/ddp_pcb.c @@ -18,11 +18,11 @@ #include <netinet/in.h> #include <netinet/if_ether.h> -#include "at.h" -#include "at_var.h" -#include "ddp_var.h" -#include "aarp.h" -#include "endian.h" +#include <netatalk/at.h> +#include <netatalk/at_var.h> +#include <netatalk/ddp_var.h> +#include <netatalk/aarp.h> +#include <netatalk/endian.h> #include <netatalk/at_extern.h> static void at_pcbdisconnect( struct ddpcb *ddp ); diff --git a/sys/netatalk/ddp_usrreq.c b/sys/netatalk/ddp_usrreq.c index a9886b8..7a89a94 100644 --- a/sys/netatalk/ddp_usrreq.c +++ b/sys/netatalk/ddp_usrreq.c @@ -18,11 +18,11 @@ #include <netinet/in.h> #include <netinet/if_ether.h> -#include "at.h" -#include "at_var.h" -#include "ddp_var.h" -#include "aarp.h" -#include "endian.h" +#include <netatalk/at.h> +#include <netatalk/at_var.h> +#include <netatalk/ddp_var.h> +#include <netatalk/aarp.h> +#include <netatalk/endian.h> #include <netatalk/at_extern.h> static void at_pcbdisconnect( struct ddpcb *ddp ); diff --git a/sys/pci/if_pdq.c b/sys/pci/if_pdq.c index e4092cd..619d22d 100644 --- a/sys/pci/if_pdq.c +++ b/sys/pci/if_pdq.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: if_pdq.c,v 1.16 1996/06/18 01:22:40 bde Exp $ + * $Id: if_pdq.c,v 1.17 1996/09/06 23:08:53 phk Exp $ * */ @@ -106,8 +106,8 @@ #endif #endif -#include "pdqreg.h" -#include "pdq_os.h" +#include <pci/pdqreg.h> +#include <pci/pdq_os.h> typedef struct { #ifdef __bsdi__ diff --git a/sys/pci/pdq.c b/sys/pci/pdq.c index d865bf1..ed5a649 100644 --- a/sys/pci/pdq.c +++ b/sys/pci/pdq.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: pdq.c,v 1.7 1996/01/24 20:01:27 wollman Exp $ + * $Id: pdq.c,v 1.8 1996/01/24 21:12:23 phk Exp $ * * Revision 1.8 1995/03/14 01:52:52 thomas * Update for new FreeBSD PCI Interrupt interface @@ -54,8 +54,8 @@ * have yet to be made. */ -#include "pdqreg.h" -#include "pdq_os.h" +#include <pci/pdqreg.h> +#include <pci/pdq_os.h> #define PDQ_ROUNDUP(n, x) (((n) + ((x) - 1)) & ~((x) - 1)) #define PDQ_CMD_RX_ALIGNMENT 16 diff --git a/sys/sys/user.h b/sys/sys/user.h index dec898d..0568450 100644 --- a/sys/sys/user.h +++ b/sys/sys/user.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)user.h 8.2 (Berkeley) 9/23/93 - * $Id: user.h,v 1.6 1995/10/29 09:51:47 phk Exp $ + * $Id: user.h,v 1.7 1995/12/09 05:10:55 peter Exp $ */ #ifndef _SYS_USER_H_ @@ -40,7 +40,7 @@ #include <machine/pcb.h> #ifndef KERNEL /* stuff that *used* to be included by user.h, or is now needed */ -#include <errno.h> +#include <sys/errno.h> #include <sys/time.h> #include <sys/resource.h> #include <sys/ucred.h> |
