diff options
67 files changed, 13 insertions, 275 deletions
diff --git a/sys/i4b/driver/i4b_ctl.c b/sys/i4b/driver/i4b_ctl.c index a5c7597..87ccfe7 100644 --- a/sys/i4b/driver/i4b_ctl.c +++ b/sys/i4b/driver/i4b_ctl.c @@ -47,7 +47,6 @@ #if defined(__FreeBSD__) && __FreeBSD__ >= 3 #include <sys/ioccom.h> -#include <i386/isa/isa_device.h> #else #include <sys/ioctl.h> #endif @@ -55,9 +54,6 @@ #include <sys/kernel.h> #include <sys/systm.h> #include <sys/conf.h> -#include <sys/mbuf.h> -#include <sys/proc.h> -#include <sys/fcntl.h> #include <sys/socket.h> #include <net/if.h> @@ -87,7 +83,6 @@ #endif #include <i4b/include/i4b_global.h> -#include <i4b/include/i4b_mbuf.h> #include <i4b/include/i4b_l3l4.h> #include <i4b/layer2/i4b_l2.h> diff --git a/sys/i4b/driver/i4b_ing.c b/sys/i4b/driver/i4b_ing.c index b68fb58..4c1119f 100644 --- a/sys/i4b/driver/i4b_ing.c +++ b/sys/i4b/driver/i4b_ing.c @@ -47,9 +47,6 @@ #include <sys/mbuf.h> #include <sys/socket.h> #include <sys/errno.h> -#include <sys/ctype.h> -#include <sys/ioccom.h> -#include <sys/syslog.h> #include <sys/malloc.h> #include <net/if.h> @@ -62,7 +59,6 @@ #include <machine/i4b_debug.h> #include <i4b/include/i4b_global.h> -#include <i4b/include/i4b_mbuf.h> #include <i4b/include/i4b_l3l4.h> #include <i4b/layer4/i4b_l4.h> diff --git a/sys/i4b/driver/i4b_ipr.c b/sys/i4b/driver/i4b_ipr.c index 4e7533f..4d76cb9 100644 --- a/sys/i4b/driver/i4b_ipr.c +++ b/sys/i4b/driver/i4b_ipr.c @@ -86,12 +86,10 @@ #endif #include <sys/kernel.h> -#include <sys/protosw.h> #include <net/if.h> #include <net/if_types.h> #include <net/netisr.h> -#include <net/route.h> #include <netinet/in.h> #include <netinet/in_systm.h> @@ -136,7 +134,6 @@ #endif #include <i4b/include/i4b_global.h> -#include <i4b/include/i4b_mbuf.h> #include <i4b/include/i4b_l3l4.h> #include <i4b/layer4/i4b_l4.h> diff --git a/sys/i4b/driver/i4b_isppp.c b/sys/i4b/driver/i4b_isppp.c index 45ed303..408b174 100644 --- a/sys/i4b/driver/i4b_isppp.c +++ b/sys/i4b/driver/i4b_isppp.c @@ -70,16 +70,12 @@ #include <sys/ioccom.h> #include <sys/sockio.h> #include <sys/kernel.h> -#include <sys/protosw.h> #include <net/if.h> #include <net/if_types.h> -#include <net/netisr.h> -#include <net/route.h> #include <netinet/in.h> #include <netinet/in_systm.h> -#include <netinet/in_var.h> #include <netinet/ip.h> #include <net/slcompress.h> @@ -116,7 +112,6 @@ #endif #include <i4b/include/i4b_global.h> -#include <i4b/include/i4b_mbuf.h> #include <i4b/include/i4b_l3l4.h> #include <i4b/layer4/i4b_l4.h> diff --git a/sys/i4b/driver/i4b_ispppsubr.c b/sys/i4b/driver/i4b_ispppsubr.c index a7785e3..7b3a1f9 100644 --- a/sys/i4b/driver/i4b_ispppsubr.c +++ b/sys/i4b/driver/i4b_ispppsubr.c @@ -43,14 +43,6 @@ #include <sys/socket.h> #include <sys/syslog.h> -#if defined(__FreeBSD__) -#if defined (__FreeBSD_version) && __FreeBSD_version <= 400000 -#include <machine/random.h> -#else -#include <sys/random.h> -#endif -#endif - #include <sys/malloc.h> #include <sys/mbuf.h> diff --git a/sys/i4b/driver/i4b_rbch.c b/sys/i4b/driver/i4b_rbch.c index 53af7bc..59247c2 100644 --- a/sys/i4b/driver/i4b_rbch.c +++ b/sys/i4b/driver/i4b_rbch.c @@ -48,7 +48,6 @@ #include <sys/mbuf.h> #include <sys/socket.h> #include <net/if.h> -#include <sys/proc.h> #include <sys/tty.h> #if defined(__NetBSD__) && __NetBSD_Version__ >= 104230000 diff --git a/sys/i4b/driver/i4b_tel.c b/sys/i4b/driver/i4b_tel.c index 0a1c423..8daf30d 100644 --- a/sys/i4b/driver/i4b_tel.c +++ b/sys/i4b/driver/i4b_tel.c @@ -58,7 +58,6 @@ #include <sys/mbuf.h> #include <sys/socket.h> #include <net/if.h> -#include <sys/proc.h> #include <sys/tty.h> #ifdef __FreeBSD__ diff --git a/sys/i4b/driver/i4b_trace.c b/sys/i4b/driver/i4b_trace.c index 3847508..0d10771 100644 --- a/sys/i4b/driver/i4b_trace.c +++ b/sys/i4b/driver/i4b_trace.c @@ -56,7 +56,6 @@ #include <sys/mbuf.h> #include <sys/socket.h> #include <net/if.h> -#include <sys/proc.h> #include <sys/tty.h> #ifdef __FreeBSD__ diff --git a/sys/i4b/layer1/i4b_l1dmux.c b/sys/i4b/layer1/i4b_l1dmux.c index 115ae3a..c65bb8c 100644 --- a/sys/i4b/layer1/i4b_l1dmux.c +++ b/sys/i4b/layer1/i4b_l1dmux.c @@ -42,12 +42,8 @@ #include "ihfc.h" #include <sys/param.h> -#include <sys/kernel.h> #include <sys/systm.h> -#include <sys/mbuf.h> -#include <sys/socket.h> -#include <net/if.h> #include <machine/i4b_debug.h> #include <machine/i4b_ioctl.h> @@ -56,7 +52,6 @@ #include <i4b/layer1/i4b_l1.h> #include <i4b/include/i4b_l1l2.h> -#include <i4b/include/i4b_mbuf.h> #include <i4b/include/i4b_global.h> /* diff --git a/sys/i4b/layer1/i4b_l1lib.c b/sys/i4b/layer1/i4b_l1lib.c index e4b0cd8..6e2791e 100644 --- a/sys/i4b/layer1/i4b_l1lib.c +++ b/sys/i4b/layer1/i4b_l1lib.c @@ -36,12 +36,8 @@ *---------------------------------------------------------------------------*/ #include <sys/param.h> -#include <sys/kernel.h> #include <sys/systm.h> -#include <sys/mbuf.h> -#include <sys/socket.h> -#include <net/if.h> #include <machine/i4b_debug.h> #include <machine/i4b_ioctl.h> diff --git a/sys/i4b/layer1/ifpi/i4b_ifpi_isac.c b/sys/i4b/layer1/ifpi/i4b_ifpi_isac.c index 4c09daf..95f61e8 100644 --- a/sys/i4b/layer1/ifpi/i4b_ifpi_isac.c +++ b/sys/i4b/layer1/ifpi/i4b_ifpi_isac.c @@ -43,7 +43,6 @@ #include "opt_i4b.h" #include <sys/param.h> -#include <sys/kernel.h> #include <sys/systm.h> #include <sys/mbuf.h> #include <sys/socket.h> diff --git a/sys/i4b/layer1/ifpi/i4b_ifpi_l1.c b/sys/i4b/layer1/ifpi/i4b_ifpi_l1.c index eb0aa2c..249632e 100644 --- a/sys/i4b/layer1/ifpi/i4b_ifpi_l1.c +++ b/sys/i4b/layer1/ifpi/i4b_ifpi_l1.c @@ -41,7 +41,6 @@ #if (NIFPI > 0) && (NPCI > 0) #include <sys/param.h> -#include <sys/kernel.h> #include <sys/systm.h> #include <sys/mbuf.h> #include <sys/socket.h> diff --git a/sys/i4b/layer1/ifpi/i4b_ifpi_l1fsm.c b/sys/i4b/layer1/ifpi/i4b_ifpi_l1fsm.c index 2605387..e2d04ea 100644 --- a/sys/i4b/layer1/ifpi/i4b_ifpi_l1fsm.c +++ b/sys/i4b/layer1/ifpi/i4b_ifpi_l1fsm.c @@ -43,7 +43,6 @@ #include <sys/param.h> #include <sys/kernel.h> #include <sys/systm.h> -#include <sys/mbuf.h> #include <sys/socket.h> #include <machine/stdarg.h> diff --git a/sys/i4b/layer1/ifpnp/i4b_ifpnp_isac.c b/sys/i4b/layer1/ifpnp/i4b_ifpnp_isac.c index 206e3f9..7df6a23 100644 --- a/sys/i4b/layer1/ifpnp/i4b_ifpnp_isac.c +++ b/sys/i4b/layer1/ifpnp/i4b_ifpnp_isac.c @@ -43,7 +43,6 @@ #include "opt_i4b.h" #include <sys/param.h> -#include <sys/kernel.h> #include <sys/systm.h> #include <sys/mbuf.h> #include <sys/socket.h> diff --git a/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1.c b/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1.c index 3a90224..ffa0d6d 100644 --- a/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1.c +++ b/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1.c @@ -41,7 +41,6 @@ #if (NIFPNP > 0) #include <sys/param.h> -#include <sys/kernel.h> #include <sys/systm.h> #include <sys/mbuf.h> #include <sys/socket.h> diff --git a/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1fsm.c b/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1fsm.c index c3bc5e9..90c9bd1 100644 --- a/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1fsm.c +++ b/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1fsm.c @@ -43,7 +43,6 @@ #include <sys/param.h> #include <sys/kernel.h> #include <sys/systm.h> -#include <sys/mbuf.h> #include <sys/socket.h> #include <machine/stdarg.h> diff --git a/sys/i4b/layer1/ihfc/i4b_ihfc_drv.c b/sys/i4b/layer1/ihfc/i4b_ihfc_drv.c index bd56be2..215a639 100644 --- a/sys/i4b/layer1/ihfc/i4b_ihfc_drv.c +++ b/sys/i4b/layer1/ihfc/i4b_ihfc_drv.c @@ -44,16 +44,13 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/socket.h> #include <net/if.h> #include <sys/mbuf.h> #include <machine/clock.h> -#include <i4b/include/i4b_global.h> #include <i4b/include/i4b_mbuf.h> -#include <i4b/include/i4b_l1l2.h> #include <machine/i4b_debug.h> #include <machine/i4b_ioctl.h> @@ -67,10 +64,8 @@ #include <machine/bus.h> #include <machine/resource.h> -#include <sys/bus.h> #include <sys/rman.h> -#include <isa/isavar.h> /*---------------------------------------------------------------------------* * Local prototypes diff --git a/sys/i4b/layer1/ihfc/i4b_ihfc_l1if.c b/sys/i4b/layer1/ihfc/i4b_ihfc_l1if.c index 4f9f4e9..f5ee661 100644 --- a/sys/i4b/layer1/ihfc/i4b_ihfc_l1if.c +++ b/sys/i4b/layer1/ihfc/i4b_ihfc_l1if.c @@ -61,7 +61,6 @@ #include <i4b/include/i4b_mbuf.h> #include <i4b/include/i4b_global.h> -#include <i4b/include/i4b_l1l2.h> #include <i4b/layer1/i4b_l1.h> #include <i4b/layer1/ihfc/i4b_ihfc.h> diff --git a/sys/i4b/layer1/ihfc/i4b_ihfc_pnp.c b/sys/i4b/layer1/ihfc/i4b_ihfc_pnp.c index f8fb9af..56828e2 100644 --- a/sys/i4b/layer1/ihfc/i4b_ihfc_pnp.c +++ b/sys/i4b/layer1/ihfc/i4b_ihfc_pnp.c @@ -49,12 +49,9 @@ #include <sys/socket.h> #include <net/if.h> -#include <sys/mbuf.h> #include <machine/clock.h> #include <i4b/include/i4b_global.h> -#include <i4b/include/i4b_mbuf.h> -#include <i4b/include/i4b_l1l2.h> #include <machine/i4b_ioctl.h> #include <machine/i4b_trace.h> diff --git a/sys/i4b/layer1/isic/i4b_asuscom_ipac.c b/sys/i4b/layer1/isic/i4b_asuscom_ipac.c index 5d696c1..726081d 100644 --- a/sys/i4b/layer1/isic/i4b_asuscom_ipac.c +++ b/sys/i4b/layer1/isic/i4b_asuscom_ipac.c @@ -44,7 +44,7 @@ * * $FreeBSD$ * - * last edit-date: [Mon May 29 16:41:56 2000] + * last edit-date: [Fri Oct 13 15:59:33 2000] * *---------------------------------------------------------------------------*/ @@ -54,9 +54,7 @@ #if (NISIC > 0) && defined (ASUSCOM_IPAC) #include <sys/param.h> -#include <sys/kernel.h> #include <sys/systm.h> -#include <sys/mbuf.h> #include <sys/socket.h> #include <machine/clock.h> @@ -66,10 +64,6 @@ #include <machine/i4b_debug.h> #include <machine/i4b_ioctl.h> -#include <i4b/include/i4b_global.h> -/* #include <i4b/include/i4b_l1l2.h> */ -#include <i4b/include/i4b_mbuf.h> - #include <i4b/layer1/isic/i4b_isic.h> #include <i4b/layer1/isic/i4b_ipac.h> #include <i4b/layer1/isic/i4b_isac.h> diff --git a/sys/i4b/layer1/isic/i4b_avm_a1.c b/sys/i4b/layer1/isic/i4b_avm_a1.c index ee076f0..0f5b63a 100644 --- a/sys/i4b/layer1/isic/i4b_avm_a1.c +++ b/sys/i4b/layer1/isic/i4b_avm_a1.c @@ -49,9 +49,7 @@ #if NISIC > 0 && defined(AVM_A1) #include <sys/param.h> -#include <sys/kernel.h> #include <sys/systm.h> -#include <sys/mbuf.h> #include <sys/socket.h> #include <net/if.h> @@ -61,7 +59,6 @@ #include <machine/i4b_debug.h> #include <machine/i4b_ioctl.h> -#include <i4b/include/i4b_global.h> #include <i4b/layer1/isic/i4b_isic.h> #include <i4b/layer1/isic/i4b_isac.h> diff --git a/sys/i4b/layer1/isic/i4b_bchan.c b/sys/i4b/layer1/isic/i4b_bchan.c index 1fb6cc6..d63909c 100644 --- a/sys/i4b/layer1/isic/i4b_bchan.c +++ b/sys/i4b/layer1/isic/i4b_bchan.c @@ -40,7 +40,6 @@ #if NISIC > 0 #include <sys/param.h> -#include <sys/kernel.h> #include <sys/systm.h> #include <sys/mbuf.h> #include <machine/stdarg.h> diff --git a/sys/i4b/layer1/isic/i4b_ctx_s0P.c b/sys/i4b/layer1/isic/i4b_ctx_s0P.c index c58b691..0dd42ec 100644 --- a/sys/i4b/layer1/isic/i4b_ctx_s0P.c +++ b/sys/i4b/layer1/isic/i4b_ctx_s0P.c @@ -31,7 +31,7 @@ * * $FreeBSD$ * - * last edit-date: [Tue Aug 22 11:35:00 2000] + * last edit-date: [Fri Oct 13 15:59:45 2000] * * Note: this driver works for the Creatix ISDN S0-16 P+P and * for the Teles S0/16.3 PnP card. Although they are not @@ -48,9 +48,7 @@ #if (NISIC > 0) && (defined(CRTX_S0_P) || defined(TEL_S0_16_3_P)) #include <sys/param.h> -#include <sys/kernel.h> #include <sys/systm.h> -#include <sys/mbuf.h> #include <sys/socket.h> #include <machine/clock.h> @@ -60,15 +58,11 @@ #include <machine/i4b_debug.h> #include <machine/i4b_ioctl.h> -#include <i4b/include/i4b_global.h> #include <i4b/layer1/isic/i4b_isic.h> #include <i4b/layer1/isic/i4b_isac.h> #include <i4b/layer1/isic/i4b_hscx.h> -/* #include <i4b/include/i4b_l1l2.h> */ -#include <i4b/include/i4b_mbuf.h> - /*---------------------------------------------------------------------------* * Creatix / Teles PnP ISAC get fifo routine *---------------------------------------------------------------------------*/ diff --git a/sys/i4b/layer1/isic/i4b_drn_ngo.c b/sys/i4b/layer1/isic/i4b_drn_ngo.c index 042dbb2..24b68d9 100644 --- a/sys/i4b/layer1/isic/i4b_drn_ngo.c +++ b/sys/i4b/layer1/isic/i4b_drn_ngo.c @@ -41,9 +41,7 @@ #if (NISIC > 0) && defined(DRN_NGO) #include <sys/param.h> -#include <sys/kernel.h> #include <sys/systm.h> -#include <sys/mbuf.h> #include <sys/socket.h> #include <machine/clock.h> @@ -53,7 +51,6 @@ #include <machine/i4b_debug.h> #include <machine/i4b_ioctl.h> -#include <i4b/include/i4b_global.h> #include <i4b/layer1/isic/i4b_isic.h> #include <i4b/layer1/isic/i4b_isac.h> diff --git a/sys/i4b/layer1/isic/i4b_dynalink.c b/sys/i4b/layer1/isic/i4b_dynalink.c index 67e6bbe..a9efd08 100644 --- a/sys/i4b/layer1/isic/i4b_dynalink.c +++ b/sys/i4b/layer1/isic/i4b_dynalink.c @@ -76,7 +76,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/mbuf.h> #include <sys/socket.h> #include <machine/clock.h> diff --git a/sys/i4b/layer1/isic/i4b_elsa_pcc16.c b/sys/i4b/layer1/isic/i4b_elsa_pcc16.c index ef8786a..0ce2143 100644 --- a/sys/i4b/layer1/isic/i4b_elsa_pcc16.c +++ b/sys/i4b/layer1/isic/i4b_elsa_pcc16.c @@ -33,7 +33,7 @@ * * $FreeBSD$ * - * last edit-date: [Wed Jul 19 09:53:35 2000] + * last edit-date: [Fri Oct 13 16:00:01 2000] * *---------------------------------------------------------------------------*/ @@ -43,9 +43,7 @@ #if (NISIC > 0) && defined(ELSA_PCC16) #include <sys/param.h> -#include <sys/kernel.h> #include <sys/systm.h> -#include <sys/mbuf.h> #include <sys/socket.h> #include <net/if.h> @@ -54,10 +52,6 @@ #include <machine/i4b_debug.h> #include <machine/i4b_ioctl.h> -#include <i4b/include/i4b_global.h> -/* #include <i4b/include/i4b_l1l2.h> */ -#include <i4b/include/i4b_mbuf.h> - #include <i4b/layer1/isic/i4b_isic.h> #include <i4b/layer1/isic/i4b_isac.h> #include <i4b/layer1/isic/i4b_hscx.h> diff --git a/sys/i4b/layer1/isic/i4b_elsa_qs1i.c b/sys/i4b/layer1/isic/i4b_elsa_qs1i.c index 40d4705..b4e642a 100644 --- a/sys/i4b/layer1/isic/i4b_elsa_qs1i.c +++ b/sys/i4b/layer1/isic/i4b_elsa_qs1i.c @@ -31,7 +31,7 @@ * * $FreeBSD$ * - * last edit-date: [Mon May 29 16:44:08 2000] + * last edit-date: [Fri Oct 13 16:00:15 2000] * *---------------------------------------------------------------------------*/ @@ -41,9 +41,7 @@ #if (NISIC > 0) && defined(ELSA_QS1ISA) #include <sys/param.h> -#include <sys/kernel.h> #include <sys/systm.h> -#include <sys/mbuf.h> #include <sys/socket.h> #include <net/if.h> @@ -52,10 +50,6 @@ #include <machine/i4b_debug.h> #include <machine/i4b_ioctl.h> -#include <i4b/include/i4b_global.h> -/* #include <i4b/include/i4b_l1l2.h> */ -#include <i4b/include/i4b_mbuf.h> - #include <i4b/layer1/isic/i4b_isic.h> #include <i4b/layer1/isic/i4b_isac.h> #include <i4b/layer1/isic/i4b_hscx.h> diff --git a/sys/i4b/layer1/isic/i4b_elsa_qs1p.c b/sys/i4b/layer1/isic/i4b_elsa_qs1p.c index 9a94422..6f57b01 100644 --- a/sys/i4b/layer1/isic/i4b_elsa_qs1p.c +++ b/sys/i4b/layer1/isic/i4b_elsa_qs1p.c @@ -31,7 +31,7 @@ * * $FreeBSD$ * - * last edit-date: [Fri Jun 2 13:57:26 2000] + * last edit-date: [Fri Oct 13 16:00:24 2000] * * Note: ELSA Quickstep 1000pro PCI = ELSA MicroLink ISDN/PCI * @@ -46,7 +46,6 @@ #include <sys/param.h> #include <sys/kernel.h> #include <sys/systm.h> -#include <sys/mbuf.h> #include <sys/socket.h> #include <net/if.h> @@ -63,10 +62,6 @@ #include <machine/i4b_debug.h> #include <machine/i4b_ioctl.h> -#include <i4b/include/i4b_global.h> -/* #include <i4b/include/i4b_l1l2.h> */ -#include <i4b/include/i4b_mbuf.h> - #include <i4b/layer1/isic/i4b_isic.h> #include <i4b/layer1/isic/i4b_isac.h> #include <i4b/layer1/isic/i4b_hscx.h> diff --git a/sys/i4b/layer1/isic/i4b_hscx.c b/sys/i4b/layer1/isic/i4b_hscx.c index 7731cb2..40ef206 100644 --- a/sys/i4b/layer1/isic/i4b_hscx.c +++ b/sys/i4b/layer1/isic/i4b_hscx.c @@ -40,7 +40,6 @@ #if NISIC > 0 #include <sys/param.h> -#include <sys/kernel.h> #include <sys/systm.h> #include <sys/mbuf.h> #include <sys/socket.h> diff --git a/sys/i4b/layer1/isic/i4b_isac.c b/sys/i4b/layer1/isic/i4b_isac.c index 792d46b..6409653 100644 --- a/sys/i4b/layer1/isic/i4b_isac.c +++ b/sys/i4b/layer1/isic/i4b_isac.c @@ -42,7 +42,6 @@ #include "opt_i4b.h" #include <sys/param.h> -#include <sys/kernel.h> #include <sys/systm.h> #include <sys/mbuf.h> #include <sys/socket.h> diff --git a/sys/i4b/layer1/isic/i4b_isic.c b/sys/i4b/layer1/isic/i4b_isic.c index 97cbf73..cc8719d 100644 --- a/sys/i4b/layer1/isic/i4b_isic.c +++ b/sys/i4b/layer1/isic/i4b_isic.c @@ -41,9 +41,7 @@ #if NISIC > 0 #include <sys/param.h> -#include <sys/kernel.h> #include <sys/systm.h> -#include <sys/mbuf.h> #include <sys/socket.h> #include <net/if.h> @@ -61,7 +59,6 @@ #include <i4b/layer1/isic/i4b_isac.h> #include <i4b/layer1/isic/i4b_hscx.h> -#include <i4b/include/i4b_mbuf.h> #include <i4b/include/i4b_global.h> static char *ISACversion[] = { diff --git a/sys/i4b/layer1/isic/i4b_isic_isa.c b/sys/i4b/layer1/isic/i4b_isic_isa.c index 40b05bd..f11e61f 100644 --- a/sys/i4b/layer1/isic/i4b_isic_isa.c +++ b/sys/i4b/layer1/isic/i4b_isic_isa.c @@ -31,7 +31,7 @@ * * $FreeBSD$ * - * last edit-date: [Mon May 29 16:45:34 2000] + * last edit-date: [Fri Oct 13 16:00:46 2000] * *---------------------------------------------------------------------------*/ @@ -43,7 +43,6 @@ #include <sys/param.h> #include <sys/kernel.h> #include <sys/systm.h> -#include <sys/mbuf.h> #include <sys/socket.h> #include <net/if.h> @@ -58,11 +57,6 @@ #include <i4b/layer1/isic/i4b_isac.h> #include <i4b/layer1/isic/i4b_hscx.h> -/* #include <i4b/include/i4b_l1l2.h> */ -#include <i4b/include/i4b_mbuf.h> -#include <i4b/include/i4b_global.h> - -#include <sys/resource.h> #include <sys/bus.h> #include <isa/isavar.h> diff --git a/sys/i4b/layer1/isic/i4b_isic_pnp.c b/sys/i4b/layer1/isic/i4b_isic_pnp.c index 3fe6595..7ab4ba7 100644 --- a/sys/i4b/layer1/isic/i4b_isic_pnp.c +++ b/sys/i4b/layer1/isic/i4b_isic_pnp.c @@ -58,7 +58,6 @@ #include <machine/clock.h> -#include <i4b/include/i4b_global.h> #include <machine/i4b_ioctl.h> #include <i4b/layer1/isic/i4b_isic.h> diff --git a/sys/i4b/layer1/isic/i4b_itk_ix1.c b/sys/i4b/layer1/isic/i4b_itk_ix1.c index 9bf94c5..101c983 100644 --- a/sys/i4b/layer1/isic/i4b_itk_ix1.c +++ b/sys/i4b/layer1/isic/i4b_itk_ix1.c @@ -68,9 +68,7 @@ #if NISIC > 0 && defined(ITKIX1) #include <sys/param.h> -#include <sys/kernel.h> #include <sys/systm.h> -#include <sys/mbuf.h> #include <sys/socket.h> #include <machine/clock.h> @@ -84,8 +82,6 @@ #include <i4b/layer1/isic/i4b_isac.h> #include <i4b/layer1/isic/i4b_hscx.h> -#include <i4b/include/i4b_global.h> -#include <i4b/include/i4b_mbuf.h> /* Register offsets */ #define ITK_ISAC_DATA 0 diff --git a/sys/i4b/layer1/isic/i4b_l1.c b/sys/i4b/layer1/isic/i4b_l1.c index f19eda8..6a25764 100644 --- a/sys/i4b/layer1/isic/i4b_l1.c +++ b/sys/i4b/layer1/isic/i4b_l1.c @@ -40,7 +40,6 @@ #if NISIC > 0 #include <sys/param.h> -#include <sys/kernel.h> #include <sys/systm.h> #include <sys/mbuf.h> #include <sys/socket.h> diff --git a/sys/i4b/layer1/isic/i4b_l1fsm.c b/sys/i4b/layer1/isic/i4b_l1fsm.c index d3ce147..7563b4b 100644 --- a/sys/i4b/layer1/isic/i4b_l1fsm.c +++ b/sys/i4b/layer1/isic/i4b_l1fsm.c @@ -42,7 +42,6 @@ #include <sys/param.h> #include <sys/kernel.h> #include <sys/systm.h> -#include <sys/mbuf.h> #include <sys/socket.h> #include <machine/stdarg.h> diff --git a/sys/i4b/layer1/isic/i4b_siemens_isurf.c b/sys/i4b/layer1/isic/i4b_siemens_isurf.c index 52a70ec..3d73f8e 100644 --- a/sys/i4b/layer1/isic/i4b_siemens_isurf.c +++ b/sys/i4b/layer1/isic/i4b_siemens_isurf.c @@ -41,7 +41,7 @@ * * $FreeBSD$ * - * last edit-date: [Mon May 29 16:46:31 2000] + * last edit-date: [Fri Oct 13 16:00:57 2000] * *---------------------------------------------------------------------------*/ @@ -51,9 +51,7 @@ #if NISIC > 0 && defined(SIEMENS_ISURF2) #include <sys/param.h> -#include <sys/kernel.h> #include <sys/systm.h> -#include <sys/mbuf.h> #include <sys/socket.h> #include <machine/clock.h> @@ -63,10 +61,6 @@ #include <machine/i4b_debug.h> #include <machine/i4b_ioctl.h> -#include <i4b/include/i4b_global.h> -/* #include <i4b/include/i4b_l1l2.h> */ -#include <i4b/include/i4b_mbuf.h> - #include <i4b/layer1/isic/i4b_isic.h> #include <i4b/layer1/isic/i4b_ipac.h> #include <i4b/layer1/isic/i4b_isac.h> diff --git a/sys/i4b/layer1/isic/i4b_sws.c b/sys/i4b/layer1/isic/i4b_sws.c index 4815001..d31b27c 100644 --- a/sys/i4b/layer1/isic/i4b_sws.c +++ b/sys/i4b/layer1/isic/i4b_sws.c @@ -48,7 +48,7 @@ * * $FreeBSD$ * - * last edit-date: [Mon May 29 16:46:49 2000] + * last edit-date: [Fri Oct 13 16:01:10 2000] * *---------------------------------------------------------------------------*/ @@ -68,9 +68,7 @@ #define SWS_REGS 8 /* we use an area of 8 bytes for io */ #include <sys/param.h> -#include <sys/kernel.h> #include <sys/systm.h> -#include <sys/mbuf.h> #include <sys/socket.h> #include <machine/clock.h> @@ -84,10 +82,6 @@ #include <i4b/layer1/isic/i4b_isac.h> #include <i4b/layer1/isic/i4b_hscx.h> -#include <i4b/include/i4b_global.h> -/* #include <i4b/include/i4b_l1l2.h> */ -#include <i4b/include/i4b_mbuf.h> - /*---------------------------------------------------------------------------* * SWS P&P ISAC get fifo routine *---------------------------------------------------------------------------*/ diff --git a/sys/i4b/layer1/isic/i4b_tel_s016.c b/sys/i4b/layer1/isic/i4b_tel_s016.c index 8f4cebb..47630ea 100644 --- a/sys/i4b/layer1/isic/i4b_tel_s016.c +++ b/sys/i4b/layer1/isic/i4b_tel_s016.c @@ -41,7 +41,7 @@ * * $FreeBSD$ * - * last edit-date: [Mon May 29 16:46:56 2000] + * last edit-date: [Fri Oct 13 16:01:20 2000] * *---------------------------------------------------------------------------*/ @@ -51,9 +51,7 @@ #if NISIC > 0 && defined(TEL_S0_16) #include <sys/param.h> -#include <sys/kernel.h> #include <sys/systm.h> -#include <sys/mbuf.h> #include <sys/socket.h> #include <machine/clock.h> @@ -68,10 +66,6 @@ #include <i4b/layer1/isic/i4b_isac.h> #include <i4b/layer1/isic/i4b_hscx.h> -#include <i4b/include/i4b_global.h> -/* #include <i4b/include/i4b_l1l2.h> */ -#include <i4b/include/i4b_mbuf.h> - #define TELES_S016_MEMSIZE 0x1000 static u_char intr_no[] = { 1, 1, 0, 2, 4, 6, 1, 1, 1, 0, 8, 10, 12, 1, 1, 14 }; diff --git a/sys/i4b/layer1/isic/i4b_tel_s0163.c b/sys/i4b/layer1/isic/i4b_tel_s0163.c index fa31cd9..28b96b2 100644 --- a/sys/i4b/layer1/isic/i4b_tel_s0163.c +++ b/sys/i4b/layer1/isic/i4b_tel_s0163.c @@ -41,7 +41,7 @@ * * $FreeBSD$ * - * last edit-date: [Mon May 29 16:47:08 2000] + * last edit-date: [Fri Oct 13 16:01:29 2000] * *---------------------------------------------------------------------------*/ @@ -51,9 +51,7 @@ #if NISIC > 0 && defined(TEL_S0_16_3) #include <sys/param.h> -#include <sys/kernel.h> #include <sys/systm.h> -#include <sys/mbuf.h> #include <sys/socket.h> #include <machine/clock.h> @@ -67,10 +65,6 @@ #include <i4b/layer1/isic/i4b_isac.h> #include <i4b/layer1/isic/i4b_hscx.h> -#include <i4b/include/i4b_global.h> -/* #include <i4b/include/i4b_l1l2.h> */ -#include <i4b/include/i4b_mbuf.h> - static u_char intr_no[] = { 1, 1, 0, 2, 4, 6, 1, 1, 1, 0, 8, 10, 12, 1, 1, 14 }; #define ISAC_OFFS 0x400 diff --git a/sys/i4b/layer1/isic/i4b_tel_s08.c b/sys/i4b/layer1/isic/i4b_tel_s08.c index c6578b1..85a6eb2 100644 --- a/sys/i4b/layer1/isic/i4b_tel_s08.c +++ b/sys/i4b/layer1/isic/i4b_tel_s08.c @@ -41,7 +41,7 @@ * * $FreeBSD$ * - * last edit-date: [Mon May 29 16:47:20 2000] + * last edit-date: [Fri Oct 13 16:01:42 2000] * *---------------------------------------------------------------------------*/ @@ -51,9 +51,7 @@ #if NISIC > 0 && defined(TEL_S0_8) #include <sys/param.h> -#include <sys/kernel.h> #include <sys/systm.h> -#include <sys/mbuf.h> #include <sys/socket.h> #include <machine/clock.h> @@ -68,10 +66,6 @@ #include <i4b/layer1/isic/i4b_isac.h> #include <i4b/layer1/isic/i4b_hscx.h> -#include <i4b/include/i4b_global.h> -/* #include <i4b/include/i4b_l1l2.h> */ -#include <i4b/include/i4b_mbuf.h> - #define TELES_S08_MEMSIZE 0x1000 static const bus_size_t offset[] = { 0x100, 0x180, 0x1c0 }; diff --git a/sys/i4b/layer1/isic/i4b_usr_sti.c b/sys/i4b/layer1/isic/i4b_usr_sti.c index 0bf8430..684240c 100644 --- a/sys/i4b/layer1/isic/i4b_usr_sti.c +++ b/sys/i4b/layer1/isic/i4b_usr_sti.c @@ -45,13 +45,10 @@ #if (NISIC > 0) && defined(USR_STI) #include <sys/param.h> -#include <sys/kernel.h> #include <sys/systm.h> -#include <sys/mbuf.h> #ifdef __FreeBSD__ #include <machine/clock.h> -#include <i386/isa/isa_device.h> #include <machine/bus.h> #include <machine/resource.h> #include <sys/bus.h> @@ -76,7 +73,6 @@ #include <i4b/layer1/isic/i4b_isac.h> #include <i4b/layer1/isic/i4b_hscx.h> -#include <i4b/include/i4b_global.h> /*---------------------------------------------------------------------------* * USR Sportster TA intern special registers diff --git a/sys/i4b/layer1/iwic/i4b_iwic_bchan.c b/sys/i4b/layer1/iwic/i4b_iwic_bchan.c index e6bbaca..7918844 100644 --- a/sys/i4b/layer1/iwic/i4b_iwic_bchan.c +++ b/sys/i4b/layer1/iwic/i4b_iwic_bchan.c @@ -44,7 +44,6 @@ #if (NIWIC > 0) && (NPCI > 0) #include <sys/param.h> -#include <sys/kernel.h> #include <sys/systm.h> #include <sys/mbuf.h> #include <sys/socket.h> diff --git a/sys/i4b/layer1/iwic/i4b_iwic_dchan.c b/sys/i4b/layer1/iwic/i4b_iwic_dchan.c index b088505..5db03bf 100644 --- a/sys/i4b/layer1/iwic/i4b_iwic_dchan.c +++ b/sys/i4b/layer1/iwic/i4b_iwic_dchan.c @@ -42,7 +42,6 @@ #if (NIWIC > 0) && (NPCI > 0) #include <sys/param.h> -#include <sys/kernel.h> #include <sys/systm.h> #include <sys/mbuf.h> #include <sys/socket.h> diff --git a/sys/i4b/layer1/iwic/i4b_iwic_fsm.c b/sys/i4b/layer1/iwic/i4b_iwic_fsm.c index 2737fc6..7c0dd6f 100644 --- a/sys/i4b/layer1/iwic/i4b_iwic_fsm.c +++ b/sys/i4b/layer1/iwic/i4b_iwic_fsm.c @@ -42,9 +42,7 @@ #if (NIWIC > 0) && (NPCI > 0) #include <sys/param.h> -#include <sys/kernel.h> #include <sys/systm.h> -#include <sys/mbuf.h> #include <sys/socket.h> #include <net/if.h> @@ -56,9 +54,7 @@ #include <i4b/layer1/i4b_l1.h> -#include <i4b/include/i4b_global.h> #include <i4b/include/i4b_l3l4.h> -#include <i4b/include/i4b_mbuf.h> #include <i4b/layer1/iwic/i4b_iwic.h> #include <i4b/layer1/iwic/i4b_w6692.h> diff --git a/sys/i4b/layer1/iwic/i4b_iwic_l1if.c b/sys/i4b/layer1/iwic/i4b_iwic_l1if.c index e0208cc..e38365d 100644 --- a/sys/i4b/layer1/iwic/i4b_iwic_l1if.c +++ b/sys/i4b/layer1/iwic/i4b_iwic_l1if.c @@ -42,9 +42,7 @@ #if (NIWIC > 0) && (NPCI > 0) #include <sys/param.h> -#include <sys/kernel.h> #include <sys/systm.h> -#include <sys/mbuf.h> #include <sys/socket.h> #include <net/if.h> @@ -52,11 +50,7 @@ #include <machine/bus.h> #include <machine/resource.h> -#include <sys/bus.h> -#include <sys/rman.h> -#include <pci/pcireg.h> -#include <pci/pcivar.h> #include <machine/i4b_debug.h> #include <machine/i4b_ioctl.h> @@ -64,7 +58,6 @@ #include <i4b/include/i4b_global.h> #include <i4b/include/i4b_l3l4.h> -#include <i4b/include/i4b_mbuf.h> #include <i4b/layer1/i4b_l1.h> diff --git a/sys/i4b/layer1/iwic/i4b_iwic_pci.c b/sys/i4b/layer1/iwic/i4b_iwic_pci.c index e503b2f..4975b0c 100644 --- a/sys/i4b/layer1/iwic/i4b_iwic_pci.c +++ b/sys/i4b/layer1/iwic/i4b_iwic_pci.c @@ -44,7 +44,6 @@ #include <sys/param.h> #include <sys/kernel.h> #include <sys/systm.h> -#include <sys/mbuf.h> #include <sys/socket.h> #include <net/if.h> @@ -64,7 +63,6 @@ #include <i4b/include/i4b_global.h> #include <i4b/include/i4b_l3l4.h> -#include <i4b/include/i4b_mbuf.h> #include <i4b/layer1/i4b_l1.h> diff --git a/sys/i4b/layer2/i4b_iframe.c b/sys/i4b/layer2/i4b_iframe.c index aedd2a0..da9285b 100644 --- a/sys/i4b/layer2/i4b_iframe.c +++ b/sys/i4b/layer2/i4b_iframe.c @@ -66,7 +66,6 @@ #include <i4b/include/i4b_global.h> #include <i4b/include/i4b_l1l2.h> #include <i4b/include/i4b_l2l3.h> -#include <i4b/include/i4b_isdnq931.h> #include <i4b/include/i4b_mbuf.h> #include <i4b/layer2/i4b_l2.h> diff --git a/sys/i4b/layer2/i4b_l2.c b/sys/i4b/layer2/i4b_l2.c index 6f76196..8d565e0 100644 --- a/sys/i4b/layer2/i4b_l2.c +++ b/sys/i4b/layer2/i4b_l2.c @@ -43,7 +43,6 @@ #if NI4BQ921 > 0 #include <sys/param.h> -#include <sys/kernel.h> #include <sys/systm.h> #include <sys/mbuf.h> #include <sys/socket.h> @@ -63,7 +62,6 @@ #include <i4b/include/i4b_l1l2.h> #include <i4b/include/i4b_l2l3.h> -#include <i4b/include/i4b_isdnq931.h> #include <i4b/include/i4b_mbuf.h> #include <i4b/include/i4b_global.h> diff --git a/sys/i4b/layer2/i4b_l2fsm.c b/sys/i4b/layer2/i4b_l2fsm.c index 51912ab..441b314 100644 --- a/sys/i4b/layer2/i4b_l2fsm.c +++ b/sys/i4b/layer2/i4b_l2fsm.c @@ -43,9 +43,7 @@ #if NI4BQ921 > 0 #include <sys/param.h> -#include <sys/kernel.h> #include <sys/systm.h> -#include <sys/mbuf.h> #include <sys/socket.h> #include <net/if.h> @@ -62,9 +60,7 @@ #endif #include <i4b/include/i4b_global.h> -#include <i4b/include/i4b_l1l2.h> #include <i4b/include/i4b_l2l3.h> -#include <i4b/include/i4b_isdnq931.h> #include <i4b/include/i4b_mbuf.h> #include <i4b/layer2/i4b_l2.h> diff --git a/sys/i4b/layer2/i4b_l2timer.c b/sys/i4b/layer2/i4b_l2timer.c index d06d205..1192466 100644 --- a/sys/i4b/layer2/i4b_l2timer.c +++ b/sys/i4b/layer2/i4b_l2timer.c @@ -45,7 +45,6 @@ #include <sys/param.h> #include <sys/kernel.h> #include <sys/systm.h> -#include <sys/mbuf.h> #include <sys/socket.h> #include <net/if.h> @@ -62,10 +61,6 @@ #endif #include <i4b/include/i4b_global.h> -#include <i4b/include/i4b_l1l2.h> -#include <i4b/include/i4b_l2l3.h> -#include <i4b/include/i4b_isdnq931.h> -#include <i4b/include/i4b_mbuf.h> #include <i4b/layer2/i4b_l2.h> #include <i4b/layer2/i4b_l2fsm.h> diff --git a/sys/i4b/layer2/i4b_lme.c b/sys/i4b/layer2/i4b_lme.c index 429ddc2..c3c82c3 100644 --- a/sys/i4b/layer2/i4b_lme.c +++ b/sys/i4b/layer2/i4b_lme.c @@ -43,9 +43,7 @@ #if NI4BQ921 > 0 #include <sys/param.h> -#include <sys/kernel.h> #include <sys/systm.h> -#include <sys/mbuf.h> #include <sys/socket.h> #include <net/if.h> @@ -61,13 +59,8 @@ #include <i4b/i4b_ioctl.h> #endif -#include <i4b/include/i4b_l1l2.h> -#include <i4b/include/i4b_l2l3.h> -#include <i4b/include/i4b_isdnq931.h> -#include <i4b/include/i4b_mbuf.h> #include <i4b/layer2/i4b_l2.h> -#include <i4b/layer2/i4b_l2fsm.h> /*---------------------------------------------------------------------------* * mdl assign indication handler diff --git a/sys/i4b/layer2/i4b_mbuf.c b/sys/i4b/layer2/i4b_mbuf.c index ea6f479..a0f1013 100644 --- a/sys/i4b/layer2/i4b_mbuf.c +++ b/sys/i4b/layer2/i4b_mbuf.c @@ -38,15 +38,10 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/mbuf.h> -#include <sys/tty.h> -#include <sys/proc.h> -#include <sys/uio.h> -#include <sys/kernel.h> #include <sys/socket.h> #include <net/if.h> #include <i4b/include/i4b_mbuf.h> -#include <i4b/include/i4b_global.h> #define I4B_MBUF_DEBUG #undef I4B_MBUF_TYPE_DEBUG diff --git a/sys/i4b/layer2/i4b_sframe.c b/sys/i4b/layer2/i4b_sframe.c index 5e3ef26..31da522 100644 --- a/sys/i4b/layer2/i4b_sframe.c +++ b/sys/i4b/layer2/i4b_sframe.c @@ -43,7 +43,6 @@ #if NI4BQ921 > 0 #include <sys/param.h> -#include <sys/kernel.h> #include <sys/systm.h> #include <sys/mbuf.h> #include <sys/socket.h> @@ -62,8 +61,6 @@ #endif #include <i4b/include/i4b_l1l2.h> -#include <i4b/include/i4b_l2l3.h> -#include <i4b/include/i4b_isdnq931.h> #include <i4b/include/i4b_mbuf.h> #include <i4b/layer2/i4b_l2.h> diff --git a/sys/i4b/layer2/i4b_tei.c b/sys/i4b/layer2/i4b_tei.c index b07074b..53ed1fe 100644 --- a/sys/i4b/layer2/i4b_tei.c +++ b/sys/i4b/layer2/i4b_tei.c @@ -31,7 +31,7 @@ * * $FreeBSD$ * - * last edit-date: [Fri Sep 1 16:04:58 2000] + * last edit-date: [Fri Oct 13 15:56:35 2000] * *---------------------------------------------------------------------------*/ @@ -43,7 +43,6 @@ #if NI4BQ921 > 0 #include <sys/param.h> -#include <sys/kernel.h> #include <sys/systm.h> #include <sys/syslog.h> #include <sys/mbuf.h> @@ -54,14 +53,6 @@ #include <sys/callout.h> #endif -#if defined(__FreeBSD__) -#if defined (__FreeBSD_version) && __FreeBSD_version <= 400000 -#include <machine/random.h> -#else -#include <sys/random.h> -#endif -#endif - #ifdef __FreeBSD__ #include <machine/i4b_debug.h> #include <machine/i4b_ioctl.h> @@ -73,7 +64,6 @@ #include <i4b/include/i4b_global.h> #include <i4b/include/i4b_l1l2.h> #include <i4b/include/i4b_l2l3.h> -#include <i4b/include/i4b_isdnq931.h> #include <i4b/include/i4b_mbuf.h> #include <i4b/layer2/i4b_l2.h> diff --git a/sys/i4b/layer2/i4b_uframe.c b/sys/i4b/layer2/i4b_uframe.c index 7376eb5..c29eb5e 100644 --- a/sys/i4b/layer2/i4b_uframe.c +++ b/sys/i4b/layer2/i4b_uframe.c @@ -43,7 +43,6 @@ #if NI4BQ921 > 0 #include <sys/param.h> -#include <sys/kernel.h> #include <sys/systm.h> #include <sys/mbuf.h> #include <sys/socket.h> @@ -63,7 +62,6 @@ #include <i4b/include/i4b_l1l2.h> #include <i4b/include/i4b_l2l3.h> -#include <i4b/include/i4b_isdnq931.h> #include <i4b/include/i4b_mbuf.h> #include <i4b/layer2/i4b_l2.h> diff --git a/sys/i4b/layer2/i4b_util.c b/sys/i4b/layer2/i4b_util.c index 676c877..ba94bd0 100644 --- a/sys/i4b/layer2/i4b_util.c +++ b/sys/i4b/layer2/i4b_util.c @@ -43,7 +43,6 @@ #if NI4BQ921 > 0 #include <sys/param.h> -#include <sys/kernel.h> #include <sys/systm.h> #include <sys/mbuf.h> #include <sys/socket.h> @@ -63,12 +62,9 @@ #include <i4b/include/i4b_global.h> #include <i4b/include/i4b_l1l2.h> -#include <i4b/include/i4b_l2l3.h> -#include <i4b/include/i4b_isdnq931.h> #include <i4b/include/i4b_mbuf.h> #include <i4b/layer2/i4b_l2.h> -#include <i4b/layer2/i4b_l2fsm.h> /*---------------------------------------------------------------------------* * routine ESTABLISH DATA LINK (Q.921 03/93 page 83) diff --git a/sys/i4b/layer3/i4b_l2if.c b/sys/i4b/layer3/i4b_l2if.c index fda8622..f6cb507 100644 --- a/sys/i4b/layer3/i4b_l2if.c +++ b/sys/i4b/layer3/i4b_l2if.c @@ -43,11 +43,8 @@ #if NI4BQ931 > 0 #include <sys/param.h> -#include <sys/kernel.h> #include <sys/systm.h> #include <sys/mbuf.h> -#include <sys/socket.h> -#include <net/if.h> #if defined(__NetBSD__) && __NetBSD_Version__ >= 104230000 #include <sys/callout.h> @@ -72,7 +69,6 @@ #include <i4b/layer3/i4b_l3fsm.h> #include <i4b/layer3/i4b_q931.h> -#include <i4b/layer4/i4b_l4.h> static unsigned char make_q931_cause(cause_t cause); diff --git a/sys/i4b/layer3/i4b_l3fsm.c b/sys/i4b/layer3/i4b_l3fsm.c index 64babfb..e8e6ad7 100644 --- a/sys/i4b/layer3/i4b_l3fsm.c +++ b/sys/i4b/layer3/i4b_l3fsm.c @@ -43,11 +43,8 @@ #if NI4BQ931 > 0 #include <sys/param.h> -#include <sys/kernel.h> #include <sys/systm.h> #include <sys/mbuf.h> -#include <sys/socket.h> -#include <net/if.h> #if defined(__NetBSD__) && __NetBSD_Version__ >= 104230000 #include <sys/callout.h> @@ -63,15 +60,12 @@ #include <i4b/i4b_cause.h> #endif -#include <i4b/include/i4b_isdnq931.h> #include <i4b/include/i4b_l2l3.h> #include <i4b/include/i4b_l3l4.h> -#include <i4b/include/i4b_mbuf.h> #include <i4b/include/i4b_global.h> #include <i4b/layer3/i4b_l3.h> #include <i4b/layer3/i4b_l3fsm.h> -#include <i4b/layer3/i4b_q931.h> #include <i4b/layer4/i4b_l4.h> diff --git a/sys/i4b/layer3/i4b_l3timer.c b/sys/i4b/layer3/i4b_l3timer.c index 66dffe4..add27ad 100644 --- a/sys/i4b/layer3/i4b_l3timer.c +++ b/sys/i4b/layer3/i4b_l3timer.c @@ -46,8 +46,6 @@ #include <sys/kernel.h> #include <sys/systm.h> #include <sys/mbuf.h> -#include <sys/socket.h> -#include <net/if.h> #if defined(__NetBSD__) && __NetBSD_Version__ >= 104230000 #include <sys/callout.h> @@ -62,16 +60,11 @@ #endif #include <i4b/include/i4b_global.h> -#include <i4b/include/i4b_isdnq931.h> -#include <i4b/include/i4b_l2l3.h> #include <i4b/include/i4b_l3l4.h> -#include <i4b/include/i4b_mbuf.h> #include <i4b/layer3/i4b_l3.h> #include <i4b/layer3/i4b_l3fsm.h> -#include <i4b/layer3/i4b_q931.h> -#include <i4b/layer4/i4b_l4.h> /*---------------------------------------------------------------------------* * stop all layer 3 timers diff --git a/sys/i4b/layer3/i4b_l4if.c b/sys/i4b/layer3/i4b_l4if.c index a963288..112f0a4 100644 --- a/sys/i4b/layer3/i4b_l4if.c +++ b/sys/i4b/layer3/i4b_l4if.c @@ -43,11 +43,8 @@ #if NI4BQ931 > 0 #include <sys/param.h> -#include <sys/kernel.h> #include <sys/systm.h> #include <sys/mbuf.h> -#include <sys/socket.h> -#include <net/if.h> #if defined(__NetBSD__) && __NetBSD_Version__ >= 104230000 #include <sys/callout.h> @@ -63,15 +60,12 @@ #include <i4b/i4b_cause.h> #endif -#include <i4b/include/i4b_isdnq931.h> #include <i4b/include/i4b_l2l3.h> #include <i4b/include/i4b_l3l4.h> -#include <i4b/include/i4b_mbuf.h> #include <i4b/include/i4b_global.h> #include <i4b/layer3/i4b_l3.h> #include <i4b/layer3/i4b_l3fsm.h> -#include <i4b/layer3/i4b_q931.h> #include <i4b/layer4/i4b_l4.h> diff --git a/sys/i4b/layer3/i4b_q931.c b/sys/i4b/layer3/i4b_q931.c index 3e8f7ff..c72f283 100644 --- a/sys/i4b/layer3/i4b_q931.c +++ b/sys/i4b/layer3/i4b_q931.c @@ -44,11 +44,8 @@ #if NI4BQ931 > 0 #include <sys/param.h> -#include <sys/kernel.h> #include <sys/systm.h> #include <sys/mbuf.h> -#include <sys/socket.h> -#include <net/if.h> #if defined(__NetBSD__) && __NetBSD_Version__ >= 104230000 #include <sys/callout.h> @@ -65,9 +62,7 @@ #endif #include <i4b/include/i4b_isdnq931.h> -#include <i4b/include/i4b_l2l3.h> #include <i4b/include/i4b_l3l4.h> -#include <i4b/include/i4b_mbuf.h> #include <i4b/include/i4b_global.h> #include <i4b/layer3/i4b_l3.h> diff --git a/sys/i4b/layer3/i4b_q932fac.c b/sys/i4b/layer3/i4b_q932fac.c index 4ef2644..99a7608 100644 --- a/sys/i4b/layer3/i4b_q932fac.c +++ b/sys/i4b/layer3/i4b_q932fac.c @@ -43,11 +43,8 @@ #if NI4BQ931 > 0 #include <sys/param.h> -#include <sys/kernel.h> #include <sys/systm.h> #include <sys/mbuf.h> -#include <sys/socket.h> -#include <net/if.h> #if defined(__NetBSD__) && __NetBSD_Version__ >= 104230000 #include <sys/callout.h> @@ -61,17 +58,11 @@ #include <i4b/i4b_ioctl.h> #endif -#include <i4b/include/i4b_isdnq931.h> -#include <i4b/include/i4b_l2l3.h> #include <i4b/include/i4b_l3l4.h> -#include <i4b/include/i4b_mbuf.h> #include <i4b/layer3/i4b_l3.h> -#include <i4b/layer3/i4b_l3fsm.h> -#include <i4b/layer3/i4b_q931.h> #include <i4b/layer3/i4b_q932fac.h> -#include <i4b/layer4/i4b_l4.h> static int do_component(int length); static void next_state(int class, int form, int code, int val); diff --git a/sys/i4b/layer4/i4b_i4bdrv.c b/sys/i4b/layer4/i4b_i4bdrv.c index ed61e64..d02a159 100644 --- a/sys/i4b/layer4/i4b_i4bdrv.c +++ b/sys/i4b/layer4/i4b_i4bdrv.c @@ -60,8 +60,6 @@ #include <sys/systm.h> #include <sys/conf.h> #include <sys/mbuf.h> -#include <sys/proc.h> -#include <sys/fcntl.h> #include <sys/socket.h> #include <sys/select.h> #include <net/if.h> diff --git a/sys/i4b/layer4/i4b_l4.c b/sys/i4b/layer4/i4b_l4.c index fbb14f1..5430c3a 100644 --- a/sys/i4b/layer4/i4b_l4.c +++ b/sys/i4b/layer4/i4b_l4.c @@ -43,12 +43,7 @@ #include <sys/param.h> #include <sys/kernel.h> #include <sys/systm.h> -#include <sys/conf.h> #include <sys/mbuf.h> -#include <sys/proc.h> -#include <sys/fcntl.h> -#include <sys/socket.h> -#include <net/if.h> #ifdef __NetBSD__ #include <sys/types.h> @@ -85,7 +80,6 @@ #include <i4b/include/i4b_global.h> #include <i4b/include/i4b_l3l4.h> #include <i4b/include/i4b_mbuf.h> -#include <i4b/layer3/i4b_l3.h> #include <i4b/layer4/i4b_l4.h> #if !defined(__FreeBSD__) && !defined(__NetBSD__) diff --git a/sys/i4b/layer4/i4b_l4mgmt.c b/sys/i4b/layer4/i4b_l4mgmt.c index 01ef0ff..183f751 100644 --- a/sys/i4b/layer4/i4b_l4mgmt.c +++ b/sys/i4b/layer4/i4b_l4mgmt.c @@ -31,7 +31,7 @@ * * $FreeBSD$ * - * last edit-date: [Fri Sep 1 16:06:44 2000] + * last edit-date: [Fri Oct 13 15:58:34 2000] * *---------------------------------------------------------------------------*/ @@ -40,24 +40,13 @@ #if NI4B > 0 #include <sys/param.h> -#include <sys/kernel.h> #include <sys/systm.h> #include <sys/mbuf.h> -#include <sys/socket.h> -#include <net/if.h> #if defined(__NetBSD__) && __NetBSD_Version__ >= 104230000 #include <sys/callout.h> #endif -#if defined(__FreeBSD__) -#if defined (__FreeBSD_version) && __FreeBSD_version <= 400000 -#include <machine/random.h> -#else -#include <sys/random.h> -#endif -#endif - #ifdef __FreeBSD__ #include <machine/i4b_debug.h> #include <machine/i4b_ioctl.h> @@ -66,10 +55,7 @@ #include <i4b/i4b_ioctl.h> #endif -#include <i4b/include/i4b_l2l3.h> #include <i4b/include/i4b_l3l4.h> -#include <i4b/include/i4b_mbuf.h> -#include <i4b/include/i4b_isdnq931.h> #include <i4b/include/i4b_global.h> #include <i4b/layer4/i4b_l4.h> diff --git a/sys/i4b/layer4/i4b_l4timer.c b/sys/i4b/layer4/i4b_l4timer.c index c9707d7..7710ad5 100644 --- a/sys/i4b/layer4/i4b_l4timer.c +++ b/sys/i4b/layer4/i4b_l4timer.c @@ -42,9 +42,6 @@ #include <sys/param.h> #include <sys/kernel.h> #include <sys/systm.h> -#include <sys/mbuf.h> -#include <sys/socket.h> -#include <net/if.h> #if defined(__NetBSD__) && __NetBSD_Version__ >= 104230000 #include <sys/callout.h> @@ -60,7 +57,6 @@ #include <i4b/include/i4b_global.h> #include <i4b/include/i4b_l3l4.h> -#include <i4b/include/i4b_mbuf.h> #include <i4b/layer4/i4b_l4.h> |
