diff options
| author | peter <peter@FreeBSD.org> | 1999-12-06 18:26:33 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 1999-12-06 18:26:33 +0000 |
| commit | 7de5d2d4188cf51ce23905b7e5c99cd44523a0e4 (patch) | |
| tree | 3f6b25bd5395886e713aad1c34be32f2679ab6b1 /sys/dev/sound/isa/sbc.c | |
| parent | 09d56a3f8fb30923853952ed8a777819e12d5b22 (diff) | |
| download | FreeBSD-src-7de5d2d4188cf51ce23905b7e5c99cd44523a0e4.zip FreeBSD-src-7de5d2d4188cf51ce23905b7e5c99cd44523a0e4.tar.gz | |
Update for pnp adjustments regarding NPNP.
Also, optimize out a mess of #if's that were duplicating work already
done by config(8). For example, if a file is marked as
"dev/sound/pci/foo.c optional pcm pci" then it's only added if pcm *and*
pci are present, so #if NPCM > 0 and #if NPCI > 0 are totally redundant.
A bit more work is still needed.
Discussed with: cg (a few weeks ago)
Diffstat (limited to 'sys/dev/sound/isa/sbc.c')
| -rw-r--r-- | sys/dev/sound/isa/sbc.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/sys/dev/sound/isa/sbc.c b/sys/dev/sound/isa/sbc.c index 3ebd694..67a367c 100644 --- a/sys/dev/sound/isa/sbc.c +++ b/sys/dev/sound/isa/sbc.c @@ -26,9 +26,7 @@ * $FreeBSD$ */ -#include "sbc.h" #include "isa.h" -#include "pnp.h" #include <sys/param.h> #include <sys/systm.h> @@ -50,8 +48,6 @@ #endif #endif /* NISA > 0 */ -#if NSBC > 0 - /* Here is the parameter structure per a device. */ struct sbc_softc { device_t dev; /* device */ @@ -68,10 +64,10 @@ struct sbc_softc { typedef struct sbc_softc *sc_p; -#if NISA > 0 && NPNP > 0 +#if NISA > 0 static int sbc_probe(device_t dev); static int sbc_attach(device_t dev); -#endif /* NISA > 0 && NPNP > 0 */ +#endif /* NISA > 0 */ static struct resource *sbc_alloc_resource(device_t bus, device_t child, int type, int *rid, u_long start, u_long end, u_long count, u_int flags); static int sbc_release_resource(device_t bus, device_t child, int type, int rid, @@ -82,7 +78,7 @@ static int release_resource(sc_p scp); static devclass_t sbc_devclass; -#if NISA > 0 && NPNP > 0 +#if NISA > 0 static struct isa_pnp_id sbc_ids[] = { #if notdef {0x0000630e, "CS423x"}, @@ -169,7 +165,7 @@ sbc_attach(device_t dev) return (0); } -#endif /* NISA > 0 && NPNP > 0 */ +#endif /* NISA > 0 */ static struct resource * sbc_alloc_resource(device_t bus, device_t child, int type, int *rid, @@ -303,7 +299,7 @@ release_resource(sc_p scp) return (0); } -#if NISA > 0 && NPNP > 0 +#if NISA > 0 static device_method_t sbc_methods[] = { /* Device interface */ DEVMETHOD(device_probe, sbc_probe), @@ -335,6 +331,4 @@ static driver_t sbc_driver = { * sbc can be attached to an isa bus. */ DRIVER_MODULE(sbc, isa, sbc_driver, sbc_devclass, 0, 0); -#endif /* NISA > 0 && NPNP > 0 */ - -#endif /* NSBC > 0 */ +#endif /* NISA > 0 */ |
