diff options
author | Ralf Baechle <ralf@linux-mips.org> | 1997-04-29 21:13:14 +0000 |
---|---|---|
committer | <ralf@linux-mips.org> | 1997-04-29 21:13:14 +0000 |
commit | 19c9bba94152148523ba0f7ef7cffe3d45656b11 (patch) | |
tree | 40b1cb534496a7f1ca0f5c314a523c69f1fee464 /drivers/sound/os.h | |
parent | 7206675c40394c78a90e74812bbdbf8cf3cca1be (diff) |
Import of Linux/MIPS 2.1.36
Diffstat (limited to 'drivers/sound/os.h')
-rw-r--r-- | drivers/sound/os.h | 38 |
1 files changed, 23 insertions, 15 deletions
diff --git a/drivers/sound/os.h b/drivers/sound/os.h index d07f6735c..4ab565960 100644 --- a/drivers/sound/os.h +++ b/drivers/sound/os.h @@ -1,4 +1,8 @@ +#ifdef __alpha__ +#else +#endif + #define ALLOW_SELECT #undef NO_INLINE_ASM #define SHORT_BANNERS @@ -16,36 +20,36 @@ #define LINUX21X #endif -#include <linux/param.h> -#include <linux/types.h> -#include <linux/errno.h> -#include <linux/signal.h> -#include <linux/fcntl.h> -#include <linux/sched.h> -#include <linux/ctype.h> -#include <asm/io.h> -#include <asm/segment.h> -#include <asm/system.h> +#include <linux/utsname.h> +#include <linux/string.h> +#include <linux/fs.h> #include <asm/dma.h> -#include <linux/wait.h> +#include <asm/param.h> +#include <linux/ptrace.h> +#include <linux/sched.h> #include <linux/malloc.h> +#include <linux/ioport.h> +#include <asm/page.h> +#include <asm/system.h> +#ifdef __alpha__ +#include <asm/segment.h> +#endif #include <linux/vmalloc.h> #include <asm/uaccess.h> -#include <linux/string.h> -#include <linux/ioport.h> -#include <linux/utsname.h> +#include <linux/poll.h> #include <linux/wrapper.h> #include <linux/soundcard.h> + #define FALSE 0 #define TRUE 1 struct snd_wait { - int opts; + volatile int opts; }; extern int sound_alloc_dma(int chn, char *deviceID); @@ -54,10 +58,14 @@ extern void sound_free_dma(int chn); extern void sound_close_dma(int chn); #define RUNTIME_DMA_ALLOC +#define USE_AUTOINIT_DMA extern caddr_t sound_mem_blocks[1024]; +extern int sound_mem_sizes[1024]; extern int sound_nblocks; + + #undef PSEUDO_DMA_AUTOINIT #define ALLOW_BUFFER_MAPPING |