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/pci | |
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/pci')
-rw-r--r-- | sys/dev/sound/pci/aureal.c | 5 | ||||
-rw-r--r-- | sys/dev/sound/pci/csa.c | 5 | ||||
-rw-r--r-- | sys/dev/sound/pci/csapcm.c | 9 | ||||
-rw-r--r-- | sys/dev/sound/pci/es137x.c | 5 | ||||
-rw-r--r-- | sys/dev/sound/pci/t4dwave.c | 4 |
5 files changed, 0 insertions, 28 deletions
diff --git a/sys/dev/sound/pci/aureal.c b/sys/dev/sound/pci/aureal.c index cbbe18f..5c8e122 100644 --- a/sys/dev/sound/pci/aureal.c +++ b/sys/dev/sound/pci/aureal.c @@ -36,8 +36,6 @@ #include <pci/pcireg.h> #include <pci/pcivar.h> -#if NPCI != 0 - /* PCI IDs of supported chips */ #define AU8820_PCI_ID 0x000112eb @@ -688,6 +686,3 @@ static driver_t au_driver = { static devclass_t pcm_devclass; DRIVER_MODULE(au, pci, au_driver, pcm_devclass, 0, 0); - -#endif /* NPCI != 0 */ - diff --git a/sys/dev/sound/pci/csa.c b/sys/dev/sound/pci/csa.c index eebeda6..61dcd38 100644 --- a/sys/dev/sound/pci/csa.c +++ b/sys/dev/sound/pci/csa.c @@ -26,7 +26,6 @@ * $FreeBSD$ */ -#include "csa.h" #include "pci.h" #include <sys/param.h> @@ -49,8 +48,6 @@ #include <pci/pcivar.h> #endif /* NPCI > 0 */ -#if NCSA > 0 - #include <dev/sound/pci/csaimg.h> /* Here is the parameter structure per a device. */ @@ -792,5 +789,3 @@ static driver_t csa_driver = { */ DRIVER_MODULE(csa, pci, csa_driver, csa_devclass, 0, 0); #endif /* NPCI > 0 */ - -#endif /* NCSA > 0 */ diff --git a/sys/dev/sound/pci/csapcm.c b/sys/dev/sound/pci/csapcm.c index 964011d..b8d3974 100644 --- a/sys/dev/sound/pci/csapcm.c +++ b/sys/dev/sound/pci/csapcm.c @@ -26,11 +26,6 @@ * $FreeBSD$ */ -#include "opt_devfs.h" -#include "pci.h" -#include "csa.h" -#include "pcm.h" - #include <sys/soundcard.h> #include <dev/sound/pcm/sound.h> #include <dev/sound/pcm/ac97.h> @@ -41,8 +36,6 @@ #include <pci/pcireg.h> #include <pci/pcivar.h> -#if NCSA > 0 - /* device private data */ struct csa_info; @@ -847,5 +840,3 @@ static driver_t pcmcsa_driver = { static devclass_t pcm_devclass; DRIVER_MODULE(pcmcsa, csa, pcmcsa_driver, pcm_devclass, 0, 0); - -#endif /* NCSA > 0 */ diff --git a/sys/dev/sound/pci/es137x.c b/sys/dev/sound/pci/es137x.c index 8f14960..c413ffe 100644 --- a/sys/dev/sound/pci/es137x.c +++ b/sys/dev/sound/pci/es137x.c @@ -62,8 +62,6 @@ #include <sys/sysctl.h> -#if NPCI != 0 - static int debug = 0; SYSCTL_INT(_debug, OID_AUTO, es_debug, CTLFLAG_RW, &debug, 0, ""); @@ -911,6 +909,3 @@ static driver_t es_driver = { static devclass_t pcm_devclass; DRIVER_MODULE(es, pci, es_driver, pcm_devclass, 0, 0); - - -#endif /* NPCI != 0 */ diff --git a/sys/dev/sound/pci/t4dwave.c b/sys/dev/sound/pci/t4dwave.c index c3e6b41..9309962 100644 --- a/sys/dev/sound/pci/t4dwave.c +++ b/sys/dev/sound/pci/t4dwave.c @@ -36,8 +36,6 @@ #include <pci/pcireg.h> #include <pci/pcivar.h> -#if NPCI != 0 - /* -------------------------------------------------------------------- */ struct tr_info; @@ -684,5 +682,3 @@ static driver_t tr_driver = { static devclass_t pcm_devclass; DRIVER_MODULE(tr, pci, tr_driver, pcm_devclass, 0, 0); - -#endif /* NPCI != 0 */ |