patch-2.1.94 linux/drivers/sound/audio.c

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

diff -u --recursive --new-file v2.1.93/linux/drivers/sound/audio.c linux/drivers/sound/audio.c
@@ -21,6 +21,7 @@
 
 #include <linux/config.h>
 #include <linux/stddef.h>
+#include <linux/kmod.h>
 
 #include "sound_config.h"
 
@@ -164,8 +165,6 @@
 	DMAbuf_release(dev, mode);
 }
 
-#if defined(NO_INLINE_ASM) || !defined(i386)
-
 static void translate_bytes(const unsigned char *table, unsigned char *buff, int n)
 {
 	unsigned long   i;
@@ -177,24 +176,6 @@
 		buff[i] = table[buff[i]];
 }
 
-#else
-extern inline void
-translate_bytes(const void *table, void *buff, int n)
-{
-	if (n > 0)
-	{
-		__asm__("cld\n"
-			"1:\tlodsb\n\t"
-			"xlatb\n\t"
-			"stosb\n\t"
-		"loop 1b\n\t":
-		:	  "b"((long) table), "c"(n), "D"((long) buff), "S"((long) buff)
-		:	  "bx", "cx", "di", "si", "ax");
-	}
-}
-
-#endif
-
 int audio_write(int dev, struct file *file, const char *buf, int count)
 {
 	int c, p, l, buf_size;
@@ -827,8 +808,10 @@
 				DMAbuf_launch_output(dev, dmap_out);
 			}
 			audio_devs[dev]->enable_bits = bits;
+#if 0
 			if (changed && audio_devs[dev]->d->trigger)
 				audio_devs[dev]->d->trigger(dev, bits * audio_devs[dev]->go);
+#endif				
 			restore_flags(flags);
 			/* Falls through... */
 

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