diff options
author | Ralf Baechle <ralf@linux-mips.org> | 1998-03-17 22:05:47 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 1998-03-17 22:05:47 +0000 |
commit | 27cfca1ec98e91261b1a5355d10a8996464b63af (patch) | |
tree | 8e895a53e372fa682b4c0a585b9377d67ed70d0e /drivers/sound/sound_config.h | |
parent | 6a76fb7214c477ccf6582bd79c5b4ccc4f9c41b1 (diff) |
Look Ma' what I found on my harddisk ...
o New faster syscalls for 2.1.x, too
o Upgrade to 2.1.89.
Don't try to run this. It's flaky as hell. But feel free to debug ...
Diffstat (limited to 'drivers/sound/sound_config.h')
-rw-r--r-- | drivers/sound/sound_config.h | 54 |
1 files changed, 28 insertions, 26 deletions
diff --git a/drivers/sound/sound_config.h b/drivers/sound/sound_config.h index 9ca2f3d8a..d158a48ff 100644 --- a/drivers/sound/sound_config.h +++ b/drivers/sound/sound_config.h @@ -10,17 +10,14 @@ * for more info. */ - +#include <linux/fs.h> #include "local.h.master" - +#include <linux/config.h> #include "os.h" #include "soundvers.h" - - - #ifndef SND_DEFAULT_ENABLE #define SND_DEFAULT_ENABLE 1 #endif @@ -43,20 +40,20 @@ #define FM_MONO 0x388 /* This is the I/O address used by AdLib */ -#ifndef PAS_BASE -#define PAS_BASE 0x388 +#ifndef CONFIG_PAS_BASE +#define CONFIG_PAS_BASE 0x388 #endif -#if defined(SB16_DMA) && !defined(SB_DMA2) -# define SB_DMA2 SB16_DMA +#if defined(CONFIG_SB16_DMA) && !defined(CONFIG_SB_DMA2) +# define CONFIG_SB_DMA2 CONFIG_SB16_DMA #endif -#if defined(SB16MIDI_BASE) && !defined(SB_MPU_BASE) -# define SB_MPU_BASE SB16MIDI_BASE +#if defined(SB16MIDI_BASE) && !defined(CONFIG_SB_MPU_BASE) +# define CONFIG_SB_MPU_BASE SB16MIDI_BASE #endif -#ifndef SB_MPU_IRQ -# define SB_MPU_IRQ SBC_IRQ +#ifndef CONFIG_SB_MPU_IRQ +# define CONFIG_SB_MPU_IRQ CONFIG_SB_IRQ #endif /* SEQ_MAX_QUEUE is the maximum number of sequencer events buffered by the @@ -91,21 +88,12 @@ #define DSP_DEFAULT_SPEED 8000 -#define ON 1 -#define OFF 0 - #define MAX_AUDIO_DEV 5 #define MAX_MIXER_DEV 5 #define MAX_SYNTH_DEV 5 #define MAX_MIDI_DEV 6 #define MAX_TIMER_DEV 4 -struct fileinfo { - int mode; /* Open mode */ - int flags; - int dummy; /* Reference to file-flags. OS-dependent. */ - }; - struct address_info { int io_base; int irq; @@ -154,6 +142,24 @@ struct channel_info { #define OPEN_WRITE PCM_ENABLE_OUTPUT #define OPEN_READWRITE (OPEN_READ|OPEN_WRITE) +#if OPEN_READ == FMODE_READ && OPEN_WRITE == FMODE_WRITE + +extern __inline__ int translate_mode(struct file *file) +{ + return file->f_mode; +} + +#else + +extern __inline__ int translate_mode(struct file *file) +{ + return ((file->f_mode & FMODE_READ) ? OPEN_READ : 0) | + ((file->f_mode & FMODE_WRITE) ? OPEN_WRITE : 0); +} + +#endif + + #include "sound_calls.h" #include "dev_table.h" @@ -175,7 +181,3 @@ struct channel_info { #define TIMER_ARMED 121234 #define TIMER_NOT_ARMED 1 - - - - |