diff options
Diffstat (limited to 'sys')
89 files changed, 2285 insertions, 304 deletions
diff --git a/sys/dev/hea/eni.c b/sys/dev/hea/eni.c index 86f000c5aeba..7c762974ecab 100644 --- a/sys/dev/hea/eni.c +++ b/sys/dev/hea/eni.c @@ -35,7 +35,46 @@ * */ -#include <netatm/kern_include.h> +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/types.h> +#include <sys/errno.h> +#include <sys/malloc.h> +#include <sys/proc.h> +#include <sys/sockio.h> +#include <sys/time.h> +#include <sys/kernel.h> +#include <sys/conf.h> +#include <sys/domain.h> +#include <sys/protosw.h> +#include <sys/socket.h> +#include <sys/socketvar.h> +#include <sys/syslog.h> +#include <sys/eventhandler.h> +#include <machine/clock.h> +#include <vm/vm.h> +#include <vm/pmap.h> +#include <net/if.h> +#include <net/if_types.h> +#include <net/if_dl.h> +#include <net/netisr.h> +#include <net/route.h> +#include <netinet/in.h> +#include <netinet/in_var.h> +#include <netinet/if_ether.h> +#include <netatm/port.h> +#include <netatm/queue.h> +#include <netatm/atm.h> +#include <netatm/atm_sys.h> +#include <netatm/atm_sap.h> +#include <netatm/atm_cm.h> +#include <netatm/atm_if.h> +#include <netatm/atm_vc.h> +#include <netatm/atm_ioctl.h> +#include <netatm/atm_sigmgr.h> +#include <netatm/atm_stack.h> +#include <netatm/atm_pcb.h> +#include <netatm/atm_var.h> #include <dev/hea/eni_stats.h> #include <dev/hea/eni.h> diff --git a/sys/dev/hea/eni_buffer.c b/sys/dev/hea/eni_buffer.c index 1051dd499350..a6e4964e7ea5 100644 --- a/sys/dev/hea/eni_buffer.c +++ b/sys/dev/hea/eni_buffer.c @@ -35,7 +35,46 @@ * */ -#include <netatm/kern_include.h> +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/types.h> +#include <sys/errno.h> +#include <sys/malloc.h> +#include <sys/proc.h> +#include <sys/sockio.h> +#include <sys/time.h> +#include <sys/kernel.h> +#include <sys/conf.h> +#include <sys/domain.h> +#include <sys/protosw.h> +#include <sys/socket.h> +#include <sys/socketvar.h> +#include <sys/syslog.h> +#include <sys/eventhandler.h> +#include <machine/clock.h> +#include <vm/vm.h> +#include <vm/pmap.h> +#include <net/if.h> +#include <net/if_types.h> +#include <net/if_dl.h> +#include <net/netisr.h> +#include <net/route.h> +#include <netinet/in.h> +#include <netinet/in_var.h> +#include <netinet/if_ether.h> +#include <netatm/port.h> +#include <netatm/queue.h> +#include <netatm/atm.h> +#include <netatm/atm_sys.h> +#include <netatm/atm_sap.h> +#include <netatm/atm_cm.h> +#include <netatm/atm_if.h> +#include <netatm/atm_vc.h> +#include <netatm/atm_ioctl.h> +#include <netatm/atm_sigmgr.h> +#include <netatm/atm_stack.h> +#include <netatm/atm_pcb.h> +#include <netatm/atm_var.h> #include <dev/hea/eni_stats.h> #include <dev/hea/eni.h> diff --git a/sys/dev/hea/eni_globals.c b/sys/dev/hea/eni_globals.c index 684fdb1432e2..baefde502be7 100644 --- a/sys/dev/hea/eni_globals.c +++ b/sys/dev/hea/eni_globals.c @@ -35,7 +35,46 @@ * */ -#include <netatm/kern_include.h> +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/types.h> +#include <sys/errno.h> +#include <sys/malloc.h> +#include <sys/proc.h> +#include <sys/sockio.h> +#include <sys/time.h> +#include <sys/kernel.h> +#include <sys/conf.h> +#include <sys/domain.h> +#include <sys/protosw.h> +#include <sys/socket.h> +#include <sys/socketvar.h> +#include <sys/syslog.h> +#include <sys/eventhandler.h> +#include <machine/clock.h> +#include <vm/vm.h> +#include <vm/pmap.h> +#include <net/if.h> +#include <net/if_types.h> +#include <net/if_dl.h> +#include <net/netisr.h> +#include <net/route.h> +#include <netinet/in.h> +#include <netinet/in_var.h> +#include <netinet/if_ether.h> +#include <netatm/port.h> +#include <netatm/queue.h> +#include <netatm/atm.h> +#include <netatm/atm_sys.h> +#include <netatm/atm_sap.h> +#include <netatm/atm_cm.h> +#include <netatm/atm_if.h> +#include <netatm/atm_vc.h> +#include <netatm/atm_ioctl.h> +#include <netatm/atm_sigmgr.h> +#include <netatm/atm_stack.h> +#include <netatm/atm_pcb.h> +#include <netatm/atm_var.h> #include <dev/hea/eni_stats.h> #include <dev/hea/eni.h> diff --git a/sys/dev/hea/eni_if.c b/sys/dev/hea/eni_if.c index 08ce89a63ce2..887c019f33d1 100644 --- a/sys/dev/hea/eni_if.c +++ b/sys/dev/hea/eni_if.c @@ -35,7 +35,46 @@ * */ -#include <netatm/kern_include.h> +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/types.h> +#include <sys/errno.h> +#include <sys/malloc.h> +#include <sys/proc.h> +#include <sys/sockio.h> +#include <sys/time.h> +#include <sys/kernel.h> +#include <sys/conf.h> +#include <sys/domain.h> +#include <sys/protosw.h> +#include <sys/socket.h> +#include <sys/socketvar.h> +#include <sys/syslog.h> +#include <sys/eventhandler.h> +#include <machine/clock.h> +#include <vm/vm.h> +#include <vm/pmap.h> +#include <net/if.h> +#include <net/if_types.h> +#include <net/if_dl.h> +#include <net/netisr.h> +#include <net/route.h> +#include <netinet/in.h> +#include <netinet/in_var.h> +#include <netinet/if_ether.h> +#include <netatm/port.h> +#include <netatm/queue.h> +#include <netatm/atm.h> +#include <netatm/atm_sys.h> +#include <netatm/atm_sap.h> +#include <netatm/atm_cm.h> +#include <netatm/atm_if.h> +#include <netatm/atm_vc.h> +#include <netatm/atm_ioctl.h> +#include <netatm/atm_sigmgr.h> +#include <netatm/atm_stack.h> +#include <netatm/atm_pcb.h> +#include <netatm/atm_var.h> #include <dev/hea/eni_stats.h> #include <dev/hea/eni.h> diff --git a/sys/dev/hea/eni_init.c b/sys/dev/hea/eni_init.c index 996c0eccb9a1..4879bb25f869 100644 --- a/sys/dev/hea/eni_init.c +++ b/sys/dev/hea/eni_init.c @@ -35,7 +35,46 @@ * */ -#include <netatm/kern_include.h> +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/types.h> +#include <sys/errno.h> +#include <sys/malloc.h> +#include <sys/proc.h> +#include <sys/sockio.h> +#include <sys/time.h> +#include <sys/kernel.h> +#include <sys/conf.h> +#include <sys/domain.h> +#include <sys/protosw.h> +#include <sys/socket.h> +#include <sys/socketvar.h> +#include <sys/syslog.h> +#include <sys/eventhandler.h> +#include <machine/clock.h> +#include <vm/vm.h> +#include <vm/pmap.h> +#include <net/if.h> +#include <net/if_types.h> +#include <net/if_dl.h> +#include <net/netisr.h> +#include <net/route.h> +#include <netinet/in.h> +#include <netinet/in_var.h> +#include <netinet/if_ether.h> +#include <netatm/port.h> +#include <netatm/queue.h> +#include <netatm/atm.h> +#include <netatm/atm_sys.h> +#include <netatm/atm_sap.h> +#include <netatm/atm_cm.h> +#include <netatm/atm_if.h> +#include <netatm/atm_vc.h> +#include <netatm/atm_ioctl.h> +#include <netatm/atm_sigmgr.h> +#include <netatm/atm_stack.h> +#include <netatm/atm_pcb.h> +#include <netatm/atm_var.h> #include <dev/hea/eni_stats.h> #include <dev/hea/eni.h> diff --git a/sys/dev/hea/eni_intr.c b/sys/dev/hea/eni_intr.c index cbf7ef02eaa8..5d57140a70d4 100644 --- a/sys/dev/hea/eni_intr.c +++ b/sys/dev/hea/eni_intr.c @@ -35,7 +35,46 @@ * */ -#include <netatm/kern_include.h> +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/types.h> +#include <sys/errno.h> +#include <sys/malloc.h> +#include <sys/proc.h> +#include <sys/sockio.h> +#include <sys/time.h> +#include <sys/kernel.h> +#include <sys/conf.h> +#include <sys/domain.h> +#include <sys/protosw.h> +#include <sys/socket.h> +#include <sys/socketvar.h> +#include <sys/syslog.h> +#include <sys/eventhandler.h> +#include <machine/clock.h> +#include <vm/vm.h> +#include <vm/pmap.h> +#include <net/if.h> +#include <net/if_types.h> +#include <net/if_dl.h> +#include <net/netisr.h> +#include <net/route.h> +#include <netinet/in.h> +#include <netinet/in_var.h> +#include <netinet/if_ether.h> +#include <netatm/port.h> +#include <netatm/queue.h> +#include <netatm/atm.h> +#include <netatm/atm_sys.h> +#include <netatm/atm_sap.h> +#include <netatm/atm_cm.h> +#include <netatm/atm_if.h> +#include <netatm/atm_vc.h> +#include <netatm/atm_ioctl.h> +#include <netatm/atm_sigmgr.h> +#include <netatm/atm_stack.h> +#include <netatm/atm_pcb.h> +#include <netatm/atm_var.h> #include <dev/hea/eni_stats.h> #include <dev/hea/eni.h> diff --git a/sys/dev/hea/eni_receive.c b/sys/dev/hea/eni_receive.c index 2722233afd8a..6c8962bc17a6 100644 --- a/sys/dev/hea/eni_receive.c +++ b/sys/dev/hea/eni_receive.c @@ -35,7 +35,46 @@ * */ -#include <netatm/kern_include.h> +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/types.h> +#include <sys/errno.h> +#include <sys/malloc.h> +#include <sys/proc.h> +#include <sys/sockio.h> +#include <sys/time.h> +#include <sys/kernel.h> +#include <sys/conf.h> +#include <sys/domain.h> +#include <sys/protosw.h> +#include <sys/socket.h> +#include <sys/socketvar.h> +#include <sys/syslog.h> +#include <sys/eventhandler.h> +#include <machine/clock.h> +#include <vm/vm.h> +#include <vm/pmap.h> +#include <net/if.h> +#include <net/if_types.h> +#include <net/if_dl.h> +#include <net/netisr.h> +#include <net/route.h> +#include <netinet/in.h> +#include <netinet/in_var.h> +#include <netinet/if_ether.h> +#include <netatm/port.h> +#include <netatm/queue.h> +#include <netatm/atm.h> +#include <netatm/atm_sys.h> +#include <netatm/atm_sap.h> +#include <netatm/atm_cm.h> +#include <netatm/atm_if.h> +#include <netatm/atm_vc.h> +#include <netatm/atm_ioctl.h> +#include <netatm/atm_sigmgr.h> +#include <netatm/atm_stack.h> +#include <netatm/atm_pcb.h> +#include <netatm/atm_var.h> #include <dev/hea/eni_stats.h> #include <dev/hea/eni.h> diff --git a/sys/dev/hea/eni_transmit.c b/sys/dev/hea/eni_transmit.c index 2e2960ad3898..5e91211bfe41 100644 --- a/sys/dev/hea/eni_transmit.c +++ b/sys/dev/hea/eni_transmit.c @@ -36,7 +36,46 @@ */ -#include <netatm/kern_include.h> +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/types.h> +#include <sys/errno.h> +#include <sys/malloc.h> +#include <sys/proc.h> +#include <sys/sockio.h> +#include <sys/time.h> +#include <sys/kernel.h> +#include <sys/conf.h> +#include <sys/domain.h> +#include <sys/protosw.h> +#include <sys/socket.h> +#include <sys/socketvar.h> +#include <sys/syslog.h> +#include <sys/eventhandler.h> +#include <machine/clock.h> +#include <vm/vm.h> +#include <vm/pmap.h> +#include <net/if.h> +#include <net/if_types.h> +#include <net/if_dl.h> +#include <net/netisr.h> +#include <net/route.h> +#include <netinet/in.h> +#include <netinet/in_var.h> +#include <netinet/if_ether.h> +#include <netatm/port.h> +#include <netatm/queue.h> +#include <netatm/atm.h> +#include <netatm/atm_sys.h> +#include <netatm/atm_sap.h> +#include <netatm/atm_cm.h> +#include <netatm/atm_if.h> +#include <netatm/atm_vc.h> +#include <netatm/atm_ioctl.h> +#include <netatm/atm_sigmgr.h> +#include <netatm/atm_stack.h> +#include <netatm/atm_pcb.h> +#include <netatm/atm_var.h> #include <dev/hea/eni_stats.h> #include <dev/hea/eni.h> diff --git a/sys/dev/hea/eni_vcm.c b/sys/dev/hea/eni_vcm.c index d552ddf89a18..3331ef5b5950 100644 --- a/sys/dev/hea/eni_vcm.c +++ b/sys/dev/hea/eni_vcm.c @@ -36,7 +36,46 @@ */ -#include <netatm/kern_include.h> +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/types.h> +#include <sys/errno.h> +#include <sys/malloc.h> +#include <sys/proc.h> +#include <sys/sockio.h> +#include <sys/time.h> +#include <sys/kernel.h> +#include <sys/conf.h> +#include <sys/domain.h> +#include <sys/protosw.h> +#include <sys/socket.h> +#include <sys/socketvar.h> +#include <sys/syslog.h> +#include <sys/eventhandler.h> +#include <machine/clock.h> +#include <vm/vm.h> +#include <vm/pmap.h> +#include <net/if.h> +#include <net/if_types.h> +#include <net/if_dl.h> +#include <net/netisr.h> +#include <net/route.h> +#include <netinet/in.h> +#include <netinet/in_var.h> +#include <netinet/if_ether.h> +#include <netatm/port.h> +#include <netatm/queue.h> +#include <netatm/atm.h> +#include <netatm/atm_sys.h> +#include <netatm/atm_sap.h> +#include <netatm/atm_cm.h> +#include <netatm/atm_if.h> +#include <netatm/atm_vc.h> +#include <netatm/atm_ioctl.h> +#include <netatm/atm_sigmgr.h> +#include <netatm/atm_stack.h> +#include <netatm/atm_pcb.h> +#include <netatm/atm_var.h> #include <dev/hea/eni_stats.h> #include <dev/hea/eni.h> diff --git a/sys/dev/hfa/fore.h b/sys/dev/hfa/fore.h index 5b43cae5b818..16d6dd341146 100644 --- a/sys/dev/hfa/fore.h +++ b/sys/dev/hfa/fore.h @@ -68,7 +68,6 @@ #define BUF_DATA_ALIGN 4 /* Fore-required data alignment */ -#if defined(BSD) /* * Strategy 1 Small - mbuf * Strategy 1 Large - cluster mbuf @@ -80,7 +79,6 @@ */ #define SIZEOF_Buf_handle 16 /* XXX sizeof(Buf_handle) */ -#if BSD >= 199103 #undef m_ext typedef struct m_ext M_ext; #define m_ext M_dat.MH.MH_dat.MH_ext @@ -89,13 +87,6 @@ typedef struct m_ext M_ext; #define BUF1_SM_LEN (MHLEN) #define BUF1_LG_HOFF (sizeof(struct m_hdr) + sizeof(struct pkthdr) \ + sizeof(M_ext)) /* Buffer-to-handle offset */ -#else -#define BUF1_SM_HOFF (MMINOFF) /* Buffer-to-handle offset */ -#define BUF1_SM_HDR (MMINOFF) -#define BUF1_SM_LEN (MLEN) -#define BUF1_LG_HOFF (MMINOFF + 16) /* Buffer-to-handle offset */ -#endif - /* * BUF1_SM_DOFF - CP data offset into buffer data space * BUF1_SM_SIZE - Buffer size @@ -107,18 +98,8 @@ typedef struct m_ext M_ext; * #define BUF1_SM_SIZE MAX(BUF1_SM_LEN - BUF1_SM_DOFF, 64) * */ -#if ((BSD >= 199103) && defined(FORE_PCI)) #define BUF1_SM_DOFF ((BUF1_SM_HOFF + SIZEOF_Buf_handle) - BUF1_SM_HDR) #define BUF1_SM_SIZE (BUF1_SM_LEN - BUF1_SM_DOFF) -#endif -#if ((BSD < 199103) && defined(FORE_SBUS) && defined(sun4c)) -#define BUF1_SM_DOFF (BUF_DATA_ALIGN - BUF1_SM_HDR) -#define BUF1_SM_SIZE (BUF1_SM_LEN - BUF1_SM_DOFF) -#endif -#if ((BSD < 199103) && defined(FORE_SBUS) && defined(sun4m)) -#define BUF1_SM_DOFF (BUF_DATA_ALIGN - BUF1_SM_HDR) -#define BUF1_SM_SIZE (64) -#endif #define BUF1_SM_QUELEN 16 /* Entries in supply queue */ #define BUF1_SM_CPPOOL 256 /* Buffers in CP-resident pool */ @@ -130,6 +111,4 @@ typedef struct m_ext M_ext; #define BUF1_LG_CPPOOL 512 /* Buffers in CP-resident pool */ #define BUF1_LG_ENTSIZE 8 /* Buffers in each supply queue entry */ -#endif /* defined(BSD) */ - #endif /* _FORE_H */ diff --git a/sys/dev/hfa/fore_buffer.c b/sys/dev/hfa/fore_buffer.c index 2c22e4283d5a..dcf483ea8653 100644 --- a/sys/dev/hfa/fore_buffer.c +++ b/sys/dev/hfa/fore_buffer.c @@ -35,6 +35,53 @@ * */ +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/types.h> +#include <sys/errno.h> +#include <sys/malloc.h> +#include <sys/proc.h> +#include <sys/sockio.h> +#include <sys/time.h> +#include <sys/kernel.h> +#include <sys/conf.h> +#include <sys/domain.h> +#include <sys/protosw.h> +#include <sys/socket.h> +#include <sys/socketvar.h> +#include <sys/syslog.h> +#include <sys/eventhandler.h> +#include <machine/clock.h> +#include <vm/vm.h> +#include <vm/pmap.h> +#include <net/if.h> +#include <net/if_types.h> +#include <net/if_dl.h> +#include <net/netisr.h> +#include <net/route.h> +#include <netinet/in.h> +#include <netinet/in_var.h> +#include <netinet/if_ether.h> +#include <netatm/port.h> +#include <netatm/queue.h> +#include <netatm/atm.h> +#include <netatm/atm_sys.h> +#include <netatm/atm_sap.h> +#include <netatm/atm_cm.h> +#include <netatm/atm_if.h> +#include <netatm/atm_vc.h> +#include <netatm/atm_ioctl.h> +#include <netatm/atm_sigmgr.h> +#include <netatm/atm_stack.h> +#include <netatm/atm_pcb.h> +#include <netatm/atm_var.h> +#include <pci/pcireg.h> +#include <pci/pcivar.h> +#include <dev/hfa/fore.h> +#include <dev/hfa/fore_aali.h> +#include <dev/hfa/fore_slave.h> +#include <dev/hfa/fore_stats.h> +#include <dev/hfa/fore_var.h> #include <dev/hfa/fore_include.h> #ifndef lint diff --git a/sys/dev/hfa/fore_command.c b/sys/dev/hfa/fore_command.c index 75df3eca0e22..6ea8ac793d87 100644 --- a/sys/dev/hfa/fore_command.c +++ b/sys/dev/hfa/fore_command.c @@ -35,6 +35,53 @@ * */ +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/types.h> +#include <sys/errno.h> +#include <sys/malloc.h> +#include <sys/proc.h> +#include <sys/sockio.h> +#include <sys/time.h> +#include <sys/kernel.h> +#include <sys/conf.h> +#include <sys/domain.h> +#include <sys/protosw.h> +#include <sys/socket.h> +#include <sys/socketvar.h> +#include <sys/syslog.h> +#include <sys/eventhandler.h> +#include <machine/clock.h> +#include <vm/vm.h> +#include <vm/pmap.h> +#include <net/if.h> +#include <net/if_types.h> +#include <net/if_dl.h> +#include <net/netisr.h> +#include <net/route.h> +#include <netinet/in.h> +#include <netinet/in_var.h> +#include <netinet/if_ether.h> +#include <netatm/port.h> +#include <netatm/queue.h> +#include <netatm/atm.h> +#include <netatm/atm_sys.h> +#include <netatm/atm_sap.h> +#include <netatm/atm_cm.h> +#include <netatm/atm_if.h> +#include <netatm/atm_vc.h> +#include <netatm/atm_ioctl.h> +#include <netatm/atm_sigmgr.h> +#include <netatm/atm_stack.h> +#include <netatm/atm_pcb.h> +#include <netatm/atm_var.h> +#include <pci/pcireg.h> +#include <pci/pcivar.h> +#include <dev/hfa/fore.h> +#include <dev/hfa/fore_aali.h> +#include <dev/hfa/fore_slave.h> +#include <dev/hfa/fore_stats.h> +#include <dev/hfa/fore_var.h> #include <dev/hfa/fore_include.h> #ifndef lint diff --git a/sys/dev/hfa/fore_globals.c b/sys/dev/hfa/fore_globals.c index b2e14b4e5d9a..b4218684b023 100644 --- a/sys/dev/hfa/fore_globals.c +++ b/sys/dev/hfa/fore_globals.c @@ -35,6 +35,53 @@ * */ +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/types.h> +#include <sys/errno.h> +#include <sys/malloc.h> +#include <sys/proc.h> +#include <sys/sockio.h> +#include <sys/time.h> +#include <sys/kernel.h> +#include <sys/conf.h> +#include <sys/domain.h> +#include <sys/protosw.h> +#include <sys/socket.h> +#include <sys/socketvar.h> +#include <sys/syslog.h> +#include <sys/eventhandler.h> +#include <machine/clock.h> +#include <vm/vm.h> +#include <vm/pmap.h> +#include <net/if.h> +#include <net/if_types.h> +#include <net/if_dl.h> +#include <net/netisr.h> +#include <net/route.h> +#include <netinet/in.h> +#include <netinet/in_var.h> +#include <netinet/if_ether.h> +#include <netatm/port.h> +#include <netatm/queue.h> +#include <netatm/atm.h> +#include <netatm/atm_sys.h> +#include <netatm/atm_sap.h> +#include <netatm/atm_cm.h> +#include <netatm/atm_if.h> +#include <netatm/atm_vc.h> +#include <netatm/atm_ioctl.h> +#include <netatm/atm_sigmgr.h> +#include <netatm/atm_stack.h> +#include <netatm/atm_pcb.h> +#include <netatm/atm_var.h> +#include <pci/pcireg.h> +#include <pci/pcivar.h> +#include <dev/hfa/fore.h> +#include <dev/hfa/fore_aali.h> +#include <dev/hfa/fore_slave.h> +#include <dev/hfa/fore_stats.h> +#include <dev/hfa/fore_var.h> #include <dev/hfa/fore_include.h> #ifndef lint diff --git a/sys/dev/hfa/fore_if.c b/sys/dev/hfa/fore_if.c index 930e0f9f0ec9..273a4194aa2c 100644 --- a/sys/dev/hfa/fore_if.c +++ b/sys/dev/hfa/fore_if.c @@ -35,6 +35,53 @@ * */ +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/types.h> +#include <sys/errno.h> +#include <sys/malloc.h> +#include <sys/proc.h> +#include <sys/sockio.h> +#include <sys/time.h> +#include <sys/kernel.h> +#include <sys/conf.h> +#include <sys/domain.h> +#include <sys/protosw.h> +#include <sys/socket.h> +#include <sys/socketvar.h> +#include <sys/syslog.h> +#include <sys/eventhandler.h> +#include <machine/clock.h> +#include <vm/vm.h> +#include <vm/pmap.h> +#include <net/if.h> +#include <net/if_types.h> +#include <net/if_dl.h> +#include <net/netisr.h> +#include <net/route.h> +#include <netinet/in.h> +#include <netinet/in_var.h> +#include <netinet/if_ether.h> +#include <netatm/port.h> +#include <netatm/queue.h> +#include <netatm/atm.h> +#include <netatm/atm_sys.h> +#include <netatm/atm_sap.h> +#include <netatm/atm_cm.h> +#include <netatm/atm_if.h> +#include <netatm/atm_vc.h> +#include <netatm/atm_ioctl.h> +#include <netatm/atm_sigmgr.h> +#include <netatm/atm_stack.h> +#include <netatm/atm_pcb.h> +#include <netatm/atm_var.h> +#include <pci/pcireg.h> +#include <pci/pcivar.h> +#include <dev/hfa/fore.h> +#include <dev/hfa/fore_aali.h> +#include <dev/hfa/fore_slave.h> +#include <dev/hfa/fore_stats.h> +#include <dev/hfa/fore_var.h> #include <dev/hfa/fore_include.h> #ifndef lint diff --git a/sys/dev/hfa/fore_include.h b/sys/dev/hfa/fore_include.h index ef455d58971f..a1b63913d16a 100644 --- a/sys/dev/hfa/fore_include.h +++ b/sys/dev/hfa/fore_include.h @@ -38,28 +38,6 @@ #ifndef _FORE_INCLUDE_H #define _FORE_INCLUDE_H -#include <netatm/kern_include.h> - -/* - * If not specified elsewhere, guess which type of bus support we want - */ -#if !(defined(FORE_PCI) || defined(FORE_SBUS)) -#if defined(sparc) -#define FORE_SBUS -#elif defined(__i386__) -#define FORE_PCI -#endif -#endif - -#include <pci/pcireg.h> -#include <pci/pcivar.h> - -#include <dev/hfa/fore.h> -#include <dev/hfa/fore_aali.h> -#include <dev/hfa/fore_slave.h> -#include <dev/hfa/fore_stats.h> -#include <dev/hfa/fore_var.h> - /* * Global function declarations */ @@ -84,14 +62,7 @@ void fore_initialize __P((Fore_unit *)); void fore_initialize_complete __P((Fore_unit *)); /* fore_intr.c */ -#if defined(sun) -int fore_poll __P((void)); -#endif -#if (defined(BSD) && (BSD <= 199306)) -int fore_intr __P((void *)); -#else void fore_intr __P((void *)); -#endif void fore_watchdog __P((Fore_unit *)); /* fore_load.c */ diff --git a/sys/dev/hfa/fore_init.c b/sys/dev/hfa/fore_init.c index 5ec21045add1..f4c8020ab0d4 100644 --- a/sys/dev/hfa/fore_init.c +++ b/sys/dev/hfa/fore_init.c @@ -35,6 +35,53 @@ * */ +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/types.h> +#include <sys/errno.h> +#include <sys/malloc.h> +#include <sys/proc.h> +#include <sys/sockio.h> +#include <sys/time.h> +#include <sys/kernel.h> +#include <sys/conf.h> +#include <sys/domain.h> +#include <sys/protosw.h> +#include <sys/socket.h> +#include <sys/socketvar.h> +#include <sys/syslog.h> +#include <sys/eventhandler.h> +#include <machine/clock.h> +#include <vm/vm.h> +#include <vm/pmap.h> +#include <net/if.h> +#include <net/if_types.h> +#include <net/if_dl.h> +#include <net/netisr.h> +#include <net/route.h> +#include <netinet/in.h> +#include <netinet/in_var.h> +#include <netinet/if_ether.h> +#include <netatm/port.h> +#include <netatm/queue.h> +#include <netatm/atm.h> +#include <netatm/atm_sys.h> +#include <netatm/atm_sap.h> +#include <netatm/atm_cm.h> +#include <netatm/atm_if.h> +#include <netatm/atm_vc.h> +#include <netatm/atm_ioctl.h> +#include <netatm/atm_sigmgr.h> +#include <netatm/atm_stack.h> +#include <netatm/atm_pcb.h> +#include <netatm/atm_var.h> +#include <pci/pcireg.h> +#include <pci/pcivar.h> +#include <dev/hfa/fore.h> +#include <dev/hfa/fore_aali.h> +#include <dev/hfa/fore_slave.h> +#include <dev/hfa/fore_stats.h> +#include <dev/hfa/fore_var.h> #include <dev/hfa/fore_include.h> #ifndef lint diff --git a/sys/dev/hfa/fore_intr.c b/sys/dev/hfa/fore_intr.c index 65eb14f5818f..fb604d7f7678 100644 --- a/sys/dev/hfa/fore_intr.c +++ b/sys/dev/hfa/fore_intr.c @@ -35,6 +35,53 @@ * */ +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/types.h> +#include <sys/errno.h> +#include <sys/malloc.h> +#include <sys/proc.h> +#include <sys/sockio.h> +#include <sys/time.h> +#include <sys/kernel.h> +#include <sys/conf.h> +#include <sys/domain.h> +#include <sys/protosw.h> +#include <sys/socket.h> +#include <sys/socketvar.h> +#include <sys/syslog.h> +#include <sys/eventhandler.h> +#include <machine/clock.h> +#include <vm/vm.h> +#include <vm/pmap.h> +#include <net/if.h> +#include <net/if_types.h> +#include <net/if_dl.h> +#include <net/netisr.h> +#include <net/route.h> +#include <netinet/in.h> +#include <netinet/in_var.h> +#include <netinet/if_ether.h> +#include <netatm/port.h> +#include <netatm/queue.h> +#include <netatm/atm.h> +#include <netatm/atm_sys.h> +#include <netatm/atm_sap.h> +#include <netatm/atm_cm.h> +#include <netatm/atm_if.h> +#include <netatm/atm_vc.h> +#include <netatm/atm_ioctl.h> +#include <netatm/atm_sigmgr.h> +#include <netatm/atm_stack.h> +#include <netatm/atm_pcb.h> +#include <netatm/atm_var.h> +#include <pci/pcireg.h> +#include <pci/pcivar.h> +#include <dev/hfa/fore.h> +#include <dev/hfa/fore_aali.h> +#include <dev/hfa/fore_slave.h> +#include <dev/hfa/fore_stats.h> +#include <dev/hfa/fore_var.h> #include <dev/hfa/fore_include.h> #ifndef lint diff --git a/sys/dev/hfa/fore_load.c b/sys/dev/hfa/fore_load.c index 15908919c1fc..79b867fd2f6c 100644 --- a/sys/dev/hfa/fore_load.c +++ b/sys/dev/hfa/fore_load.c @@ -35,6 +35,53 @@ * */ +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/types.h> +#include <sys/errno.h> +#include <sys/malloc.h> +#include <sys/proc.h> +#include <sys/sockio.h> +#include <sys/time.h> +#include <sys/kernel.h> +#include <sys/conf.h> +#include <sys/domain.h> +#include <sys/protosw.h> +#include <sys/socket.h> +#include <sys/socketvar.h> +#include <sys/syslog.h> +#include <sys/eventhandler.h> +#include <machine/clock.h> +#include <vm/vm.h> +#include <vm/pmap.h> +#include <net/if.h> +#include <net/if_types.h> +#include <net/if_dl.h> +#include <net/netisr.h> +#include <net/route.h> +#include <netinet/in.h> +#include <netinet/in_var.h> +#include <netinet/if_ether.h> +#include <netatm/port.h> +#include <netatm/queue.h> +#include <netatm/atm.h> +#include <netatm/atm_sys.h> +#include <netatm/atm_sap.h> +#include <netatm/atm_cm.h> +#include <netatm/atm_if.h> +#include <netatm/atm_vc.h> +#include <netatm/atm_ioctl.h> +#include <netatm/atm_sigmgr.h> +#include <netatm/atm_stack.h> +#include <netatm/atm_pcb.h> +#include <netatm/atm_var.h> +#include <pci/pcireg.h> +#include <pci/pcivar.h> +#include <dev/hfa/fore.h> +#include <dev/hfa/fore_aali.h> +#include <dev/hfa/fore_slave.h> +#include <dev/hfa/fore_stats.h> +#include <dev/hfa/fore_var.h> #include <dev/hfa/fore_include.h> #ifndef lint @@ -48,11 +95,7 @@ __RCSID("@(#) $FreeBSD$"); static int fore_start __P((void)); static const char * fore_pci_probe __P((pcici_t, pcidi_t)); static void fore_pci_attach __P((pcici_t, int)); -#if BSD < 199506 -static int fore_pci_shutdown __P((struct kern_devconf *, int)); -#else static void fore_pci_shutdown __P((void *, int)); -#endif static void fore_unattach __P((Fore_unit *)); static void fore_reset __P((Fore_unit *)); @@ -73,11 +116,7 @@ static struct pci_device fore_pci_device = { fore_pci_probe, fore_pci_attach, &fore_pci_count, -#if BSD < 199506 - fore_pci_shutdown -#else NULL -#endif }; COMPAT_PCI_DRIVER(fore_pci, fore_pci_device); @@ -353,13 +392,11 @@ fore_pci_attach(config_id, unit) fore_units[unit] = fup; fore_nunits++; -#if BSD >= 199506 /* * Add hook to our shutdown function */ EVENTHANDLER_REGISTER(shutdown_post_sync, fore_pci_shutdown, fup, SHUTDOWN_PRI_DEFAULT); -#endif /* * Initialize the CP microcode program. @@ -384,38 +421,6 @@ failed: return; } - -#if BSD < 199506 -/* - * Device shutdown routine - * - * Arguments: - * kdc pointer to device's configuration table - * force forced shutdown flag - * - * Returns: - * none - * - */ -static int -fore_pci_shutdown(kdc, force) - struct kern_devconf *kdc; - int force; -{ - Fore_unit *fup; - - if (kdc->kdc_unit < fore_nunits) { - - fup = fore_units[kdc->kdc_unit]; - if (fup != NULL) { - fore_reset(fup); - } - } - - (void) dev_detach(kdc); - return (0); -} -#else /* * Device shutdown routine * @@ -437,8 +442,6 @@ fore_pci_shutdown(fup, howto) return; } -#endif /* BSD < 199506 */ - /* * Device unattach routine @@ -573,11 +576,7 @@ static struct cdevsw fore_cdev = { /* * Loadable device driver module description */ -#if BSD < 199506 -MOD_DEV("fore_mod", LM_DT_CHAR, -1, (void *)&fore_cdev); -#else MOD_DEV(fore, LM_DT_CHAR, -1, (void *)&fore_cdev); -#endif /* @@ -653,11 +652,7 @@ fore_mod(lkmtp, cmd, ver) int cmd; int ver; { -#if BSD < 199506 - DISPATCH(lkmtp, cmd, ver, fore_load, fore_unload, nosys); -#else DISPATCH(lkmtp, cmd, ver, fore_load, fore_unload, lkm_nullcmd); -#endif } #endif /* notdef */ diff --git a/sys/dev/hfa/fore_output.c b/sys/dev/hfa/fore_output.c index b0b54362a046..7ef937d68778 100644 --- a/sys/dev/hfa/fore_output.c +++ b/sys/dev/hfa/fore_output.c @@ -35,6 +35,53 @@ * */ +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/types.h> +#include <sys/errno.h> +#include <sys/malloc.h> +#include <sys/proc.h> +#include <sys/sockio.h> +#include <sys/time.h> +#include <sys/kernel.h> +#include <sys/conf.h> +#include <sys/domain.h> +#include <sys/protosw.h> +#include <sys/socket.h> +#include <sys/socketvar.h> +#include <sys/syslog.h> +#include <sys/eventhandler.h> +#include <machine/clock.h> +#include <vm/vm.h> +#include <vm/pmap.h> +#include <net/if.h> +#include <net/if_types.h> +#include <net/if_dl.h> +#include <net/netisr.h> +#include <net/route.h> +#include <netinet/in.h> +#include <netinet/in_var.h> +#include <netinet/if_ether.h> +#include <netatm/port.h> +#include <netatm/queue.h> +#include <netatm/atm.h> +#include <netatm/atm_sys.h> +#include <netatm/atm_sap.h> +#include <netatm/atm_cm.h> +#include <netatm/atm_if.h> +#include <netatm/atm_vc.h> +#include <netatm/atm_ioctl.h> +#include <netatm/atm_sigmgr.h> +#include <netatm/atm_stack.h> +#include <netatm/atm_pcb.h> +#include <netatm/atm_var.h> +#include <pci/pcireg.h> +#include <pci/pcivar.h> +#include <dev/hfa/fore.h> +#include <dev/hfa/fore_aali.h> +#include <dev/hfa/fore_slave.h> +#include <dev/hfa/fore_stats.h> +#include <dev/hfa/fore_var.h> #include <dev/hfa/fore_include.h> #ifndef lint diff --git a/sys/dev/hfa/fore_receive.c b/sys/dev/hfa/fore_receive.c index be07791aae6e..880acb74ef4e 100644 --- a/sys/dev/hfa/fore_receive.c +++ b/sys/dev/hfa/fore_receive.c @@ -35,6 +35,53 @@ * */ +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/types.h> +#include <sys/errno.h> +#include <sys/malloc.h> +#include <sys/proc.h> +#include <sys/sockio.h> +#include <sys/time.h> +#include <sys/kernel.h> +#include <sys/conf.h> +#include <sys/domain.h> +#include <sys/protosw.h> +#include <sys/socket.h> +#include <sys/socketvar.h> +#include <sys/syslog.h> +#include <sys/eventhandler.h> +#include <machine/clock.h> +#include <vm/vm.h> +#include <vm/pmap.h> +#include <net/if.h> +#include <net/if_types.h> +#include <net/if_dl.h> +#include <net/netisr.h> +#include <net/route.h> +#include <netinet/in.h> +#include <netinet/in_var.h> +#include <netinet/if_ether.h> +#include <netatm/port.h> +#include <netatm/queue.h> +#include <netatm/atm.h> +#include <netatm/atm_sys.h> +#include <netatm/atm_sap.h> +#include <netatm/atm_cm.h> +#include <netatm/atm_if.h> +#include <netatm/atm_vc.h> +#include <netatm/atm_ioctl.h> +#include <netatm/atm_sigmgr.h> +#include <netatm/atm_stack.h> +#include <netatm/atm_pcb.h> +#include <netatm/atm_var.h> +#include <pci/pcireg.h> +#include <pci/pcivar.h> +#include <dev/hfa/fore.h> +#include <dev/hfa/fore_aali.h> +#include <dev/hfa/fore_slave.h> +#include <dev/hfa/fore_stats.h> +#include <dev/hfa/fore_var.h> #include <dev/hfa/fore_include.h> #ifndef lint diff --git a/sys/dev/hfa/fore_stats.c b/sys/dev/hfa/fore_stats.c index a01c5e50f6a7..bae07fff05ff 100644 --- a/sys/dev/hfa/fore_stats.c +++ b/sys/dev/hfa/fore_stats.c @@ -35,6 +35,53 @@ * */ +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/types.h> +#include <sys/errno.h> +#include <sys/malloc.h> +#include <sys/proc.h> +#include <sys/sockio.h> +#include <sys/time.h> +#include <sys/kernel.h> +#include <sys/conf.h> +#include <sys/domain.h> +#include <sys/protosw.h> +#include <sys/socket.h> +#include <sys/socketvar.h> +#include <sys/syslog.h> +#include <sys/eventhandler.h> +#include <machine/clock.h> +#include <vm/vm.h> +#include <vm/pmap.h> +#include <net/if.h> +#include <net/if_types.h> +#include <net/if_dl.h> +#include <net/netisr.h> +#include <net/route.h> +#include <netinet/in.h> +#include <netinet/in_var.h> +#include <netinet/if_ether.h> +#include <netatm/port.h> +#include <netatm/queue.h> +#include <netatm/atm.h> +#include <netatm/atm_sys.h> +#include <netatm/atm_sap.h> +#include <netatm/atm_cm.h> +#include <netatm/atm_if.h> +#include <netatm/atm_vc.h> +#include <netatm/atm_ioctl.h> +#include <netatm/atm_sigmgr.h> +#include <netatm/atm_stack.h> +#include <netatm/atm_pcb.h> +#include <netatm/atm_var.h> +#include <pci/pcireg.h> +#include <pci/pcivar.h> +#include <dev/hfa/fore.h> +#include <dev/hfa/fore_aali.h> +#include <dev/hfa/fore_slave.h> +#include <dev/hfa/fore_stats.h> +#include <dev/hfa/fore_var.h> #include <dev/hfa/fore_include.h> #ifndef lint diff --git a/sys/dev/hfa/fore_timer.c b/sys/dev/hfa/fore_timer.c index df5cff86b42a..c18158d626c4 100644 --- a/sys/dev/hfa/fore_timer.c +++ b/sys/dev/hfa/fore_timer.c @@ -35,6 +35,53 @@ * */ +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/types.h> +#include <sys/errno.h> +#include <sys/malloc.h> +#include <sys/proc.h> +#include <sys/sockio.h> +#include <sys/time.h> +#include <sys/kernel.h> +#include <sys/conf.h> +#include <sys/domain.h> +#include <sys/protosw.h> +#include <sys/socket.h> +#include <sys/socketvar.h> +#include <sys/syslog.h> +#include <sys/eventhandler.h> +#include <machine/clock.h> +#include <vm/vm.h> +#include <vm/pmap.h> +#include <net/if.h> +#include <net/if_types.h> +#include <net/if_dl.h> +#include <net/netisr.h> +#include <net/route.h> +#include <netinet/in.h> +#include <netinet/in_var.h> +#include <netinet/if_ether.h> +#include <netatm/port.h> +#include <netatm/queue.h> +#include <netatm/atm.h> +#include <netatm/atm_sys.h> +#include <netatm/atm_sap.h> +#include <netatm/atm_cm.h> +#include <netatm/atm_if.h> +#include <netatm/atm_vc.h> +#include <netatm/atm_ioctl.h> +#include <netatm/atm_sigmgr.h> +#include <netatm/atm_stack.h> +#include <netatm/atm_pcb.h> +#include <netatm/atm_var.h> +#include <pci/pcireg.h> +#include <pci/pcivar.h> +#include <dev/hfa/fore.h> +#include <dev/hfa/fore_aali.h> +#include <dev/hfa/fore_slave.h> +#include <dev/hfa/fore_stats.h> +#include <dev/hfa/fore_var.h> #include <dev/hfa/fore_include.h> #ifndef lint diff --git a/sys/dev/hfa/fore_transmit.c b/sys/dev/hfa/fore_transmit.c index 45445d420313..c345f2d036ab 100644 --- a/sys/dev/hfa/fore_transmit.c +++ b/sys/dev/hfa/fore_transmit.c @@ -35,6 +35,53 @@ * */ +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/types.h> +#include <sys/errno.h> +#include <sys/malloc.h> +#include <sys/proc.h> +#include <sys/sockio.h> +#include <sys/time.h> +#include <sys/kernel.h> +#include <sys/conf.h> +#include <sys/domain.h> +#include <sys/protosw.h> +#include <sys/socket.h> +#include <sys/socketvar.h> +#include <sys/syslog.h> +#include <sys/eventhandler.h> +#include <machine/clock.h> +#include <vm/vm.h> +#include <vm/pmap.h> +#include <net/if.h> +#include <net/if_types.h> +#include <net/if_dl.h> +#include <net/netisr.h> +#include <net/route.h> +#include <netinet/in.h> +#include <netinet/in_var.h> +#include <netinet/if_ether.h> +#include <netatm/port.h> +#include <netatm/queue.h> +#include <netatm/atm.h> +#include <netatm/atm_sys.h> +#include <netatm/atm_sap.h> +#include <netatm/atm_cm.h> +#include <netatm/atm_if.h> +#include <netatm/atm_vc.h> +#include <netatm/atm_ioctl.h> +#include <netatm/atm_sigmgr.h> +#include <netatm/atm_stack.h> +#include <netatm/atm_pcb.h> +#include <netatm/atm_var.h> +#include <pci/pcireg.h> +#include <pci/pcivar.h> +#include <dev/hfa/fore.h> +#include <dev/hfa/fore_aali.h> +#include <dev/hfa/fore_slave.h> +#include <dev/hfa/fore_stats.h> +#include <dev/hfa/fore_var.h> #include <dev/hfa/fore_include.h> #ifndef lint diff --git a/sys/dev/hfa/fore_vcm.c b/sys/dev/hfa/fore_vcm.c index e2bc530ef5e3..b13ead3e6ac8 100644 --- a/sys/dev/hfa/fore_vcm.c +++ b/sys/dev/hfa/fore_vcm.c @@ -35,6 +35,53 @@ * */ +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/types.h> +#include <sys/errno.h> +#include <sys/malloc.h> +#include <sys/proc.h> +#include <sys/sockio.h> +#include <sys/time.h> +#include <sys/kernel.h> +#include <sys/conf.h> +#include <sys/domain.h> +#include <sys/protosw.h> +#include <sys/socket.h> +#include <sys/socketvar.h> +#include <sys/syslog.h> +#include <sys/eventhandler.h> +#include <machine/clock.h> +#include <vm/vm.h> +#include <vm/pmap.h> +#include <net/if.h> +#include <net/if_types.h> +#include <net/if_dl.h> +#include <net/netisr.h> +#include <net/route.h> +#include <netinet/in.h> +#include <netinet/in_var.h> +#include <netinet/if_ether.h> +#include <netatm/port.h> +#include <netatm/queue.h> +#include <netatm/atm.h> +#include <netatm/atm_sys.h> +#include <netatm/atm_sap.h> +#include <netatm/atm_cm.h> +#include <netatm/atm_if.h> +#include <netatm/atm_vc.h> +#include <netatm/atm_ioctl.h> +#include <netatm/atm_sigmgr.h> +#include <netatm/atm_stack.h> +#include <netatm/atm_pcb.h> +#include <netatm/atm_var.h> +#include <pci/pcireg.h> +#include <pci/pcivar.h> +#include <dev/hfa/fore.h> +#include <dev/hfa/fore_aali.h> +#include <dev/hfa/fore_slave.h> +#include <dev/hfa/fore_stats.h> +#include <dev/hfa/fore_var.h> #include <dev/hfa/fore_include.h> #ifndef lint diff --git a/sys/netatm/atm_aal5.c b/sys/netatm/atm_aal5.c index 3538f84e4ed2..2a48c19b8576 100644 --- a/sys/netatm/atm_aal5.c +++ b/sys/netatm/atm_aal5.c @@ -35,7 +35,26 @@ * */ -#include <netatm/kern_include.h> +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/types.h> +#include <sys/errno.h> +#include <sys/time.h> +#include <sys/protosw.h> +#include <sys/socket.h> +#include <sys/socketvar.h> +#include <machine/clock.h> +#include <net/if.h> +#include <netatm/port.h> +#include <netatm/queue.h> +#include <netatm/atm.h> +#include <netatm/atm_sys.h> +#include <netatm/atm_sap.h> +#include <netatm/atm_cm.h> +#include <netatm/atm_if.h> +#include <netatm/atm_stack.h> +#include <netatm/atm_pcb.h> +#include <netatm/atm_var.h> #include <sys/stat.h> #ifndef lint diff --git a/sys/netatm/atm_cm.c b/sys/netatm/atm_cm.c index e5bf21120bb8..46c1006884cf 100644 --- a/sys/netatm/atm_cm.c +++ b/sys/netatm/atm_cm.c @@ -35,7 +35,28 @@ * */ -#include <netatm/kern_include.h> +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/types.h> +#include <sys/errno.h> +#include <sys/time.h> +#include <sys/socket.h> +#include <sys/socketvar.h> +#include <sys/syslog.h> +#include <machine/clock.h> +#include <net/if.h> +#include <netatm/port.h> +#include <netatm/queue.h> +#include <netatm/atm.h> +#include <netatm/atm_sys.h> +#include <netatm/atm_sap.h> +#include <netatm/atm_cm.h> +#include <netatm/atm_if.h> +#include <netatm/atm_vc.h> +#include <netatm/atm_sigmgr.h> +#include <netatm/atm_stack.h> +#include <netatm/atm_pcb.h> +#include <netatm/atm_var.h> #ifndef lint __RCSID("@(#) $FreeBSD$"); diff --git a/sys/netatm/atm_device.c b/sys/netatm/atm_device.c index 9bd4ee146db2..b65c36fd3bfe 100644 --- a/sys/netatm/atm_device.c +++ b/sys/netatm/atm_device.c @@ -35,7 +35,28 @@ * */ -#include <netatm/kern_include.h> +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/types.h> +#include <sys/errno.h> +#include <sys/malloc.h> +#include <sys/time.h> +#include <sys/socket.h> +#include <sys/socketvar.h> +#include <sys/syslog.h> +#include <machine/clock.h> +#include <net/if.h> +#include <netatm/port.h> +#include <netatm/queue.h> +#include <netatm/atm.h> +#include <netatm/atm_sys.h> +#include <netatm/atm_sap.h> +#include <netatm/atm_cm.h> +#include <netatm/atm_if.h> +#include <netatm/atm_vc.h> +#include <netatm/atm_stack.h> +#include <netatm/atm_pcb.h> +#include <netatm/atm_var.h> #ifndef lint __RCSID("@(#) $FreeBSD$"); diff --git a/sys/netatm/atm_if.c b/sys/netatm/atm_if.c index 1825eaf0b413..c8078f41c770 100644 --- a/sys/netatm/atm_if.c +++ b/sys/netatm/atm_if.c @@ -35,7 +35,34 @@ * */ -#include <netatm/kern_include.h> +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/types.h> +#include <sys/errno.h> +#include <sys/sockio.h> +#include <sys/time.h> +#include <sys/socket.h> +#include <sys/socketvar.h> +#include <sys/syslog.h> +#include <machine/clock.h> +#include <net/if.h> +#include <net/if_types.h> +#include <net/if_dl.h> +#include <net/route.h> +#include <netinet/in.h> +#include <netinet/in_var.h> +#include <netatm/port.h> +#include <netatm/queue.h> +#include <netatm/atm.h> +#include <netatm/atm_sys.h> +#include <netatm/atm_sap.h> +#include <netatm/atm_cm.h> +#include <netatm/atm_if.h> +#include <netatm/atm_ioctl.h> +#include <netatm/atm_sigmgr.h> +#include <netatm/atm_stack.h> +#include <netatm/atm_pcb.h> +#include <netatm/atm_var.h> #ifndef lint __RCSID("@(#) $FreeBSD$"); diff --git a/sys/netatm/atm_if.h b/sys/netatm/atm_if.h index e7370c60526d..fada781ffa9d 100644 --- a/sys/netatm/atm_if.h +++ b/sys/netatm/atm_if.h @@ -317,48 +317,21 @@ struct atm_ncm { /* * atm_dev_compress() buffer allocation sizes */ -#if defined(BSD) #define ATM_DEV_CMPR_LG MCLBYTES /* Size of large buffers */ #define ATM_DEV_CMPR_SM MLEN /* Size of small buffers */ -#endif /* * Macros to manage DMA addresses */ -#if defined(sun4c) -#define DMA_INIT() -#define DMA_GET_ADDR(addr,len,align,flags) ((void *)(addr)) -#define DMA_FREE_ADDR(addr,daddr,len,flags) -#define DMA_RELEASE() - -#elif defined(sun4m) -#define DMA_INIT() -#define DMA_GET_ADDR(addr,len,align,flags) \ - (void *)atm_dma_map((addr),(len),(flags)) -#define DMA_FREE_ADDR(addr,daddr,len,flags) \ - (void)atm_dma_free((daddr),(flags)) -#define DMA_RELEASE() - -#elif defined(BSD) && defined(__i386__) #define DMA_INIT() #define DMA_GET_ADDR(addr,len,align,flags) ((void *)vtophys(addr)) #define DMA_FREE_ADDR(addr,daddr,len,flags) #define DMA_RELEASE() -#else - #error - Must define hardware-specific requirements here -#endif - - /* * Macros to lock out device interrupts */ -#if defined(sun) -#define DEVICE_LOCK(u) ((u)->cu_savepri = splr((u)->cu_intrpri)) -#endif -#if defined(__FreeBSD__) #define DEVICE_LOCK(u) ((u)->cu_savepri = splimp()) -#endif #define DEVICE_UNLOCK(u) ((void) splx((u)->cu_savepri)) @@ -377,10 +350,6 @@ typedef void (atm_intr_t) __P((void *, KBuffer *)); /* Callback function type */ typedef atm_intr_t *atm_intr_func_t; /* Pointer to callback function */ #define SCHED_ATM schednetisr(NETISR_ATM) -#ifdef sgi -extern int atm_intr_index; -#define SCHED_ATM schednetisr(atm_intr_index) -#endif #endif /* _KERNEL */ #endif /* _NETATM_ATM_IF_H */ diff --git a/sys/netatm/atm_proto.c b/sys/netatm/atm_proto.c index 1b1c2ed940a0..9789f62d4a88 100644 --- a/sys/netatm/atm_proto.c +++ b/sys/netatm/atm_proto.c @@ -35,7 +35,27 @@ * */ -#include <netatm/kern_include.h> +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/types.h> +#include <sys/errno.h> +#include <sys/time.h> +#include <sys/kernel.h> +#include <sys/domain.h> +#include <sys/protosw.h> +#include <sys/socket.h> +#include <machine/clock.h> +#include <net/if.h> +#include <netatm/port.h> +#include <netatm/queue.h> +#include <netatm/atm.h> +#include <netatm/atm_sys.h> +#include <netatm/atm_sap.h> +#include <netatm/atm_cm.h> +#include <netatm/atm_if.h> +#include <netatm/atm_stack.h> +#include <netatm/atm_pcb.h> +#include <netatm/atm_var.h> #ifndef lint __RCSID("@(#) $FreeBSD$"); diff --git a/sys/netatm/atm_signal.c b/sys/netatm/atm_signal.c index 2ad3b54178f5..9ba114fb675d 100644 --- a/sys/netatm/atm_signal.c +++ b/sys/netatm/atm_signal.c @@ -35,7 +35,26 @@ * */ -#include <netatm/kern_include.h> +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/types.h> +#include <sys/errno.h> +#include <sys/time.h> +#include <sys/socket.h> +#include <sys/socketvar.h> +#include <machine/clock.h> +#include <net/if.h> +#include <netatm/port.h> +#include <netatm/queue.h> +#include <netatm/atm.h> +#include <netatm/atm_sys.h> +#include <netatm/atm_sap.h> +#include <netatm/atm_cm.h> +#include <netatm/atm_if.h> +#include <netatm/atm_sigmgr.h> +#include <netatm/atm_stack.h> +#include <netatm/atm_pcb.h> +#include <netatm/atm_var.h> #ifndef lint __RCSID("@(#) $FreeBSD$"); diff --git a/sys/netatm/atm_socket.c b/sys/netatm/atm_socket.c index 2976ff17ceae..560970644d4c 100644 --- a/sys/netatm/atm_socket.c +++ b/sys/netatm/atm_socket.c @@ -35,7 +35,28 @@ * */ -#include <netatm/kern_include.h> +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/types.h> +#include <sys/errno.h> +#include <sys/malloc.h> +#include <sys/time.h> +#include <sys/socket.h> +#include <sys/socketvar.h> +#include <sys/syslog.h> +#include <machine/clock.h> +#include <net/if.h> +#include <netatm/port.h> +#include <netatm/queue.h> +#include <netatm/atm.h> +#include <netatm/atm_sys.h> +#include <netatm/atm_sap.h> +#include <netatm/atm_cm.h> +#include <netatm/atm_if.h> +#include <netatm/atm_sigmgr.h> +#include <netatm/atm_stack.h> +#include <netatm/atm_pcb.h> +#include <netatm/atm_var.h> #ifndef lint __RCSID("@(#) $FreeBSD$"); diff --git a/sys/netatm/atm_subr.c b/sys/netatm/atm_subr.c index 962977bac8a3..8dc9d54b67f3 100644 --- a/sys/netatm/atm_subr.c +++ b/sys/netatm/atm_subr.c @@ -35,8 +35,28 @@ * */ -#include <netatm/kern_include.h> -#include <net/intrq.h> +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/types.h> +#include <sys/errno.h> +#include <sys/malloc.h> +#include <sys/time.h> +#include <sys/kernel.h> +#include <sys/socket.h> +#include <sys/socketvar.h> +#include <machine/clock.h> +#include <net/if.h> +#include <net/netisr.h> +#include <netatm/port.h> +#include <netatm/queue.h> +#include <netatm/atm.h> +#include <netatm/atm_sys.h> +#include <netatm/atm_sap.h> +#include <netatm/atm_cm.h> +#include <netatm/atm_if.h> +#include <netatm/atm_stack.h> +#include <netatm/atm_pcb.h> +#include <netatm/atm_var.h> #ifndef lint __RCSID("@(#) $FreeBSD$"); diff --git a/sys/netatm/atm_usrreq.c b/sys/netatm/atm_usrreq.c index f88cf0d203f2..37aae9e4a021 100644 --- a/sys/netatm/atm_usrreq.c +++ b/sys/netatm/atm_usrreq.c @@ -35,7 +35,29 @@ * */ -#include <netatm/kern_include.h> +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/types.h> +#include <sys/errno.h> +#include <sys/proc.h> +#include <sys/sockio.h> +#include <sys/time.h> +#include <sys/protosw.h> +#include <sys/socket.h> +#include <machine/clock.h> +#include <net/if.h> +#include <netatm/port.h> +#include <netatm/queue.h> +#include <netatm/atm.h> +#include <netatm/atm_sys.h> +#include <netatm/atm_sap.h> +#include <netatm/atm_cm.h> +#include <netatm/atm_if.h> +#include <netatm/atm_ioctl.h> +#include <netatm/atm_sigmgr.h> +#include <netatm/atm_stack.h> +#include <netatm/atm_pcb.h> +#include <netatm/atm_var.h> #ifndef lint __RCSID("@(#) $FreeBSD$"); diff --git a/sys/netatm/ipatm/ipatm_event.c b/sys/netatm/ipatm/ipatm_event.c index 0566d1cfd3b2..2058ca1f0c28 100644 --- a/sys/netatm/ipatm/ipatm_event.c +++ b/sys/netatm/ipatm/ipatm_event.c @@ -35,7 +35,26 @@ * */ -#include <netatm/kern_include.h> +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/types.h> +#include <sys/time.h> +#include <sys/socket.h> +#include <sys/socketvar.h> +#include <sys/syslog.h> +#include <machine/clock.h> +#include <net/if.h> +#include <netinet/in.h> +#include <netatm/port.h> +#include <netatm/queue.h> +#include <netatm/atm.h> +#include <netatm/atm_sys.h> +#include <netatm/atm_sap.h> +#include <netatm/atm_cm.h> +#include <netatm/atm_if.h> +#include <netatm/atm_stack.h> +#include <netatm/atm_pcb.h> +#include <netatm/atm_var.h> #include <netatm/ipatm/ipatm.h> #include <netatm/ipatm/ipatm_var.h> diff --git a/sys/netatm/ipatm/ipatm_if.c b/sys/netatm/ipatm/ipatm_if.c index 3f39fea60d7d..b924cf5f530a 100644 --- a/sys/netatm/ipatm/ipatm_if.c +++ b/sys/netatm/ipatm/ipatm_if.c @@ -35,7 +35,28 @@ * */ -#include <netatm/kern_include.h> +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/types.h> +#include <sys/errno.h> +#include <sys/time.h> +#include <sys/socket.h> +#include <sys/socketvar.h> +#include <sys/syslog.h> +#include <machine/clock.h> +#include <net/if.h> +#include <netinet/in.h> +#include <netatm/port.h> +#include <netatm/queue.h> +#include <netatm/atm.h> +#include <netatm/atm_sys.h> +#include <netatm/atm_sap.h> +#include <netatm/atm_cm.h> +#include <netatm/atm_if.h> +#include <netatm/atm_sigmgr.h> +#include <netatm/atm_stack.h> +#include <netatm/atm_pcb.h> +#include <netatm/atm_var.h> #include <netatm/ipatm/ipatm_var.h> #include <netatm/ipatm/ipatm_serv.h> diff --git a/sys/netatm/ipatm/ipatm_input.c b/sys/netatm/ipatm/ipatm_input.c index 8f380b957e8e..fa06a7dc82d3 100644 --- a/sys/netatm/ipatm/ipatm_input.c +++ b/sys/netatm/ipatm/ipatm_input.c @@ -35,7 +35,27 @@ * */ -#include <netatm/kern_include.h> +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/types.h> +#include <sys/time.h> +#include <sys/socket.h> +#include <sys/socketvar.h> +#include <machine/clock.h> +#include <net/if.h> +#include <net/netisr.h> +#include <netinet/in.h> +#include <netinet/in_var.h> +#include <netatm/port.h> +#include <netatm/queue.h> +#include <netatm/atm.h> +#include <netatm/atm_sys.h> +#include <netatm/atm_sap.h> +#include <netatm/atm_cm.h> +#include <netatm/atm_if.h> +#include <netatm/atm_stack.h> +#include <netatm/atm_pcb.h> +#include <netatm/atm_var.h> #include <netatm/ipatm/ipatm_var.h> diff --git a/sys/netatm/ipatm/ipatm_load.c b/sys/netatm/ipatm/ipatm_load.c index e15852505c62..736f7d6eda5a 100644 --- a/sys/netatm/ipatm/ipatm_load.c +++ b/sys/netatm/ipatm/ipatm_load.c @@ -39,7 +39,29 @@ #include "opt_atm.h" #endif -#include <netatm/kern_include.h> +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/types.h> +#include <sys/errno.h> +#include <sys/time.h> +#include <sys/kernel.h> +#include <sys/socket.h> +#include <sys/socketvar.h> +#include <sys/syslog.h> +#include <machine/clock.h> +#include <net/if.h> +#include <netinet/in.h> +#include <netinet/in_var.h> +#include <netatm/port.h> +#include <netatm/queue.h> +#include <netatm/atm.h> +#include <netatm/atm_sys.h> +#include <netatm/atm_sap.h> +#include <netatm/atm_cm.h> +#include <netatm/atm_if.h> +#include <netatm/atm_stack.h> +#include <netatm/atm_pcb.h> +#include <netatm/atm_var.h> #include <netatm/ipatm/ipatm.h> #include <netatm/ipatm/ipatm_var.h> diff --git a/sys/netatm/ipatm/ipatm_output.c b/sys/netatm/ipatm/ipatm_output.c index 1ca94f3938b7..3e6d1d2550ea 100644 --- a/sys/netatm/ipatm/ipatm_output.c +++ b/sys/netatm/ipatm/ipatm_output.c @@ -35,7 +35,27 @@ * */ -#include <netatm/kern_include.h> +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/types.h> +#include <sys/errno.h> +#include <sys/time.h> +#include <sys/socket.h> +#include <sys/socketvar.h> +#include <machine/clock.h> +#include <net/if.h> +#include <netinet/in.h> +#include <netinet/in_var.h> +#include <netatm/port.h> +#include <netatm/queue.h> +#include <netatm/atm.h> +#include <netatm/atm_sys.h> +#include <netatm/atm_sap.h> +#include <netatm/atm_cm.h> +#include <netatm/atm_if.h> +#include <netatm/atm_stack.h> +#include <netatm/atm_pcb.h> +#include <netatm/atm_var.h> #include <netatm/ipatm/ipatm_var.h> #include <netatm/ipatm/ipatm_serv.h> diff --git a/sys/netatm/ipatm/ipatm_usrreq.c b/sys/netatm/ipatm/ipatm_usrreq.c index 017fe4045307..e563e4dbc4cd 100644 --- a/sys/netatm/ipatm/ipatm_usrreq.c +++ b/sys/netatm/ipatm/ipatm_usrreq.c @@ -35,7 +35,28 @@ * */ -#include <netatm/kern_include.h> +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/types.h> +#include <sys/errno.h> +#include <sys/time.h> +#include <sys/socket.h> +#include <sys/socketvar.h> +#include <machine/clock.h> +#include <net/if.h> +#include <netinet/in.h> +#include <netatm/port.h> +#include <netatm/queue.h> +#include <netatm/atm.h> +#include <netatm/atm_sys.h> +#include <netatm/atm_sap.h> +#include <netatm/atm_cm.h> +#include <netatm/atm_if.h> +#include <netatm/atm_vc.h> +#include <netatm/atm_ioctl.h> +#include <netatm/atm_stack.h> +#include <netatm/atm_pcb.h> +#include <netatm/atm_var.h> #include <netatm/ipatm/ipatm_var.h> #include <netatm/ipatm/ipatm_serv.h> diff --git a/sys/netatm/ipatm/ipatm_vcm.c b/sys/netatm/ipatm/ipatm_vcm.c index 409c3357aa94..bdb956c24e64 100644 --- a/sys/netatm/ipatm/ipatm_vcm.c +++ b/sys/netatm/ipatm/ipatm_vcm.c @@ -35,7 +35,28 @@ * */ -#include <netatm/kern_include.h> +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/types.h> +#include <sys/errno.h> +#include <sys/time.h> +#include <sys/socket.h> +#include <sys/socketvar.h> +#include <sys/syslog.h> +#include <machine/clock.h> +#include <net/if.h> +#include <netinet/in.h> +#include <netinet/in_var.h> +#include <netatm/port.h> +#include <netatm/queue.h> +#include <netatm/atm.h> +#include <netatm/atm_sys.h> +#include <netatm/atm_sap.h> +#include <netatm/atm_cm.h> +#include <netatm/atm_if.h> +#include <netatm/atm_stack.h> +#include <netatm/atm_pcb.h> +#include <netatm/atm_var.h> #include <netatm/ipatm/ipatm.h> #include <netatm/ipatm/ipatm_var.h> diff --git a/sys/netatm/kern_include.h b/sys/netatm/kern_include.h deleted file mode 100644 index 3817c2cf050c..000000000000 --- a/sys/netatm/kern_include.h +++ /dev/null @@ -1,98 +0,0 @@ -/* - * - * =================================== - * HARP | Host ATM Research Platform - * =================================== - * - * - * This Host ATM Research Platform ("HARP") file (the "Software") is - * made available by Network Computing Services, Inc. ("NetworkCS") - * "AS IS". NetworkCS does not provide maintenance, improvements or - * support of any kind. - * - * NETWORKCS MAKES NO WARRANTIES OR REPRESENTATIONS, EXPRESS OR IMPLIED, - * INCLUDING, BUT NOT LIMITED TO, IMPLIED WARRANTIES OF MERCHANTABILITY - * AND FITNESS FOR A PARTICULAR PURPOSE, AS TO ANY ELEMENT OF THE - * SOFTWARE OR ANY SUPPORT PROVIDED IN CONNECTION WITH THIS SOFTWARE. - * In no event shall NetworkCS be responsible for any damages, including - * but not limited to consequential damages, arising from or relating to - * any use of the Software or related support. - * - * Copyright 1994-1998 Network Computing Services, Inc. - * - * Copies of this Software may be made, however, the above copyright - * notice must be reproduced on all copies. - * - * @(#) $FreeBSD$ - * - */ - -/* - * Core ATM Services - * ----------------- - * - * Common kernel module includes - * - */ - -#ifndef _NETATM_KERN_INCLUDE_H -#define _NETATM_KERN_INCLUDE_H - -#include <sys/param.h> -#include <sys/systm.h> -#include <sys/types.h> -#include <sys/errno.h> -#include <sys/malloc.h> -#include <sys/proc.h> -#include <sys/sockio.h> -#include <sys/time.h> -#include <sys/kernel.h> -#include <sys/conf.h> -#include <sys/domain.h> -#include <sys/protosw.h> -#include <sys/socket.h> -#include <sys/socketvar.h> -#include <sys/syslog.h> - - -#include <sys/eventhandler.h> -#include <machine/clock.h> -#include <vm/vm.h> -#include <vm/pmap.h> - -/* - * Networking support - */ -#include <net/if.h> -#if (defined(BSD) && (BSD >= 199103)) -#include <net/if_types.h> -#include <net/if_dl.h> -#endif -#include <net/netisr.h> -#include <net/route.h> -#include <netinet/in.h> -#include <netinet/in_var.h> -#include <netinet/if_ether.h> - -/* - * Porting fluff - */ -#include <netatm/port.h> - -/* - * ATM core services - */ -#include <netatm/queue.h> -#include <netatm/atm.h> -#include <netatm/atm_sys.h> -#include <netatm/atm_sap.h> -#include <netatm/atm_cm.h> -#include <netatm/atm_if.h> -#include <netatm/atm_vc.h> -#include <netatm/atm_ioctl.h> -#include <netatm/atm_sigmgr.h> -#include <netatm/atm_stack.h> -#include <netatm/atm_pcb.h> -#include <netatm/atm_var.h> - -#endif /* _NETATM_KERN_INCLUDE_H */ diff --git a/sys/netatm/sigpvc/sigpvc_if.c b/sys/netatm/sigpvc/sigpvc_if.c index 81636985210c..f1b2169e12e5 100644 --- a/sys/netatm/sigpvc/sigpvc_if.c +++ b/sys/netatm/sigpvc/sigpvc_if.c @@ -40,7 +40,46 @@ #include "opt_atm.h" #endif -#include <netatm/kern_include.h> +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/types.h> +#include <sys/errno.h> +#include <sys/malloc.h> +#include <sys/proc.h> +#include <sys/sockio.h> +#include <sys/time.h> +#include <sys/kernel.h> +#include <sys/conf.h> +#include <sys/domain.h> +#include <sys/protosw.h> +#include <sys/socket.h> +#include <sys/socketvar.h> +#include <sys/syslog.h> +#include <sys/eventhandler.h> +#include <machine/clock.h> +#include <vm/vm.h> +#include <vm/pmap.h> +#include <net/if.h> +#include <net/if_types.h> +#include <net/if_dl.h> +#include <net/netisr.h> +#include <net/route.h> +#include <netinet/in.h> +#include <netinet/in_var.h> +#include <netinet/if_ether.h> +#include <netatm/port.h> +#include <netatm/queue.h> +#include <netatm/atm.h> +#include <netatm/atm_sys.h> +#include <netatm/atm_sap.h> +#include <netatm/atm_cm.h> +#include <netatm/atm_if.h> +#include <netatm/atm_vc.h> +#include <netatm/atm_ioctl.h> +#include <netatm/atm_sigmgr.h> +#include <netatm/atm_stack.h> +#include <netatm/atm_pcb.h> +#include <netatm/atm_var.h> #include <netatm/sigpvc/sigpvc_var.h> diff --git a/sys/netatm/sigpvc/sigpvc_subr.c b/sys/netatm/sigpvc/sigpvc_subr.c index 97834b4e0af9..db2431045c2f 100644 --- a/sys/netatm/sigpvc/sigpvc_subr.c +++ b/sys/netatm/sigpvc/sigpvc_subr.c @@ -35,7 +35,46 @@ * */ -#include <netatm/kern_include.h> +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/types.h> +#include <sys/errno.h> +#include <sys/malloc.h> +#include <sys/proc.h> +#include <sys/sockio.h> +#include <sys/time.h> +#include <sys/kernel.h> +#include <sys/conf.h> +#include <sys/domain.h> +#include <sys/protosw.h> +#include <sys/socket.h> +#include <sys/socketvar.h> +#include <sys/syslog.h> +#include <sys/eventhandler.h> +#include <machine/clock.h> +#include <vm/vm.h> +#include <vm/pmap.h> +#include <net/if.h> +#include <net/if_types.h> +#include <net/if_dl.h> +#include <net/netisr.h> +#include <net/route.h> +#include <netinet/in.h> +#include <netinet/in_var.h> +#include <netinet/if_ether.h> +#include <netatm/port.h> +#include <netatm/queue.h> +#include <netatm/atm.h> +#include <netatm/atm_sys.h> +#include <netatm/atm_sap.h> +#include <netatm/atm_cm.h> +#include <netatm/atm_if.h> +#include <netatm/atm_vc.h> +#include <netatm/atm_ioctl.h> +#include <netatm/atm_sigmgr.h> +#include <netatm/atm_stack.h> +#include <netatm/atm_pcb.h> +#include <netatm/atm_var.h> #include <netatm/sigpvc/sigpvc_var.h> diff --git a/sys/netatm/spans/spans_arp.c b/sys/netatm/spans/spans_arp.c index f206b095ced1..bf8a9a9a157c 100644 --- a/sys/netatm/spans/spans_arp.c +++ b/sys/netatm/spans/spans_arp.c @@ -35,7 +35,32 @@ * */ -#include <netatm/kern_include.h> +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/types.h> +#include <sys/errno.h> +#include <sys/time.h> +#include <sys/socket.h> +#include <sys/socketvar.h> +#include <sys/syslog.h> +#include <machine/clock.h> +#include <net/if.h> +#include <netinet/in.h> +#include <netinet/in_var.h> +#include <netinet/if_ether.h> +#include <netatm/port.h> +#include <netatm/queue.h> +#include <netatm/atm.h> +#include <netatm/atm_sys.h> +#include <netatm/atm_sap.h> +#include <netatm/atm_cm.h> +#include <netatm/atm_if.h> +#include <netatm/atm_vc.h> +#include <netatm/atm_ioctl.h> +#include <netatm/atm_sigmgr.h> +#include <netatm/atm_stack.h> +#include <netatm/atm_pcb.h> +#include <netatm/atm_var.h> #include <netatm/ipatm/ipatm_var.h> #include <netatm/ipatm/ipatm_serv.h> diff --git a/sys/netatm/spans/spans_cls.c b/sys/netatm/spans/spans_cls.c index 44daad7eda4a..2d4d3a19f011 100644 --- a/sys/netatm/spans/spans_cls.c +++ b/sys/netatm/spans/spans_cls.c @@ -35,7 +35,30 @@ * */ -#include <netatm/kern_include.h> +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/types.h> +#include <sys/errno.h> +#include <sys/time.h> +#include <sys/socket.h> +#include <sys/socketvar.h> +#include <sys/syslog.h> +#include <machine/clock.h> +#include <net/if.h> +#include <netinet/in.h> +#include <netinet/if_ether.h> +#include <netatm/port.h> +#include <netatm/queue.h> +#include <netatm/atm.h> +#include <netatm/atm_sys.h> +#include <netatm/atm_sap.h> +#include <netatm/atm_cm.h> +#include <netatm/atm_if.h> +#include <netatm/atm_vc.h> +#include <netatm/atm_sigmgr.h> +#include <netatm/atm_stack.h> +#include <netatm/atm_pcb.h> +#include <netatm/atm_var.h> #include <netatm/ipatm/ipatm_var.h> #include <netatm/ipatm/ipatm_serv.h> diff --git a/sys/netatm/spans/spans_if.c b/sys/netatm/spans/spans_if.c index 2ddf6fc91a94..70b0ed071536 100644 --- a/sys/netatm/spans/spans_if.c +++ b/sys/netatm/spans/spans_if.c @@ -40,7 +40,32 @@ #include "opt_atm.h" #endif -#include <netatm/kern_include.h> +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/types.h> +#include <sys/errno.h> +#include <sys/malloc.h> +#include <sys/time.h> +#include <sys/kernel.h> +#include <sys/socket.h> +#include <sys/socketvar.h> +#include <sys/syslog.h> +#include <machine/clock.h> +#include <net/if.h> +#include <netinet/in.h> +#include <netatm/port.h> +#include <netatm/queue.h> +#include <netatm/atm.h> +#include <netatm/atm_sys.h> +#include <netatm/atm_sap.h> +#include <netatm/atm_cm.h> +#include <netatm/atm_if.h> +#include <netatm/atm_vc.h> +#include <netatm/atm_ioctl.h> +#include <netatm/atm_sigmgr.h> +#include <netatm/atm_stack.h> +#include <netatm/atm_pcb.h> +#include <netatm/atm_var.h> #include "spans_xdr.h" #include <netatm/spans/spans_var.h> diff --git a/sys/netatm/spans/spans_kxdr.c b/sys/netatm/spans/spans_kxdr.c index d2e4ee4aea4c..5ed0bc122d3b 100644 --- a/sys/netatm/spans/spans_kxdr.c +++ b/sys/netatm/spans/spans_kxdr.c @@ -35,7 +35,12 @@ * */ -#include <netatm/kern_include.h> +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/types.h> +#include <sys/time.h> +#include <machine/clock.h> +#include <netatm/port.h> #ifndef lint __RCSID("@(#) $FreeBSD$"); diff --git a/sys/netatm/spans/spans_msg.c b/sys/netatm/spans/spans_msg.c index 09c4c9f3cdbf..9e0171dc25f7 100644 --- a/sys/netatm/spans/spans_msg.c +++ b/sys/netatm/spans/spans_msg.c @@ -35,7 +35,29 @@ * */ -#include <netatm/kern_include.h> +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/types.h> +#include <sys/errno.h> +#include <sys/time.h> +#include <sys/socket.h> +#include <sys/socketvar.h> +#include <sys/syslog.h> +#include <machine/clock.h> +#include <net/if.h> +#include <netinet/in.h> +#include <netatm/port.h> +#include <netatm/queue.h> +#include <netatm/atm.h> +#include <netatm/atm_sys.h> +#include <netatm/atm_sap.h> +#include <netatm/atm_cm.h> +#include <netatm/atm_if.h> +#include <netatm/atm_vc.h> +#include <netatm/atm_sigmgr.h> +#include <netatm/atm_stack.h> +#include <netatm/atm_pcb.h> +#include <netatm/atm_var.h> #include <rpc/rpc.h> #include "spans_xdr.h" diff --git a/sys/netatm/spans/spans_print.c b/sys/netatm/spans/spans_print.c index 3e280685893e..b0ce63d95b54 100644 --- a/sys/netatm/spans/spans_print.c +++ b/sys/netatm/spans/spans_print.c @@ -35,7 +35,22 @@ * */ -#include <netatm/kern_include.h> +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/types.h> +#include <sys/time.h> +#include <sys/socket.h> +#include <machine/clock.h> +#include <net/if.h> +#include <netinet/in.h> +#include <netatm/port.h> +#include <netatm/queue.h> +#include <netatm/atm.h> +#include <netatm/atm_sys.h> +#include <netatm/atm_sap.h> +#include <netatm/atm_cm.h> +#include <netatm/atm_vc.h> +#include <netatm/atm_sigmgr.h> #include "spans_xdr.h" #include <netatm/spans/spans_var.h> diff --git a/sys/netatm/spans/spans_proto.c b/sys/netatm/spans/spans_proto.c index 47e4edc82d93..bd735d4a12ef 100644 --- a/sys/netatm/spans/spans_proto.c +++ b/sys/netatm/spans/spans_proto.c @@ -35,7 +35,28 @@ * */ -#include <netatm/kern_include.h> +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/types.h> +#include <sys/time.h> +#include <sys/socket.h> +#include <sys/socketvar.h> +#include <sys/syslog.h> +#include <machine/clock.h> +#include <net/if.h> +#include <netinet/in.h> +#include <netatm/port.h> +#include <netatm/queue.h> +#include <netatm/atm.h> +#include <netatm/atm_sys.h> +#include <netatm/atm_sap.h> +#include <netatm/atm_cm.h> +#include <netatm/atm_if.h> +#include <netatm/atm_vc.h> +#include <netatm/atm_sigmgr.h> +#include <netatm/atm_stack.h> +#include <netatm/atm_pcb.h> +#include <netatm/atm_var.h> #include "spans_xdr.h" #include <netatm/spans/spans_var.h> diff --git a/sys/netatm/spans/spans_subr.c b/sys/netatm/spans/spans_subr.c index a53d31de2263..53930eaa2bbe 100644 --- a/sys/netatm/spans/spans_subr.c +++ b/sys/netatm/spans/spans_subr.c @@ -35,7 +35,29 @@ * */ -#include <netatm/kern_include.h> +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/types.h> +#include <sys/errno.h> +#include <sys/time.h> +#include <sys/socket.h> +#include <sys/socketvar.h> +#include <sys/syslog.h> +#include <machine/clock.h> +#include <net/if.h> +#include <netinet/in.h> +#include <netatm/port.h> +#include <netatm/queue.h> +#include <netatm/atm.h> +#include <netatm/atm_sys.h> +#include <netatm/atm_sap.h> +#include <netatm/atm_cm.h> +#include <netatm/atm_if.h> +#include <netatm/atm_vc.h> +#include <netatm/atm_sigmgr.h> +#include <netatm/atm_stack.h> +#include <netatm/atm_pcb.h> +#include <netatm/atm_var.h> #include "spans_xdr.h" #include <netatm/spans/spans_var.h> diff --git a/sys/netatm/spans/spans_util.c b/sys/netatm/spans/spans_util.c index bfbae5d8d36b..310cd3fc7a21 100644 --- a/sys/netatm/spans/spans_util.c +++ b/sys/netatm/spans/spans_util.c @@ -35,7 +35,22 @@ * */ -#include <netatm/kern_include.h> +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/types.h> +#include <sys/time.h> +#include <sys/socket.h> +#include <machine/clock.h> +#include <net/if.h> +#include <netinet/in.h> +#include <netatm/port.h> +#include <netatm/queue.h> +#include <netatm/atm.h> +#include <netatm/atm_sys.h> +#include <netatm/atm_sap.h> +#include <netatm/atm_cm.h> +#include <netatm/atm_vc.h> +#include <netatm/atm_sigmgr.h> #include "spans_xdr.h" #include <netatm/spans/spans_var.h> diff --git a/sys/netatm/uni/q2110_sigaa.c b/sys/netatm/uni/q2110_sigaa.c index 3038f1406fb9..f53be1088e4a 100644 --- a/sys/netatm/uni/q2110_sigaa.c +++ b/sys/netatm/uni/q2110_sigaa.c @@ -35,7 +35,18 @@ * */ -#include <netatm/kern_include.h> +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/types.h> +#include <sys/time.h> +#include <sys/socket.h> +#include <machine/clock.h> +#include <net/if.h> +#include <netatm/port.h> +#include <netatm/queue.h> +#include <netatm/atm.h> +#include <netatm/atm_sys.h> +#include <netatm/atm_cm.h> #include <netatm/uni/sscop.h> #include <netatm/uni/sscop_misc.h> diff --git a/sys/netatm/uni/q2110_sigcpcs.c b/sys/netatm/uni/q2110_sigcpcs.c index dec7091ecbf3..75eca40a0580 100644 --- a/sys/netatm/uni/q2110_sigcpcs.c +++ b/sys/netatm/uni/q2110_sigcpcs.c @@ -35,7 +35,24 @@ * */ -#include <netatm/kern_include.h> +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/types.h> +#include <sys/time.h> +#include <sys/socket.h> +#include <sys/socketvar.h> +#include <machine/clock.h> +#include <net/if.h> +#include <netatm/port.h> +#include <netatm/queue.h> +#include <netatm/atm.h> +#include <netatm/atm_sys.h> +#include <netatm/atm_sap.h> +#include <netatm/atm_cm.h> +#include <netatm/atm_if.h> +#include <netatm/atm_stack.h> +#include <netatm/atm_pcb.h> +#include <netatm/atm_var.h> #include <netatm/uni/sscop.h> #include <netatm/uni/sscop_misc.h> diff --git a/sys/netatm/uni/q2110_subr.c b/sys/netatm/uni/q2110_subr.c index 5e92f98a9ffe..b570453ef259 100644 --- a/sys/netatm/uni/q2110_subr.c +++ b/sys/netatm/uni/q2110_subr.c @@ -35,7 +35,18 @@ * */ -#include <netatm/kern_include.h> +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/types.h> +#include <sys/time.h> +#include <sys/socket.h> +#include <machine/clock.h> +#include <net/if.h> +#include <netatm/port.h> +#include <netatm/queue.h> +#include <netatm/atm.h> +#include <netatm/atm_sys.h> +#include <netatm/atm_cm.h> #include <netatm/uni/sscop.h> #include <netatm/uni/sscop_misc.h> diff --git a/sys/netatm/uni/qsaal1_sigaa.c b/sys/netatm/uni/qsaal1_sigaa.c index a9d07fffca2e..6c572325f968 100644 --- a/sys/netatm/uni/qsaal1_sigaa.c +++ b/sys/netatm/uni/qsaal1_sigaa.c @@ -35,7 +35,18 @@ * */ -#include <netatm/kern_include.h> +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/types.h> +#include <sys/time.h> +#include <sys/socket.h> +#include <machine/clock.h> +#include <net/if.h> +#include <netatm/port.h> +#include <netatm/queue.h> +#include <netatm/atm.h> +#include <netatm/atm_sys.h> +#include <netatm/atm_cm.h> #include <netatm/uni/sscop.h> #include <netatm/uni/sscop_misc.h> diff --git a/sys/netatm/uni/qsaal1_sigcpcs.c b/sys/netatm/uni/qsaal1_sigcpcs.c index 4e9bd44eefad..30fe1eb0d727 100644 --- a/sys/netatm/uni/qsaal1_sigcpcs.c +++ b/sys/netatm/uni/qsaal1_sigcpcs.c @@ -35,7 +35,24 @@ * */ -#include <netatm/kern_include.h> +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/types.h> +#include <sys/time.h> +#include <sys/socket.h> +#include <sys/socketvar.h> +#include <machine/clock.h> +#include <net/if.h> +#include <netatm/port.h> +#include <netatm/queue.h> +#include <netatm/atm.h> +#include <netatm/atm_sys.h> +#include <netatm/atm_sap.h> +#include <netatm/atm_cm.h> +#include <netatm/atm_if.h> +#include <netatm/atm_stack.h> +#include <netatm/atm_pcb.h> +#include <netatm/atm_var.h> #include <netatm/uni/sscop.h> #include <netatm/uni/sscop_misc.h> diff --git a/sys/netatm/uni/qsaal1_subr.c b/sys/netatm/uni/qsaal1_subr.c index 9fc884cdca03..1f65368ee193 100644 --- a/sys/netatm/uni/qsaal1_subr.c +++ b/sys/netatm/uni/qsaal1_subr.c @@ -35,7 +35,18 @@ * */ -#include <netatm/kern_include.h> +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/types.h> +#include <sys/time.h> +#include <sys/socket.h> +#include <machine/clock.h> +#include <net/if.h> +#include <netatm/port.h> +#include <netatm/queue.h> +#include <netatm/atm.h> +#include <netatm/atm_sys.h> +#include <netatm/atm_cm.h> #include <netatm/uni/sscop.h> #include <netatm/uni/sscop_misc.h> diff --git a/sys/netatm/uni/sscf_uni.c b/sys/netatm/uni/sscf_uni.c index fd700015aa02..d6553d45c730 100644 --- a/sys/netatm/uni/sscf_uni.c +++ b/sys/netatm/uni/sscf_uni.c @@ -35,7 +35,27 @@ * */ -#include <netatm/kern_include.h> +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/types.h> +#include <sys/errno.h> +#include <sys/time.h> +#include <sys/socket.h> +#include <sys/socketvar.h> +#include <sys/syslog.h> +#include <machine/clock.h> +#include <net/if.h> +#include <netatm/port.h> +#include <netatm/queue.h> +#include <netatm/atm.h> +#include <netatm/atm_sys.h> +#include <netatm/atm_sap.h> +#include <netatm/atm_cm.h> +#include <netatm/atm_if.h> +#include <netatm/atm_vc.h> +#include <netatm/atm_stack.h> +#include <netatm/atm_pcb.h> +#include <netatm/atm_var.h> #include <netatm/uni/uni.h> #include <netatm/uni/sscf_uni_var.h> diff --git a/sys/netatm/uni/sscf_uni_lower.c b/sys/netatm/uni/sscf_uni_lower.c index c1690667d522..15210587e61e 100644 --- a/sys/netatm/uni/sscf_uni_lower.c +++ b/sys/netatm/uni/sscf_uni_lower.c @@ -35,7 +35,25 @@ * */ -#include <netatm/kern_include.h> +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/types.h> +#include <sys/time.h> +#include <sys/socket.h> +#include <sys/socketvar.h> +#include <sys/syslog.h> +#include <machine/clock.h> +#include <net/if.h> +#include <netatm/port.h> +#include <netatm/queue.h> +#include <netatm/atm.h> +#include <netatm/atm_sys.h> +#include <netatm/atm_sap.h> +#include <netatm/atm_cm.h> +#include <netatm/atm_if.h> +#include <netatm/atm_stack.h> +#include <netatm/atm_pcb.h> +#include <netatm/atm_var.h> #include <netatm/uni/uni.h> #include <netatm/uni/sscop.h> diff --git a/sys/netatm/uni/sscf_uni_upper.c b/sys/netatm/uni/sscf_uni_upper.c index bec890222581..22822dbe9eed 100644 --- a/sys/netatm/uni/sscf_uni_upper.c +++ b/sys/netatm/uni/sscf_uni_upper.c @@ -35,7 +35,25 @@ * */ -#include <netatm/kern_include.h> +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/types.h> +#include <sys/time.h> +#include <sys/socket.h> +#include <sys/socketvar.h> +#include <sys/syslog.h> +#include <machine/clock.h> +#include <net/if.h> +#include <netatm/port.h> +#include <netatm/queue.h> +#include <netatm/atm.h> +#include <netatm/atm_sys.h> +#include <netatm/atm_sap.h> +#include <netatm/atm_cm.h> +#include <netatm/atm_if.h> +#include <netatm/atm_stack.h> +#include <netatm/atm_pcb.h> +#include <netatm/atm_var.h> #include <netatm/uni/uni.h> #include <netatm/uni/sscop.h> diff --git a/sys/netatm/uni/sscop.c b/sys/netatm/uni/sscop.c index ae67a48077b2..2eefe443a79e 100644 --- a/sys/netatm/uni/sscop.c +++ b/sys/netatm/uni/sscop.c @@ -35,7 +35,27 @@ * */ -#include <netatm/kern_include.h> +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/types.h> +#include <sys/errno.h> +#include <sys/time.h> +#include <sys/socket.h> +#include <sys/socketvar.h> +#include <sys/syslog.h> +#include <machine/clock.h> +#include <net/if.h> +#include <netatm/port.h> +#include <netatm/queue.h> +#include <netatm/atm.h> +#include <netatm/atm_sys.h> +#include <netatm/atm_sap.h> +#include <netatm/atm_cm.h> +#include <netatm/atm_if.h> +#include <netatm/atm_vc.h> +#include <netatm/atm_stack.h> +#include <netatm/atm_pcb.h> +#include <netatm/atm_var.h> #include <netatm/uni/sscop.h> #include <netatm/uni/sscop_misc.h> diff --git a/sys/netatm/uni/sscop_lower.c b/sys/netatm/uni/sscop_lower.c index 23d6ca8d50b3..7e7b17f00fcc 100644 --- a/sys/netatm/uni/sscop_lower.c +++ b/sys/netatm/uni/sscop_lower.c @@ -35,7 +35,25 @@ * */ -#include <netatm/kern_include.h> +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/types.h> +#include <sys/time.h> +#include <sys/socket.h> +#include <sys/socketvar.h> +#include <sys/syslog.h> +#include <machine/clock.h> +#include <net/if.h> +#include <netatm/port.h> +#include <netatm/queue.h> +#include <netatm/atm.h> +#include <netatm/atm_sys.h> +#include <netatm/atm_sap.h> +#include <netatm/atm_cm.h> +#include <netatm/atm_if.h> +#include <netatm/atm_stack.h> +#include <netatm/atm_pcb.h> +#include <netatm/atm_var.h> #include <netatm/uni/sscop.h> #include <netatm/uni/sscop_misc.h> diff --git a/sys/netatm/uni/sscop_pdu.c b/sys/netatm/uni/sscop_pdu.c index 2668b776b756..56a1e2e3d3b6 100644 --- a/sys/netatm/uni/sscop_pdu.c +++ b/sys/netatm/uni/sscop_pdu.c @@ -35,7 +35,25 @@ * */ -#include <netatm/kern_include.h> +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/types.h> +#include <sys/time.h> +#include <sys/socket.h> +#include <sys/socketvar.h> +#include <machine/clock.h> +#include <net/if.h> +#include <netatm/port.h> +#include <netatm/queue.h> +#include <netatm/atm.h> +#include <netatm/atm_sys.h> +#include <netatm/atm_sap.h> +#include <netatm/atm_cm.h> +#include <netatm/atm_if.h> +#include <netatm/atm_vc.h> +#include <netatm/atm_stack.h> +#include <netatm/atm_pcb.h> +#include <netatm/atm_var.h> #include <netatm/uni/sscop.h> #include <netatm/uni/sscop_misc.h> diff --git a/sys/netatm/uni/sscop_sigaa.c b/sys/netatm/uni/sscop_sigaa.c index 5588914e945a..4e46b4316873 100644 --- a/sys/netatm/uni/sscop_sigaa.c +++ b/sys/netatm/uni/sscop_sigaa.c @@ -35,7 +35,18 @@ * */ -#include <netatm/kern_include.h> +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/types.h> +#include <sys/time.h> +#include <sys/socket.h> +#include <machine/clock.h> +#include <net/if.h> +#include <netatm/port.h> +#include <netatm/queue.h> +#include <netatm/atm.h> +#include <netatm/atm_sys.h> +#include <netatm/atm_cm.h> #include <netatm/uni/sscop.h> #include <netatm/uni/sscop_misc.h> diff --git a/sys/netatm/uni/sscop_sigcpcs.c b/sys/netatm/uni/sscop_sigcpcs.c index edaabb6d3cb6..0a345d3f6ab4 100644 --- a/sys/netatm/uni/sscop_sigcpcs.c +++ b/sys/netatm/uni/sscop_sigcpcs.c @@ -35,7 +35,24 @@ * */ -#include <netatm/kern_include.h> +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/types.h> +#include <sys/time.h> +#include <sys/socket.h> +#include <sys/socketvar.h> +#include <machine/clock.h> +#include <net/if.h> +#include <netatm/port.h> +#include <netatm/queue.h> +#include <netatm/atm.h> +#include <netatm/atm_sys.h> +#include <netatm/atm_sap.h> +#include <netatm/atm_cm.h> +#include <netatm/atm_if.h> +#include <netatm/atm_stack.h> +#include <netatm/atm_pcb.h> +#include <netatm/atm_var.h> #include <netatm/uni/sscop.h> #include <netatm/uni/sscop_misc.h> diff --git a/sys/netatm/uni/sscop_subr.c b/sys/netatm/uni/sscop_subr.c index 172de7420f63..9adcccaa2742 100644 --- a/sys/netatm/uni/sscop_subr.c +++ b/sys/netatm/uni/sscop_subr.c @@ -35,7 +35,25 @@ * */ -#include <netatm/kern_include.h> +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/types.h> +#include <sys/time.h> +#include <sys/socket.h> +#include <sys/socketvar.h> +#include <sys/syslog.h> +#include <machine/clock.h> +#include <net/if.h> +#include <netatm/port.h> +#include <netatm/queue.h> +#include <netatm/atm.h> +#include <netatm/atm_sys.h> +#include <netatm/atm_sap.h> +#include <netatm/atm_cm.h> +#include <netatm/atm_if.h> +#include <netatm/atm_stack.h> +#include <netatm/atm_pcb.h> +#include <netatm/atm_var.h> #include <netatm/uni/sscop.h> #include <netatm/uni/sscop_misc.h> diff --git a/sys/netatm/uni/sscop_timer.c b/sys/netatm/uni/sscop_timer.c index 9947ced826d8..e5fb97e68067 100644 --- a/sys/netatm/uni/sscop_timer.c +++ b/sys/netatm/uni/sscop_timer.c @@ -35,7 +35,25 @@ * */ -#include <netatm/kern_include.h> +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/types.h> +#include <sys/time.h> +#include <sys/socket.h> +#include <sys/socketvar.h> +#include <sys/syslog.h> +#include <machine/clock.h> +#include <net/if.h> +#include <netatm/port.h> +#include <netatm/queue.h> +#include <netatm/atm.h> +#include <netatm/atm_sys.h> +#include <netatm/atm_sap.h> +#include <netatm/atm_cm.h> +#include <netatm/atm_if.h> +#include <netatm/atm_stack.h> +#include <netatm/atm_pcb.h> +#include <netatm/atm_var.h> #include <netatm/uni/sscop.h> #include <netatm/uni/sscop_misc.h> diff --git a/sys/netatm/uni/sscop_upper.c b/sys/netatm/uni/sscop_upper.c index 733b76dd6ec2..4c5ed4dc4289 100644 --- a/sys/netatm/uni/sscop_upper.c +++ b/sys/netatm/uni/sscop_upper.c @@ -35,7 +35,25 @@ * */ -#include <netatm/kern_include.h> +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/types.h> +#include <sys/time.h> +#include <sys/socket.h> +#include <sys/socketvar.h> +#include <sys/syslog.h> +#include <machine/clock.h> +#include <net/if.h> +#include <netatm/port.h> +#include <netatm/queue.h> +#include <netatm/atm.h> +#include <netatm/atm_sys.h> +#include <netatm/atm_sap.h> +#include <netatm/atm_cm.h> +#include <netatm/atm_if.h> +#include <netatm/atm_stack.h> +#include <netatm/atm_pcb.h> +#include <netatm/atm_var.h> #include <netatm/uni/sscop.h> #include <netatm/uni/sscop_misc.h> diff --git a/sys/netatm/uni/uni_load.c b/sys/netatm/uni/uni_load.c index 32db92c5e089..00b5960b3749 100644 --- a/sys/netatm/uni/uni_load.c +++ b/sys/netatm/uni/uni_load.c @@ -39,7 +39,27 @@ #include "opt_atm.h" #endif -#include <netatm/kern_include.h> +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/types.h> +#include <sys/errno.h> +#include <sys/time.h> +#include <sys/kernel.h> +#include <sys/socket.h> +#include <sys/socketvar.h> +#include <sys/syslog.h> +#include <machine/clock.h> +#include <net/if.h> +#include <netatm/port.h> +#include <netatm/queue.h> +#include <netatm/atm.h> +#include <netatm/atm_sys.h> +#include <netatm/atm_sap.h> +#include <netatm/atm_cm.h> +#include <netatm/atm_if.h> +#include <netatm/atm_stack.h> +#include <netatm/atm_pcb.h> +#include <netatm/atm_var.h> #ifndef lint __RCSID("@(#) $FreeBSD$"); diff --git a/sys/netatm/uni/uniarp.c b/sys/netatm/uni/uniarp.c index a237278bcd6e..bdbe71f7da52 100644 --- a/sys/netatm/uni/uniarp.c +++ b/sys/netatm/uni/uniarp.c @@ -35,7 +35,32 @@ * */ -#include <netatm/kern_include.h> +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/types.h> +#include <sys/errno.h> +#include <sys/malloc.h> +#include <sys/time.h> +#include <sys/socket.h> +#include <sys/socketvar.h> +#include <sys/syslog.h> +#include <machine/clock.h> +#include <net/if.h> +#include <netinet/in.h> +#include <netinet/in_var.h> +#include <netatm/port.h> +#include <netatm/queue.h> +#include <netatm/atm.h> +#include <netatm/atm_sys.h> +#include <netatm/atm_sap.h> +#include <netatm/atm_cm.h> +#include <netatm/atm_if.h> +#include <netatm/atm_vc.h> +#include <netatm/atm_ioctl.h> +#include <netatm/atm_sigmgr.h> +#include <netatm/atm_stack.h> +#include <netatm/atm_pcb.h> +#include <netatm/atm_var.h> #include <netatm/ipatm/ipatm_var.h> #include <netatm/ipatm/ipatm_serv.h> diff --git a/sys/netatm/uni/uniarp_cache.c b/sys/netatm/uni/uniarp_cache.c index 6e08e57db388..40f64a06c305 100644 --- a/sys/netatm/uni/uniarp_cache.c +++ b/sys/netatm/uni/uniarp_cache.c @@ -35,7 +35,30 @@ * */ -#include <netatm/kern_include.h> +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/types.h> +#include <sys/errno.h> +#include <sys/time.h> +#include <sys/socket.h> +#include <sys/socketvar.h> +#include <sys/syslog.h> +#include <machine/clock.h> +#include <net/if.h> +#include <netinet/in.h> +#include <netatm/port.h> +#include <netatm/queue.h> +#include <netatm/atm.h> +#include <netatm/atm_sys.h> +#include <netatm/atm_sap.h> +#include <netatm/atm_cm.h> +#include <netatm/atm_if.h> +#include <netatm/atm_vc.h> +#include <netatm/atm_ioctl.h> +#include <netatm/atm_sigmgr.h> +#include <netatm/atm_stack.h> +#include <netatm/atm_pcb.h> +#include <netatm/atm_var.h> #include <netatm/ipatm/ipatm_var.h> #include <netatm/ipatm/ipatm_serv.h> diff --git a/sys/netatm/uni/uniarp_input.c b/sys/netatm/uni/uniarp_input.c index 0fdef9ba0002..bfcbf1d7b522 100644 --- a/sys/netatm/uni/uniarp_input.c +++ b/sys/netatm/uni/uniarp_input.c @@ -35,7 +35,31 @@ * */ -#include <netatm/kern_include.h> +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/types.h> +#include <sys/time.h> +#include <sys/socket.h> +#include <sys/socketvar.h> +#include <sys/syslog.h> +#include <machine/clock.h> +#include <net/if.h> +#include <netinet/in.h> +#include <netinet/in_var.h> +#include <netinet/if_ether.h> +#include <netatm/port.h> +#include <netatm/queue.h> +#include <netatm/atm.h> +#include <netatm/atm_sys.h> +#include <netatm/atm_sap.h> +#include <netatm/atm_cm.h> +#include <netatm/atm_if.h> +#include <netatm/atm_vc.h> +#include <netatm/atm_ioctl.h> +#include <netatm/atm_sigmgr.h> +#include <netatm/atm_stack.h> +#include <netatm/atm_pcb.h> +#include <netatm/atm_var.h> #include <netatm/ipatm/ipatm_var.h> #include <netatm/ipatm/ipatm_serv.h> diff --git a/sys/netatm/uni/uniarp_output.c b/sys/netatm/uni/uniarp_output.c index f8cd594caac1..1b097eb98768 100644 --- a/sys/netatm/uni/uniarp_output.c +++ b/sys/netatm/uni/uniarp_output.c @@ -35,7 +35,28 @@ * */ -#include <netatm/kern_include.h> +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/types.h> +#include <sys/time.h> +#include <sys/socket.h> +#include <sys/socketvar.h> +#include <machine/clock.h> +#include <net/if.h> +#include <netinet/in.h> +#include <netinet/in_var.h> +#include <netinet/if_ether.h> +#include <netatm/port.h> +#include <netatm/queue.h> +#include <netatm/atm.h> +#include <netatm/atm_sys.h> +#include <netatm/atm_sap.h> +#include <netatm/atm_cm.h> +#include <netatm/atm_if.h> +#include <netatm/atm_sigmgr.h> +#include <netatm/atm_stack.h> +#include <netatm/atm_pcb.h> +#include <netatm/atm_var.h> #include <netatm/ipatm/ipatm_var.h> #include <netatm/ipatm/ipatm_serv.h> diff --git a/sys/netatm/uni/uniarp_timer.c b/sys/netatm/uni/uniarp_timer.c index 0c2ea88af375..575d32a34bcf 100644 --- a/sys/netatm/uni/uniarp_timer.c +++ b/sys/netatm/uni/uniarp_timer.c @@ -35,7 +35,26 @@ * */ -#include <netatm/kern_include.h> +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/types.h> +#include <sys/time.h> +#include <sys/socket.h> +#include <sys/socketvar.h> +#include <machine/clock.h> +#include <net/if.h> +#include <netinet/in.h> +#include <netatm/port.h> +#include <netatm/queue.h> +#include <netatm/atm.h> +#include <netatm/atm_sys.h> +#include <netatm/atm_sap.h> +#include <netatm/atm_cm.h> +#include <netatm/atm_if.h> +#include <netatm/atm_ioctl.h> +#include <netatm/atm_stack.h> +#include <netatm/atm_pcb.h> +#include <netatm/atm_var.h> #include <netatm/ipatm/ipatm_var.h> #include <netatm/ipatm/ipatm_serv.h> diff --git a/sys/netatm/uni/uniarp_vcm.c b/sys/netatm/uni/uniarp_vcm.c index a7d2de8b15a4..3ae7f06f1f63 100644 --- a/sys/netatm/uni/uniarp_vcm.c +++ b/sys/netatm/uni/uniarp_vcm.c @@ -35,7 +35,27 @@ * */ -#include <netatm/kern_include.h> +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/types.h> +#include <sys/time.h> +#include <sys/socket.h> +#include <sys/socketvar.h> +#include <machine/clock.h> +#include <net/if.h> +#include <netinet/in.h> +#include <netinet/in_var.h> +#include <netatm/port.h> +#include <netatm/queue.h> +#include <netatm/atm.h> +#include <netatm/atm_sys.h> +#include <netatm/atm_sap.h> +#include <netatm/atm_cm.h> +#include <netatm/atm_if.h> +#include <netatm/atm_ioctl.h> +#include <netatm/atm_stack.h> +#include <netatm/atm_pcb.h> +#include <netatm/atm_var.h> #include <netatm/ipatm/ipatm_var.h> #include <netatm/ipatm/ipatm_serv.h> diff --git a/sys/netatm/uni/uniip.c b/sys/netatm/uni/uniip.c index c0a40854bfd9..3519cc15c6b6 100644 --- a/sys/netatm/uni/uniip.c +++ b/sys/netatm/uni/uniip.c @@ -35,7 +35,27 @@ * */ -#include <netatm/kern_include.h> +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/types.h> +#include <sys/errno.h> +#include <sys/malloc.h> +#include <sys/time.h> +#include <sys/socket.h> +#include <sys/socketvar.h> +#include <machine/clock.h> +#include <net/if.h> +#include <netinet/in.h> +#include <netatm/port.h> +#include <netatm/queue.h> +#include <netatm/atm.h> +#include <netatm/atm_sys.h> +#include <netatm/atm_sap.h> +#include <netatm/atm_cm.h> +#include <netatm/atm_if.h> +#include <netatm/atm_stack.h> +#include <netatm/atm_pcb.h> +#include <netatm/atm_var.h> #include <netatm/ipatm/ipatm_var.h> #include <netatm/ipatm/ipatm_serv.h> diff --git a/sys/netatm/uni/unisig_decode.c b/sys/netatm/uni/unisig_decode.c index 6313c11178a2..e3bae48d442a 100644 --- a/sys/netatm/uni/unisig_decode.c +++ b/sys/netatm/uni/unisig_decode.c @@ -35,7 +35,28 @@ * */ -#include <netatm/kern_include.h> +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/types.h> +#include <sys/errno.h> +#include <sys/time.h> +#include <sys/socket.h> +#include <sys/socketvar.h> +#include <sys/syslog.h> +#include <machine/clock.h> +#include <net/if.h> +#include <netatm/port.h> +#include <netatm/queue.h> +#include <netatm/atm.h> +#include <netatm/atm_sys.h> +#include <netatm/atm_sap.h> +#include <netatm/atm_cm.h> +#include <netatm/atm_if.h> +#include <netatm/atm_vc.h> +#include <netatm/atm_sigmgr.h> +#include <netatm/atm_stack.h> +#include <netatm/atm_pcb.h> +#include <netatm/atm_var.h> #include <netatm/uni/unisig_var.h> #include <netatm/uni/unisig_msg.h> diff --git a/sys/netatm/uni/unisig_encode.c b/sys/netatm/uni/unisig_encode.c index 8a670d237b1d..a201c26427b4 100644 --- a/sys/netatm/uni/unisig_encode.c +++ b/sys/netatm/uni/unisig_encode.c @@ -35,7 +35,28 @@ * */ -#include <netatm/kern_include.h> +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/types.h> +#include <sys/errno.h> +#include <sys/time.h> +#include <sys/socket.h> +#include <sys/socketvar.h> +#include <sys/syslog.h> +#include <machine/clock.h> +#include <net/if.h> +#include <netatm/port.h> +#include <netatm/queue.h> +#include <netatm/atm.h> +#include <netatm/atm_sys.h> +#include <netatm/atm_sap.h> +#include <netatm/atm_cm.h> +#include <netatm/atm_if.h> +#include <netatm/atm_vc.h> +#include <netatm/atm_sigmgr.h> +#include <netatm/atm_stack.h> +#include <netatm/atm_pcb.h> +#include <netatm/atm_var.h> #include <netatm/uni/unisig_var.h> #include <netatm/uni/unisig_msg.h> diff --git a/sys/netatm/uni/unisig_if.c b/sys/netatm/uni/unisig_if.c index 4b559a5ff645..da49a548156b 100644 --- a/sys/netatm/uni/unisig_if.c +++ b/sys/netatm/uni/unisig_if.c @@ -35,7 +35,31 @@ * */ -#include <netatm/kern_include.h> +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/types.h> +#include <sys/errno.h> +#include <sys/malloc.h> +#include <sys/time.h> +#include <sys/socket.h> +#include <sys/socketvar.h> +#include <sys/syslog.h> +#include <machine/clock.h> +#include <net/if.h> +#include <netinet/in.h> +#include <netatm/port.h> +#include <netatm/queue.h> +#include <netatm/atm.h> +#include <netatm/atm_sys.h> +#include <netatm/atm_sap.h> +#include <netatm/atm_cm.h> +#include <netatm/atm_if.h> +#include <netatm/atm_vc.h> +#include <netatm/atm_ioctl.h> +#include <netatm/atm_sigmgr.h> +#include <netatm/atm_stack.h> +#include <netatm/atm_pcb.h> +#include <netatm/atm_var.h> #include <netatm/ipatm/ipatm_var.h> #include <netatm/ipatm/ipatm_serv.h> diff --git a/sys/netatm/uni/unisig_mbuf.c b/sys/netatm/uni/unisig_mbuf.c index af6d47821a7c..96088618a718 100644 --- a/sys/netatm/uni/unisig_mbuf.c +++ b/sys/netatm/uni/unisig_mbuf.c @@ -35,7 +35,27 @@ * */ -#include <netatm/kern_include.h> +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/types.h> +#include <sys/errno.h> +#include <sys/time.h> +#include <sys/socket.h> +#include <sys/socketvar.h> +#include <machine/clock.h> +#include <net/if.h> +#include <netatm/port.h> +#include <netatm/queue.h> +#include <netatm/atm.h> +#include <netatm/atm_sys.h> +#include <netatm/atm_sap.h> +#include <netatm/atm_cm.h> +#include <netatm/atm_if.h> +#include <netatm/atm_vc.h> +#include <netatm/atm_sigmgr.h> +#include <netatm/atm_stack.h> +#include <netatm/atm_pcb.h> +#include <netatm/atm_var.h> #include <netatm/uni/unisig_var.h> #include <netatm/uni/unisig_mbuf.h> diff --git a/sys/netatm/uni/unisig_msg.c b/sys/netatm/uni/unisig_msg.c index 4fb6c540dea8..9ea82162af70 100644 --- a/sys/netatm/uni/unisig_msg.c +++ b/sys/netatm/uni/unisig_msg.c @@ -35,7 +35,27 @@ * */ -#include <netatm/kern_include.h> +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/types.h> +#include <sys/errno.h> +#include <sys/time.h> +#include <sys/socket.h> +#include <sys/socketvar.h> +#include <machine/clock.h> +#include <net/if.h> +#include <netatm/port.h> +#include <netatm/queue.h> +#include <netatm/atm.h> +#include <netatm/atm_sys.h> +#include <netatm/atm_sap.h> +#include <netatm/atm_cm.h> +#include <netatm/atm_if.h> +#include <netatm/atm_vc.h> +#include <netatm/atm_sigmgr.h> +#include <netatm/atm_stack.h> +#include <netatm/atm_pcb.h> +#include <netatm/atm_var.h> #include <netatm/uni/unisig_var.h> #include <netatm/uni/unisig_msg.h> diff --git a/sys/netatm/uni/unisig_print.c b/sys/netatm/uni/unisig_print.c index 7892d034a331..8744a6bd49da 100644 --- a/sys/netatm/uni/unisig_print.c +++ b/sys/netatm/uni/unisig_print.c @@ -35,7 +35,20 @@ * */ -#include <netatm/kern_include.h> +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/types.h> +#include <sys/time.h> +#include <sys/socket.h> +#include <machine/clock.h> +#include <net/if.h> +#include <netatm/port.h> +#include <netatm/queue.h> +#include <netatm/atm.h> +#include <netatm/atm_sys.h> +#include <netatm/atm_cm.h> +#include <netatm/atm_vc.h> +#include <netatm/atm_sigmgr.h> #include <netatm/uni/unisig_var.h> #include <netatm/uni/unisig_msg.h> diff --git a/sys/netatm/uni/unisig_proto.c b/sys/netatm/uni/unisig_proto.c index eae71b64cf95..063899b8f9bf 100644 --- a/sys/netatm/uni/unisig_proto.c +++ b/sys/netatm/uni/unisig_proto.c @@ -35,7 +35,27 @@ * */ -#include <netatm/kern_include.h> +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/types.h> +#include <sys/time.h> +#include <sys/socket.h> +#include <sys/socketvar.h> +#include <sys/syslog.h> +#include <machine/clock.h> +#include <net/if.h> +#include <netatm/port.h> +#include <netatm/queue.h> +#include <netatm/atm.h> +#include <netatm/atm_sys.h> +#include <netatm/atm_sap.h> +#include <netatm/atm_cm.h> +#include <netatm/atm_if.h> +#include <netatm/atm_vc.h> +#include <netatm/atm_sigmgr.h> +#include <netatm/atm_stack.h> +#include <netatm/atm_pcb.h> +#include <netatm/atm_var.h> #include <netatm/uni/unisig_var.h> diff --git a/sys/netatm/uni/unisig_sigmgr_state.c b/sys/netatm/uni/unisig_sigmgr_state.c index e6a700d5ab55..e10f2850ed4c 100644 --- a/sys/netatm/uni/unisig_sigmgr_state.c +++ b/sys/netatm/uni/unisig_sigmgr_state.c @@ -35,7 +35,28 @@ * */ -#include <netatm/kern_include.h> +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/types.h> +#include <sys/malloc.h> +#include <sys/time.h> +#include <sys/socket.h> +#include <sys/socketvar.h> +#include <sys/syslog.h> +#include <machine/clock.h> +#include <net/if.h> +#include <netatm/port.h> +#include <netatm/queue.h> +#include <netatm/atm.h> +#include <netatm/atm_sys.h> +#include <netatm/atm_sap.h> +#include <netatm/atm_cm.h> +#include <netatm/atm_if.h> +#include <netatm/atm_vc.h> +#include <netatm/atm_sigmgr.h> +#include <netatm/atm_stack.h> +#include <netatm/atm_pcb.h> +#include <netatm/atm_var.h> #include <netatm/uni/uni.h> #include <netatm/uni/unisig.h> diff --git a/sys/netatm/uni/unisig_subr.c b/sys/netatm/uni/unisig_subr.c index 7420cd100e30..952e417fdcb7 100644 --- a/sys/netatm/uni/unisig_subr.c +++ b/sys/netatm/uni/unisig_subr.c @@ -35,7 +35,27 @@ * */ -#include <netatm/kern_include.h> +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/types.h> +#include <sys/errno.h> +#include <sys/time.h> +#include <sys/socket.h> +#include <sys/socketvar.h> +#include <machine/clock.h> +#include <net/if.h> +#include <netatm/port.h> +#include <netatm/queue.h> +#include <netatm/atm.h> +#include <netatm/atm_sys.h> +#include <netatm/atm_sap.h> +#include <netatm/atm_cm.h> +#include <netatm/atm_if.h> +#include <netatm/atm_vc.h> +#include <netatm/atm_sigmgr.h> +#include <netatm/atm_stack.h> +#include <netatm/atm_pcb.h> +#include <netatm/atm_var.h> #include <netatm/uni/unisig_var.h> #include <netatm/uni/unisig_msg.h> diff --git a/sys/netatm/uni/unisig_util.c b/sys/netatm/uni/unisig_util.c index 5fb82c8176d0..09d35aa3683f 100644 --- a/sys/netatm/uni/unisig_util.c +++ b/sys/netatm/uni/unisig_util.c @@ -35,7 +35,27 @@ * */ -#include <netatm/kern_include.h> +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/types.h> +#include <sys/time.h> +#include <sys/socket.h> +#include <sys/socketvar.h> +#include <sys/syslog.h> +#include <machine/clock.h> +#include <net/if.h> +#include <netatm/port.h> +#include <netatm/queue.h> +#include <netatm/atm.h> +#include <netatm/atm_sys.h> +#include <netatm/atm_sap.h> +#include <netatm/atm_cm.h> +#include <netatm/atm_if.h> +#include <netatm/atm_vc.h> +#include <netatm/atm_sigmgr.h> +#include <netatm/atm_stack.h> +#include <netatm/atm_pcb.h> +#include <netatm/atm_var.h> #include <netatm/uni/unisig_var.h> #include <netatm/uni/unisig_msg.h> diff --git a/sys/netatm/uni/unisig_vc_state.c b/sys/netatm/uni/unisig_vc_state.c index 7b66ed0f3cc3..0ba75e21bb0e 100644 --- a/sys/netatm/uni/unisig_vc_state.c +++ b/sys/netatm/uni/unisig_vc_state.c @@ -35,7 +35,28 @@ * */ -#include <netatm/kern_include.h> +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/types.h> +#include <sys/errno.h> +#include <sys/time.h> +#include <sys/socket.h> +#include <sys/socketvar.h> +#include <sys/syslog.h> +#include <machine/clock.h> +#include <net/if.h> +#include <netatm/port.h> +#include <netatm/queue.h> +#include <netatm/atm.h> +#include <netatm/atm_sys.h> +#include <netatm/atm_sap.h> +#include <netatm/atm_cm.h> +#include <netatm/atm_if.h> +#include <netatm/atm_vc.h> +#include <netatm/atm_sigmgr.h> +#include <netatm/atm_stack.h> +#include <netatm/atm_pcb.h> +#include <netatm/atm_var.h> #include <netatm/uni/unisig_var.h> #include <netatm/uni/unisig_msg.h> |