From fe59073f8dcfe61d8b048e7e4751131e39b353e6 Mon Sep 17 00:00:00 2001 From: phk Date: Thu, 12 Oct 2000 08:14:20 +0000 Subject: Remove the #include kitchensink and add the #includes to the respective source files. Also un-nest includes in I have run src/tools/tools/kerninclude to remove 1239 clearly unneeded #includes reducing the total from 3524 includes to 2285. --- sys/dev/hfa/fore.h | 21 ---------- sys/dev/hfa/fore_buffer.c | 47 +++++++++++++++++++++ sys/dev/hfa/fore_command.c | 47 +++++++++++++++++++++ sys/dev/hfa/fore_globals.c | 47 +++++++++++++++++++++ sys/dev/hfa/fore_if.c | 47 +++++++++++++++++++++ sys/dev/hfa/fore_include.h | 29 ------------- sys/dev/hfa/fore_init.c | 47 +++++++++++++++++++++ sys/dev/hfa/fore_intr.c | 47 +++++++++++++++++++++ sys/dev/hfa/fore_load.c | 99 +++++++++++++++++++++------------------------ sys/dev/hfa/fore_output.c | 47 +++++++++++++++++++++ sys/dev/hfa/fore_receive.c | 47 +++++++++++++++++++++ sys/dev/hfa/fore_stats.c | 47 +++++++++++++++++++++ sys/dev/hfa/fore_timer.c | 47 +++++++++++++++++++++ sys/dev/hfa/fore_transmit.c | 47 +++++++++++++++++++++ sys/dev/hfa/fore_vcm.c | 47 +++++++++++++++++++++ 15 files changed, 611 insertions(+), 102 deletions(-) (limited to 'sys/dev/hfa') diff --git a/sys/dev/hfa/fore.h b/sys/dev/hfa/fore.h index 5b43cae..16d6dd3 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 2c22e42..dcf483e 100644 --- a/sys/dev/hfa/fore_buffer.c +++ b/sys/dev/hfa/fore_buffer.c @@ -35,6 +35,53 @@ * */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #ifndef lint diff --git a/sys/dev/hfa/fore_command.c b/sys/dev/hfa/fore_command.c index 75df3ec..6ea8ac7 100644 --- a/sys/dev/hfa/fore_command.c +++ b/sys/dev/hfa/fore_command.c @@ -35,6 +35,53 @@ * */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #ifndef lint diff --git a/sys/dev/hfa/fore_globals.c b/sys/dev/hfa/fore_globals.c index b2e14b4..b421868 100644 --- a/sys/dev/hfa/fore_globals.c +++ b/sys/dev/hfa/fore_globals.c @@ -35,6 +35,53 @@ * */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #ifndef lint diff --git a/sys/dev/hfa/fore_if.c b/sys/dev/hfa/fore_if.c index 930e0f9..273a419 100644 --- a/sys/dev/hfa/fore_if.c +++ b/sys/dev/hfa/fore_if.c @@ -35,6 +35,53 @@ * */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #ifndef lint diff --git a/sys/dev/hfa/fore_include.h b/sys/dev/hfa/fore_include.h index ef455d5..a1b6391 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 - -/* - * 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 -#include - -#include -#include -#include -#include -#include - /* * 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 5ec2104..f4c8020 100644 --- a/sys/dev/hfa/fore_init.c +++ b/sys/dev/hfa/fore_init.c @@ -35,6 +35,53 @@ * */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #ifndef lint diff --git a/sys/dev/hfa/fore_intr.c b/sys/dev/hfa/fore_intr.c index 65eb14f..fb604d7 100644 --- a/sys/dev/hfa/fore_intr.c +++ b/sys/dev/hfa/fore_intr.c @@ -35,6 +35,53 @@ * */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #ifndef lint diff --git a/sys/dev/hfa/fore_load.c b/sys/dev/hfa/fore_load.c index 1590891..79b867f 100644 --- a/sys/dev/hfa/fore_load.c +++ b/sys/dev/hfa/fore_load.c @@ -35,6 +35,53 @@ * */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #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 b0b5436..7ef937d 100644 --- a/sys/dev/hfa/fore_output.c +++ b/sys/dev/hfa/fore_output.c @@ -35,6 +35,53 @@ * */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #ifndef lint diff --git a/sys/dev/hfa/fore_receive.c b/sys/dev/hfa/fore_receive.c index be07791..880acb7 100644 --- a/sys/dev/hfa/fore_receive.c +++ b/sys/dev/hfa/fore_receive.c @@ -35,6 +35,53 @@ * */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #ifndef lint diff --git a/sys/dev/hfa/fore_stats.c b/sys/dev/hfa/fore_stats.c index a01c5e5..bae07ff 100644 --- a/sys/dev/hfa/fore_stats.c +++ b/sys/dev/hfa/fore_stats.c @@ -35,6 +35,53 @@ * */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #ifndef lint diff --git a/sys/dev/hfa/fore_timer.c b/sys/dev/hfa/fore_timer.c index df5cff8..c18158d 100644 --- a/sys/dev/hfa/fore_timer.c +++ b/sys/dev/hfa/fore_timer.c @@ -35,6 +35,53 @@ * */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #ifndef lint diff --git a/sys/dev/hfa/fore_transmit.c b/sys/dev/hfa/fore_transmit.c index 45445d4..c345f2d 100644 --- a/sys/dev/hfa/fore_transmit.c +++ b/sys/dev/hfa/fore_transmit.c @@ -35,6 +35,53 @@ * */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #ifndef lint diff --git a/sys/dev/hfa/fore_vcm.c b/sys/dev/hfa/fore_vcm.c index e2bc530..b13ead3 100644 --- a/sys/dev/hfa/fore_vcm.c +++ b/sys/dev/hfa/fore_vcm.c @@ -35,6 +35,53 @@ * */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #ifndef lint -- cgit v1.1