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

Next file: linux/drivers/sound/pas2_midi.c
Previous file: linux/drivers/sound/opl3.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.12/linux/drivers/sound/os.h linux/drivers/sound/os.h
@@ -1,3 +1,9 @@
+
+#define ALLOW_SELECT
+#undef NO_INLINE_ASM
+#define SHORT_BANNERS
+#define MANUAL_PNP
+
 #ifdef MODULE
 #define __NO_VERSION__
 #include <linux/module.h>
@@ -6,6 +12,9 @@
 #include <linux/modversions.h>
 #endif
 #endif
+#if LINUX_VERSION_CODE > 131328
+#define LINUX21X
+#endif
 
 #include <linux/param.h>
 #include <linux/types.h>
@@ -15,12 +24,13 @@
 #include <linux/sched.h>
 #include <linux/ctype.h>
 #include <asm/io.h>
-#include <asm/uaccess.h>
+#include <asm/segment.h>
 #include <asm/system.h>
 #include <asm/dma.h>
 #include <linux/wait.h>
 #include <linux/malloc.h>
 #include <linux/vmalloc.h>
+#include <asm/uaccess.h>
 #include <linux/string.h>
 #include <linux/ioport.h>
 #include <linux/utsname.h>
@@ -32,6 +42,8 @@
 #define FALSE	0
 #define TRUE	1
 
+
+
 struct snd_wait {
 	  int opts;
 	};
@@ -41,5 +53,11 @@
 extern void sound_free_dma(int chn);
 extern void sound_close_dma(int chn);
 
+#define RUNTIME_DMA_ALLOC
+
 extern caddr_t sound_mem_blocks[1024];
 extern int sound_nblocks;
+
+#undef PSEUDO_DMA_AUTOINIT
+#define ALLOW_BUFFER_MAPPING
+

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov