patch-2.1.28 linux/drivers/sound/os.h

• Lines: 75
• Date: Wed Feb 26 02:34:51 1997
• Orig file: v2.1.27/linux/drivers/sound/os.h
• Orig date: Fri Nov 15 00:14:57 1996

diff -u --recursive --new-file v2.1.27/linux/drivers/sound/os.h linux/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,9 +58,13 @@
 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