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/pcm/sound.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/pcm/sound.c')
-rw-r--r-- | sys/dev/sound/pcm/sound.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c index 894f56a..b464ebd 100644 --- a/sys/dev/sound/pcm/sound.c +++ b/sys/dev/sound/pcm/sound.c @@ -27,16 +27,7 @@ * $FreeBSD$ */ -#include "opt_devfs.h" - #include <dev/sound/pcm/sound.h> -#ifdef DEVFS -#include <sys/devfsext.h> -#endif /* DEVFS */ - -#if NPCM > 0 /* from "pcm.h" via disgusting #include in snd/sound.h */ - -extern struct isa_driver pcmdriver; static int status_isopen = 0; static int status_init(char *buf, int size); @@ -444,5 +435,3 @@ status_read(struct uio *buf) bufptr += l; return (l > 0)? uiomove(status_buf + bufptr - l, l, buf) : 0; } - -#endif /* NPCM > 0 */ |