d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix bogus and broken include paths:

Browse Source 
<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.
This commit is contained in:
Bruce Evans 1994-12-04 08:51:58 +00:00
parent 9cdd2c1f8c
commit 21e880de5d
3 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sys/i386/isa/cronyx.c
View File

@ -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 */

11
sys/i386/isa/cx.c
View File

@ -21,8 +21,8 @@
#if NCX > 0
#include <sys/param.h>
#include <systm.h>
#include <kernel.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/mbuf.h>
#include <sys/ioctl.h>
#include <sys/file.h>
@ -36,17 +36,16 @@
#ifdef __FreeBSD__
# if __FreeBSD__ < 2
# include <i386/include/pio.h>
# include <machine/pio.h>
# define RB_GETC(q) getc(q)
# else /* BSD 4.4 Lite */
# include <i386/include/cpufunc.h>
# include <sys/devconf.h>
# endif
# define oproc_func_t void(*)(struct tty*)
#endif
#ifdef __bsdi__
# include <sys/ttystats.h>
# include <i386/include/inline.h>
# include <machine/inline.h>
# define tsleep(tp,pri,msg,x) ((tp)->t_state |= TS_WOPEN,\
ttysleep (tp, (caddr_t)&tp->t_rawq, pri, msg, x))
# define oproc_func_t int(*)()
@ -60,7 +59,7 @@
# define TSA_OLOWAT(q) ((caddr_t)&(q)->t_out)
#endif
#include <sys/cronyx.h>
#include <machine/cronyx.h>
#include <i386/isa/cxreg.h>
#ifdef DEBUG

13
sys/i386/isa/if_cx.c
View File

@ -20,11 +20,11 @@
#include "cx.h"
#if NCX > 0
#include <bpfilter.h>
#include "bpfilter.h"
#include <sys/param.h>
#include <systm.h>
#include <kernel.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/mbuf.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
@ -42,9 +42,8 @@
#ifdef __FreeBSD__
# include <i386/isa/isa_device.h>
# if __FreeBSD__ < 2
# include <i386/include/pio.h>
# include <machine/pio.h>
# else
# include <i386/include/cpufunc.h>
# include <sys/devconf.h>
# endif
# define init_func_t void(*)(int)
@ -61,7 +60,7 @@
# include <sys/device.h>
# include <i386/isa/isavar.h>
# include <i386/isa/icu.h>
# include <i386/include/inline.h>
# include <machine/inline.h>
# include <net/if_slvar.h>
# include <net/if_p2p.h>
# define timeout_func_t void(*)()
@ -76,7 +75,7 @@ struct cxsoftc {
#endif
#include <net/if_sppp.h>
#include <sys/cronyx.h>
#include <machine/cronyx.h>
#include <i386/isa/cxreg.h>
#ifdef DEBUG