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/kbd | |
| 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/kbd')
| -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 |
3 files changed, 1 insertions, 11 deletions
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> |
