Rename sb.h to sb_defs.h and pas.h to pas_defs.h so there's no

possibility of conflict with the versions in the compile dir.
This commit is contained in:
Jordan K. Hubbard 1996-11-15 08:30:39 +00:00
parent ca015941f4
commit 3dc9f2bb59
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=19769
11 changed files with 9 additions and 9 deletions

View File

@ -33,7 +33,7 @@
#if defined(CONFIGURE_SOUNDCARD) && !defined(EXCLUDE_PAS)
#define DEFINE_TRANSLATIONS
#include <i386/isa/sound/pas.h>
#include <i386/isa/sound/pas_defs.h>
static int config_pas_hw __P((struct address_info *hw_config));
static int detect_pas_hw __P((struct address_info *hw_config));

View File

@ -31,7 +31,7 @@
#ifdef CONFIGURE_SOUNDCARD
#include <i386/isa/sound/pas.h>
#include <i386/isa/sound/pas_defs.h>
#if !defined(EXCLUDE_PAS) && !defined(EXCLUDE_MIDI) && defined(EXCLUDE_PRO_MIDI)

View File

@ -33,7 +33,7 @@
#if defined(CONFIGURE_SOUNDCARD) && !defined(EXCLUDE_PAS)
#include <i386/isa/sound/pas.h>
#include <i386/isa/sound/pas_defs.h>
extern void mix_write __P((unsigned char data, int ioaddr));
static int pas_mixer_ioctl __P((int dev, unsigned int cmd, unsigned int arg));

View File

@ -32,7 +32,7 @@
#ifdef CONFIGURE_SOUNDCARD
#include <i386/isa/sound/pas.h>
#include <i386/isa/sound/pas_defs.h>
static int pcm_set_bits __P((int arg));
static int pcm_set_channels __P((int arg));

View File

@ -35,7 +35,7 @@
* #define DEB_DMARES
*/
#include <i386/isa/sound/sound_config.h>
#include <i386/isa/sound/sb.h>
#include <i386/isa/sound/sb_defs.h>
#include <i386/isa/sound/sb_mixer.h>
#if defined(CONFIGURE_SOUNDCARD) && !defined(EXCLUDE_SB16) && !defined(EXCLUDE_SB) && !defined(EXCLUDE_AUDIO) && !defined(EXCLUDE_SBPRO)

View File

@ -33,7 +33,7 @@
#if !defined(EXCLUDE_SB) && !defined(EXCLUDE_SB16) && !defined(EXCLUDE_MIDI)
#include <i386/isa/sound/sb.h>
#include <i386/isa/sound/sb_defs.h>
#ifdef PC98
#define DATAPORT (sb16midi_base)

View File

@ -37,7 +37,7 @@
#if defined(CONFIGURE_SOUNDCARD) && !defined(EXCLUDE_SB)
#include <i386/isa/sound/sb.h>
#include <i386/isa/sound/sb_defs.h>
#include <i386/isa/sound/sb_mixer.h>
#undef SB_TEST_IRQ

View File

@ -31,7 +31,7 @@
#if defined(CONFIGURE_SOUNDCARD) && !defined(EXCLUDE_SB) && !defined(EXCLUDE_MIDI)
#include <i386/isa/sound/sb.h>
#include <i386/isa/sound/sb_defs.h>
#undef SB_TEST_IRQ
/*

View File

@ -37,7 +37,7 @@
#if defined(CONFIGURE_SOUNDCARD) && !defined(EXCLUDE_SB) && !defined(EXCLUDE_SBPRO)
#define __SB_MIXER_C__
#include <i386/isa/sound/sb.h>
#include <i386/isa/sound/sb_defs.h>
#include <i386/isa/sound/sb_mixer.h>
#undef SB_TEST_IRQ