d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Untangle some #include between gusc.c/mss.c - gusc.c could create

Browse Source 
an attachment node for something that may not have been compiled in.
This commit is contained in:
Peter Wemm 2000-06-10 07:20:54 +00:00
parent cb73359d42
commit a99bef94ed
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/dev/sound/isa/mss.c
View File

@ -34,7 +34,6 @@
#include <dev/sound/isa/mss.h> #include <dev/sound/isa/mss.h>
#include <dev/sound/chip.h> #include <dev/sound/chip.h>
#include "gusc.h"
#if notyet #if notyet
#include "midi.h" #include "midi.h"
#endif /* notyet */ #endif /* notyet */
@ -328,7 +327,6 @@ mss_alloc_resources(struct mss_info *mss, device_t dev)
return ok; return ok;
} }
#if NGUSC > 0
/* /*
* XXX This might be better off in the gusc driver. * XXX This might be better off in the gusc driver.
*/ */
@ -384,7 +382,6 @@ gusmax_setup(struct mss_info *mss, device_t dev, struct resource *alt)
splx(s); splx(s);
} }
#endif /* NGUSC > 0 */
static int static int
mss_init(struct mss_info *mss, device_t dev) mss_init(struct mss_info *mss, device_t dev)
@ -430,10 +427,8 @@ mss_init(struct mss_info *mss, device_t dev)
break; break;
} }
port_wr(alt, 0, 0xC); /* enable int and dma */ port_wr(alt, 0, 0xC); /* enable int and dma */
#if NGUSC > 0
if (mss->bd_id == MD_GUSMAX) if (mss->bd_id == MD_GUSMAX)
gusmax_setup(mss, dev, alt); gusmax_setup(mss, dev, alt);
#endif
bus_release_resource(dev, SYS_RES_IOPORT, rid, alt); bus_release_resource(dev, SYS_RES_IOPORT, rid, alt);
/* /*
@ -1522,8 +1517,6 @@ opti931_intr(void *arg)
DEB(printf("xxx too many loops\n");) DEB(printf("xxx too many loops\n");)
} }
#if NGUSC > 0
static int static int
guspcm_probe(device_t dev) guspcm_probe(device_t dev)
{ {
@ -1605,7 +1598,6 @@ static driver_t guspcm_driver = {
}; };
DRIVER_MODULE(guspcm, gusc, guspcm_driver, pcm_devclass, 0, 0); DRIVER_MODULE(guspcm, gusc, guspcm_driver, pcm_devclass, 0, 0);
#endif /* NGUSC > 0 */
static int static int
mssmix_init(snd_mixer *m) mssmix_init(snd_mixer *m)