diff options
| author | bde <bde@FreeBSD.org> | 1994-12-04 08:51:58 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 1994-12-04 08:51:58 +0000 |
| commit | 7e1c0b6246ed937cd20f60d43a352e42afb3e713 (patch) | |
| tree | 64186bc5598ceeb9afd1ff0d423ab226ac14cce9 /sys/i386/isa/cronyx.c | |
| parent | 4354fc94cd00b5579684f97aedd89d752050ae4e (diff) | |
| download | FreeBSD-src-7e1c0b6246ed937cd20f60d43a352e42afb3e713.zip FreeBSD-src-7e1c0b6246ed937cd20f60d43a352e42afb3e713.tar.gz | |
Fix bogus and broken include paths:
<string.h> isn't supposed to be used by the kernel.
cronix.h is <machine/cronix.h>, not "cronyx.h" (ambiguous) or
<sys/cronyx.h> (nonexistent; caused compile to fail).
cxreg.h is <i386/isa/cxreg.h>, not "cxreg.h".
<i386/isa/cpufunc.h> shouldn't be included directly; it is always
included by <sys/systm.h>.
<i386/include/*.h> is <machine/*.h>
<systm.h> is <sys/systm.h>.
<kernel.h> is <sys/kernel.h>.
<bpfilter.h> is "bpfilter.h". It really is in the current directory.
Diffstat (limited to 'sys/i386/isa/cronyx.c')
| -rw-r--r-- | sys/i386/isa/cronyx.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/sys/i386/isa/cronyx.c b/sys/i386/isa/cronyx.c index 4cee6b8..941daf9 100644 --- a/sys/i386/isa/cronyx.c +++ b/sys/i386/isa/cronyx.c @@ -13,8 +13,8 @@ * * Version 1.2, Mon Nov 28 16:12:18 MSK 1994 */ -#include <string.h> #if defined (MSDOS) || defined (__MSDOS__) +# include <string.h> # include <dos.h> # define inb(port) inportb(port) # define inw(port) inport(port) @@ -22,6 +22,8 @@ # define outw(port,w) outport(port,w) # define vtophys(a) (((unsigned long)(a)>>12 & 0xffff0) +\ ((unsigned)(a) & 0xffff)) +# include "cronyx.h" +# include "cxreg.h" #else # include <sys/param.h> # include <sys/socket.h> @@ -29,18 +31,15 @@ # include <vm/vm.h> # ifdef __FreeBSD__ # if __FreeBSD__ < 2 -# include <i386/include/pio.h> -# else -# include <i386/include/cpufunc.h> +# include <machine/pio.h> # endif # else -# include <i386/include/inline.h> +# include <machine/inline.h> # endif +# include <machine/cronyx.h> +# include <i386/isa/cxreg.h> #endif -#include "cronyx.h" -#include "cxreg.h" - #define DMA_MASK 0xd4 /* DMA mask register */ #define DMA_MASK_CLEAR 0x04 /* DMA clear mask */ #define DMA_MODE 0xd6 /* DMA mode register */ |
