diff options
author | peter <peter@FreeBSD.org> | 2000-01-29 15:08:56 +0000 |
---|---|---|
committer | peter <peter@FreeBSD.org> | 2000-01-29 15:08:56 +0000 |
commit | d7e5eb3faac173e7d9640e098621746b86213739 (patch) | |
tree | 9a2474b2f7c68ec2b1e97af2ab3b083c722e9ad7 /sys/dev | |
parent | e06faf1d941fbd0cfd397f781f3986049ecce128 (diff) | |
download | FreeBSD-src-d7e5eb3faac173e7d9640e098621746b86213739.zip FreeBSD-src-d7e5eb3faac173e7d9640e098621746b86213739.tar.gz |
Use config's conditional compilation rather than using #ifdefs that make
modular compilation harder. I'm doing this because people seem to like
cut/pasting examples of bad practices in existing code.
Diffstat (limited to 'sys/dev')
-rw-r--r-- | sys/dev/atkbdc/atkbd.c | 5 | ||||
-rw-r--r-- | sys/dev/atkbdc/atkbd_atkbdc.c | 5 | ||||
-rw-r--r-- | sys/dev/atkbdc/atkbd_isa.c | 5 | ||||
-rw-r--r-- | sys/dev/atkbdc/atkbdc.c | 6 | ||||
-rw-r--r-- | sys/dev/atkbdc/atkbdc_isa.c | 5 | ||||
-rw-r--r-- | sys/dev/atkbdc/atkbdc_subr.c | 5 | ||||
-rw-r--r-- | sys/dev/atkbdc/psm.c | 9 | ||||
-rw-r--r-- | sys/dev/kbd/atkbd.c | 5 | ||||
-rw-r--r-- | sys/dev/kbd/atkbdc.c | 6 | ||||
-rw-r--r-- | sys/dev/kbd/kbd.c | 1 | ||||
-rw-r--r-- | sys/dev/syscons/scgfbrndr.c | 6 | ||||
-rw-r--r-- | sys/dev/syscons/schistory.c | 4 | ||||
-rw-r--r-- | sys/dev/syscons/scmouse.c | 5 | ||||
-rw-r--r-- | sys/dev/syscons/scterm-dumb.c | 5 | ||||
-rw-r--r-- | sys/dev/syscons/scterm-sc.c | 5 | ||||
-rw-r--r-- | sys/dev/syscons/scterm.c | 5 | ||||
-rw-r--r-- | sys/dev/syscons/scvesactl.c | 12 | ||||
-rw-r--r-- | sys/dev/syscons/scvgarndr.c | 6 | ||||
-rw-r--r-- | sys/dev/syscons/scvidctl.c | 5 | ||||
-rw-r--r-- | sys/dev/syscons/scvtb.c | 5 | ||||
-rw-r--r-- | sys/dev/syscons/syscons.c | 4 | ||||
-rw-r--r-- | sys/dev/syscons/sysmouse.c | 5 |
22 files changed, 4 insertions, 115 deletions
diff --git a/sys/dev/atkbdc/atkbd.c b/sys/dev/atkbdc/atkbd.c index f8ed134..5a72ecb 100644 --- a/sys/dev/atkbdc/atkbd.c +++ b/sys/dev/atkbdc/atkbd.c @@ -26,12 +26,9 @@ * $FreeBSD$ */ -#include "atkbd.h" #include "opt_kbd.h" #include "opt_atkbd.h" -#if NATKBD > 0 - #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> @@ -1393,5 +1390,3 @@ typematic(int delay, int rate) value |= i; return value; } - -#endif /* NATKBD > 0 */ diff --git a/sys/dev/atkbdc/atkbd_atkbdc.c b/sys/dev/atkbdc/atkbd_atkbdc.c index f686170..944695a 100644 --- a/sys/dev/atkbdc/atkbd_atkbdc.c +++ b/sys/dev/atkbdc/atkbd_atkbdc.c @@ -26,11 +26,8 @@ * $FreeBSD$ */ -#include "atkbd.h" #include "opt_kbd.h" -#if NATKBD > 0 - #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> @@ -124,5 +121,3 @@ atkbd_isa_intr(void *arg) } DRIVER_MODULE(atkbd, atkbdc, atkbd_driver, atkbd_devclass, 0, 0); - -#endif /* NATKBD > 0 */ diff --git a/sys/dev/atkbdc/atkbd_isa.c b/sys/dev/atkbdc/atkbd_isa.c index f686170..944695a 100644 --- a/sys/dev/atkbdc/atkbd_isa.c +++ b/sys/dev/atkbdc/atkbd_isa.c @@ -26,11 +26,8 @@ * $FreeBSD$ */ -#include "atkbd.h" #include "opt_kbd.h" -#if NATKBD > 0 - #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> @@ -124,5 +121,3 @@ atkbd_isa_intr(void *arg) } DRIVER_MODULE(atkbd, atkbdc, atkbd_driver, atkbd_devclass, 0, 0); - -#endif /* NATKBD > 0 */ diff --git a/sys/dev/atkbdc/atkbdc.c b/sys/dev/atkbdc/atkbdc.c index 68fcffc..63ea126 100644 --- a/sys/dev/atkbdc/atkbdc.c +++ b/sys/dev/atkbdc/atkbdc.c @@ -48,7 +48,7 @@ /* constants */ -#define MAXKBDC MAX(NATKBDC, 1) +#define MAXKBDC MAX(NATKBDC, 1) /* XXX */ /* macros */ @@ -90,8 +90,6 @@ static int wait_for_kbd_ack(atkbdc_softc_t *kbdc); static int wait_for_aux_data(atkbdc_softc_t *kbdc); static int wait_for_aux_ack(atkbdc_softc_t *kbdc); -#if NATKBDC > 0 - atkbdc_softc_t *atkbdc_get_softc(int unit) { @@ -125,8 +123,6 @@ atkbdc_attach_unit(int unit, atkbdc_softc_t *sc, int port) return atkbdc_setup(sc, port); } -#endif /* NATKBDC > 0 */ - /* the backdoor to the keyboard controller! XXX */ int atkbdc_configure(void) diff --git a/sys/dev/atkbdc/atkbdc_isa.c b/sys/dev/atkbdc/atkbdc_isa.c index 9829f2b..b11b803 100644 --- a/sys/dev/atkbdc/atkbdc_isa.c +++ b/sys/dev/atkbdc/atkbdc_isa.c @@ -26,11 +26,8 @@ * $FreeBSD$ */ -#include "atkbdc.h" #include "opt_kbd.h" -#if NATKBDC > 0 - #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> @@ -265,5 +262,3 @@ atkbdc_write_ivar(device_t bus, device_t dev, int index, u_long val) } DRIVER_MODULE(atkbdc, isa, atkbdc_driver, atkbdc_devclass, 0, 0); - -#endif /* NATKBDC > 0 */ diff --git a/sys/dev/atkbdc/atkbdc_subr.c b/sys/dev/atkbdc/atkbdc_subr.c index 9829f2b..b11b803 100644 --- a/sys/dev/atkbdc/atkbdc_subr.c +++ b/sys/dev/atkbdc/atkbdc_subr.c @@ -26,11 +26,8 @@ * $FreeBSD$ */ -#include "atkbdc.h" #include "opt_kbd.h" -#if NATKBDC > 0 - #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> @@ -265,5 +262,3 @@ atkbdc_write_ivar(device_t bus, device_t dev, int index, u_long val) } DRIVER_MODULE(atkbdc, isa, atkbdc_driver, atkbdc_devclass, 0, 0); - -#endif /* NATKBDC > 0 */ diff --git a/sys/dev/atkbdc/psm.c b/sys/dev/atkbdc/psm.c index 928e920..f2a4d91 100644 --- a/sys/dev/atkbdc/psm.c +++ b/sys/dev/atkbdc/psm.c @@ -61,11 +61,8 @@ * Vendor specific support routines. */ -#include "psm.h" #include "opt_psm.h" -#if NPSM > 0 - #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> @@ -1108,10 +1105,6 @@ psmopen(dev_t dev, int flag, int fmt, struct proc *p) int err; int s; - /* Validate unit number */ - if (unit >= NPSM) - return (ENXIO); - /* Get device data */ sc = PSM_SOFTC(unit); if ((sc == NULL) || (sc->state & PSM_VALID) == 0) @@ -2450,5 +2443,3 @@ psmresume(device_t dev) } DRIVER_MODULE(psm, atkbdc, psm_driver, psm_devclass, 0, 0); - -#endif /* NPSM > 0 */ diff --git a/sys/dev/kbd/atkbd.c b/sys/dev/kbd/atkbd.c index f8ed134..5a72ecb 100644 --- a/sys/dev/kbd/atkbd.c +++ b/sys/dev/kbd/atkbd.c @@ -26,12 +26,9 @@ * $FreeBSD$ */ -#include "atkbd.h" #include "opt_kbd.h" #include "opt_atkbd.h" -#if NATKBD > 0 - #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> @@ -1393,5 +1390,3 @@ typematic(int delay, int rate) value |= i; return value; } - -#endif /* NATKBD > 0 */ diff --git a/sys/dev/kbd/atkbdc.c b/sys/dev/kbd/atkbdc.c index 68fcffc..63ea126 100644 --- a/sys/dev/kbd/atkbdc.c +++ b/sys/dev/kbd/atkbdc.c @@ -48,7 +48,7 @@ /* constants */ -#define MAXKBDC MAX(NATKBDC, 1) +#define MAXKBDC MAX(NATKBDC, 1) /* XXX */ /* macros */ @@ -90,8 +90,6 @@ static int wait_for_kbd_ack(atkbdc_softc_t *kbdc); static int wait_for_aux_data(atkbdc_softc_t *kbdc); static int wait_for_aux_ack(atkbdc_softc_t *kbdc); -#if NATKBDC > 0 - atkbdc_softc_t *atkbdc_get_softc(int unit) { @@ -125,8 +123,6 @@ atkbdc_attach_unit(int unit, atkbdc_softc_t *sc, int port) return atkbdc_setup(sc, port); } -#endif /* NATKBDC > 0 */ - /* the backdoor to the keyboard controller! XXX */ int atkbdc_configure(void) diff --git a/sys/dev/kbd/kbd.c b/sys/dev/kbd/kbd.c index d4684b1..ba436be 100644 --- a/sys/dev/kbd/kbd.c +++ b/sys/dev/kbd/kbd.c @@ -26,7 +26,6 @@ * $FreeBSD$ */ -#include "kbd.h" #include "opt_kbd.h" #include <sys/param.h> diff --git a/sys/dev/syscons/scgfbrndr.c b/sys/dev/syscons/scgfbrndr.c index afdd073..402a094 100644 --- a/sys/dev/syscons/scgfbrndr.c +++ b/sys/dev/syscons/scgfbrndr.c @@ -26,13 +26,9 @@ * $FreeBSD$ */ -#include "sc.h" -#include "vga.h" #include "opt_syscons.h" #include "opt_vga.h" -#if NSC > 0 && NVGA > 0 - #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> @@ -826,5 +822,3 @@ vga_grborder(scr_stat *scp, int color) } #endif - -#endif /* NSC > 0 && NVGA > 0 */ diff --git a/sys/dev/syscons/schistory.c b/sys/dev/syscons/schistory.c index 49fc6ea..c405349 100644 --- a/sys/dev/syscons/schistory.c +++ b/sys/dev/syscons/schistory.c @@ -32,8 +32,6 @@ #include "sc.h" #include "opt_syscons.h" -#if NSC > 0 - #ifndef SC_NO_HISTORY #include <sys/param.h> @@ -307,5 +305,3 @@ sc_hist_ioctl(struct tty *tp, u_long cmd, caddr_t data, int flag, } #endif /* SC_NO_HISTORY */ - -#endif /* NSC */ diff --git a/sys/dev/syscons/scmouse.c b/sys/dev/syscons/scmouse.c index f75df0d..509eb35 100644 --- a/sys/dev/syscons/scmouse.c +++ b/sys/dev/syscons/scmouse.c @@ -26,11 +26,8 @@ * $FreeBSD$ */ -#include "sc.h" #include "opt_syscons.h" -#if NSC > 0 - #include <limits.h> #include <sys/param.h> #include <sys/systm.h> @@ -902,5 +899,3 @@ sc_mouse_ioctl(struct tty *tp, u_long cmd, caddr_t data, int flag, } #endif /* SC_NO_SYSMOUSE */ - -#endif /* NSC */ diff --git a/sys/dev/syscons/scterm-dumb.c b/sys/dev/syscons/scterm-dumb.c index 19e421d..e758718 100644 --- a/sys/dev/syscons/scterm-dumb.c +++ b/sys/dev/syscons/scterm-dumb.c @@ -26,11 +26,8 @@ * $FreeBSD$ */ -#include "sc.h" #include "opt_syscons.h" -#if NSC > 0 - #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> @@ -152,5 +149,3 @@ dumb_nop(void) } #endif /* SC_DUMB_TERMINAL */ - -#endif /* NSC > 1 */ diff --git a/sys/dev/syscons/scterm-sc.c b/sys/dev/syscons/scterm-sc.c index 317f7da..f11cd27 100644 --- a/sys/dev/syscons/scterm-sc.c +++ b/sys/dev/syscons/scterm-sc.c @@ -27,11 +27,8 @@ * $FreeBSD$ */ -#include "sc.h" #include "opt_syscons.h" -#if NSC > 0 - #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> @@ -725,5 +722,3 @@ mask2attr(term_stat *tcp) } #endif /* SC_DUMB_TERMINAL */ - -#endif /* NSC > 0 */ diff --git a/sys/dev/syscons/scterm.c b/sys/dev/syscons/scterm.c index c635993..99fad98 100644 --- a/sys/dev/syscons/scterm.c +++ b/sys/dev/syscons/scterm.c @@ -26,11 +26,8 @@ * $FreeBSD$ */ -#include "sc.h" #include "opt_syscons.h" -#if NSC > 0 - #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> @@ -124,5 +121,3 @@ sc_term_sw_t return NULL; } - -#endif /* NSC > 0 */ diff --git a/sys/dev/syscons/scvesactl.c b/sys/dev/syscons/scvesactl.c index 9749cc2..8c498f9 100644 --- a/sys/dev/syscons/scvesactl.c +++ b/sys/dev/syscons/scvesactl.c @@ -26,17 +26,9 @@ * $FreeBSD$ */ -#include "sc.h" -#include "vga.h" -#include "opt_syscons.h" #include "opt_vga.h" -#include "opt_vesa.h" -#ifdef VGA_NO_MODE_CHANGE -#undef VESA -#endif - -#if (NSC > 0 && NVGA > 0 && defined(VESA)) || defined(KLD_MODULE) +#ifndef VGA_NO_MODE_CHANGE #include <sys/param.h> #include <sys/systm.h> @@ -138,4 +130,4 @@ vesa_unload_ioctl(void) return 0; } -#endif /* (NSC > 0 && NVGA > 0 && VESA) || KLD_MODULE */ +#endif /* SC_NO_MODE_CHANGE */ diff --git a/sys/dev/syscons/scvgarndr.c b/sys/dev/syscons/scvgarndr.c index afdd073..402a094 100644 --- a/sys/dev/syscons/scvgarndr.c +++ b/sys/dev/syscons/scvgarndr.c @@ -26,13 +26,9 @@ * $FreeBSD$ */ -#include "sc.h" -#include "vga.h" #include "opt_syscons.h" #include "opt_vga.h" -#if NSC > 0 && NVGA > 0 - #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> @@ -826,5 +822,3 @@ vga_grborder(scr_stat *scp, int color) } #endif - -#endif /* NSC > 0 && NVGA > 0 */ diff --git a/sys/dev/syscons/scvidctl.c b/sys/dev/syscons/scvidctl.c index 686a3c4..c9260a7 100644 --- a/sys/dev/syscons/scvidctl.c +++ b/sys/dev/syscons/scvidctl.c @@ -26,11 +26,8 @@ * $FreeBSD$ */ -#include "sc.h" #include "opt_syscons.h" -#if NSC > 0 - #include <sys/param.h> #include <sys/systm.h> #include <sys/conf.h> @@ -814,5 +811,3 @@ sc_rndr_sw_t return NULL; } - -#endif /* NSC > 0 */ diff --git a/sys/dev/syscons/scvtb.c b/sys/dev/syscons/scvtb.c index aac9024..dc5155b 100644 --- a/sys/dev/syscons/scvtb.c +++ b/sys/dev/syscons/scvtb.c @@ -26,11 +26,8 @@ * $FreeBSD$ */ -#include "sc.h" #include "opt_syscons.h" -#if NSC > 0 - #include <sys/param.h> #include <sys/systm.h> #include <sys/malloc.h> @@ -296,5 +293,3 @@ sc_vtb_ins(sc_vtb_t *vtb, int at, int count, int c, int attr) else fillw(attr | c, (void *)sc_vtb_pointer(vtb, at), count); } - -#endif /* NSC */ diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c index a4303c1..b648cfb 100644 --- a/sys/dev/syscons/syscons.c +++ b/sys/dev/syscons/syscons.c @@ -28,7 +28,6 @@ * $FreeBSD$ */ -#include "sc.h" #include "splash.h" #include "opt_syscons.h" #include "opt_ddb.h" @@ -36,7 +35,6 @@ #include "apm.h" #endif -#if NSC > 0 #include <sys/param.h> #include <sys/systm.h> #include <sys/eventhandler.h> @@ -3406,5 +3404,3 @@ blink_screen(void *arg) timeout(blink_screen, scp, hz / 10); } } - -#endif /* NSC */ diff --git a/sys/dev/syscons/sysmouse.c b/sys/dev/syscons/sysmouse.c index 8c28ab7..453215a 100644 --- a/sys/dev/syscons/sysmouse.c +++ b/sys/dev/syscons/sysmouse.c @@ -26,11 +26,8 @@ * $FreeBSD$ */ -#include "sc.h" #include "opt_syscons.h" -#if NSC > 0 - #include <sys/param.h> #include <sys/systm.h> #include <sys/conf.h> @@ -340,5 +337,3 @@ sysmouse_event(mouse_info_t *info) } #endif /* !SC_NO_SYSMOUSE */ - -#endif /* NSC */ |