diff options
author | wollman <wollman@FreeBSD.org> | 1994-08-13 03:50:34 +0000 |
---|---|---|
committer | wollman <wollman@FreeBSD.org> | 1994-08-13 03:50:34 +0000 |
commit | 07e1c7f69db19a5ad89c222176423820048eccc7 (patch) | |
tree | 07eb9071a15263c4512c588b90a4dc8f336abc9f /sys/isa | |
parent | 0bd3f2acaeda2f9008a0871df619278c12e9e1fc (diff) | |
download | FreeBSD-src-07e1c7f69db19a5ad89c222176423820048eccc7.zip FreeBSD-src-07e1c7f69db19a5ad89c222176423820048eccc7.tar.gz |
Change all #includes to follow the current Berkeley style. Some of these
``changes'' are actually not changes at all, but CVS sometimes has trouble
telling the difference.
This also includes support for second-directory compiles. This is not
quite complete yet, as `config' doesn't yet do the right thing. You can
still make it work trivially, however, by doing the following:
rm /sys/compile
mkdir /usr/obj/sys/compile
ln -s M-. /sys/compile
cd /sys/i386/conf
config MYKERNEL
cd ../../compile/MYKERNEL
ln -s /sys @
rm machine
ln -s @/i386/include machine
make depend
make
Diffstat (limited to 'sys/isa')
-rw-r--r-- | sys/isa/atrtc.c | 22 | ||||
-rw-r--r-- | sys/isa/fd.c | 14 | ||||
-rw-r--r-- | sys/isa/fdreg.h | 4 | ||||
-rw-r--r-- | sys/isa/sio.c | 34 | ||||
-rw-r--r-- | sys/isa/syscons.c | 53 |
5 files changed, 64 insertions, 63 deletions
diff --git a/sys/isa/atrtc.c b/sys/isa/atrtc.c index b0ce0a7..cf0a7f6 100644 --- a/sys/isa/atrtc.c +++ b/sys/isa/atrtc.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/isa/fd.c b/sys/isa/fd.c index 259d451..518aa38 100644 --- a/sys/isa/fd.c +++ b/sys/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/isa/fdreg.h b/sys/isa/fdreg.h index 5deb02c..d0d69e2 100644 --- a/sys/isa/fdreg.h +++ b/sys/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/isa/sio.c b/sys/isa/sio.c index dd4ee55..de95e90 100644 --- a/sys/isa/sio.c +++ b/sys/isa/sio.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)com.c 7.5 (Berkeley) 5/16/91 - * $Id: sio.c,v 1.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/isa/syscons.c b/sys/isa/syscons.c index a2a931c..ce391cd 100644 --- a/sys/isa/syscons.c +++ b/sys/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 |