diff options
| author | asami <asami@FreeBSD.org> | 1996-10-30 22:41:46 +0000 |
|---|---|---|
| committer | asami <asami@FreeBSD.org> | 1996-10-30 22:41:46 +0000 |
| commit | 95ac832055c11e8031e18bcc9759b2d12b654e9b (patch) | |
| tree | 37f74d6fdf54e31c6c6d69a11d50e299cd0a1118 /sys/i386/isa/sound/local.h | |
| parent | e1b78916a4b8d96475ebaa0033860c706702fe49 (diff) | |
| download | FreeBSD-src-95ac832055c11e8031e18bcc9759b2d12b654e9b.zip FreeBSD-src-95ac832055c11e8031e18bcc9759b2d12b654e9b.tar.gz | |
More merge and update.
(1) deleted #if 0
pc98/pc98/mse.c
(2) hold per-unit I/O ports in ed_softc
pc98/pc98/if_ed.c
pc98/pc98/if_ed98.h
(3) merge more files by segregating changes into headers.
new file (moved from pc98/pc98):
i386/isa/aic_98.h
deleted:
well, it's already in the commit message so I won't repeat the
long list here ;)
Submitted by: The FreeBSD(98) Development Team
Diffstat (limited to 'sys/i386/isa/sound/local.h')
| -rw-r--r-- | sys/i386/isa/sound/local.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/sys/i386/isa/sound/local.h b/sys/i386/isa/sound/local.h index e80b780..c243e4b 100644 --- a/sys/i386/isa/sound/local.h +++ b/sys/i386/isa/sound/local.h @@ -92,6 +92,14 @@ #define EXCLUDE_UART6850 #endif +#ifdef PC98 +#include "pcm.h" +#if NPCM == 0 && !defined(EXCLUDE_PCM86) +#define EXCLUDE_PCM86 +#endif +#endif + + /* nothing but a sequencer (Adlib/OPL) ? */ #if NGUS == 0 && NSB == 0 && NSBMIDI == 0 && NPAS == 0 && NMPU == 0 && \ NUART == 0 && NMSS == 0 @@ -99,9 +107,11 @@ #define EXCLUDE_MIDI #endif #ifndef EXCLUDE_AUDIO +#if !defined(PC98) || defined(EXCLUDE_PCM86) && defined(EXCLUDE_MSS) #define EXCLUDE_AUDIO #endif #endif +#endif /* nothing but a Midi (MPU/UART) ? */ #if NGUS == 0 && NSB == 0 && NSBMIDI == 0 && NPAS == 0 && NOPL == 0 && \ @@ -111,6 +121,8 @@ #define EXCLUDE_SEQUENCER #endif #ifndef EXCLUDE_AUDIO +#if !defined(PC98) || defined(EXCLUDE_PCM86) && defined(EXCLUDE_MSS) #define EXCLUDE_AUDIO #endif #endif +#endif |
