patch-2.2.11 linux/drivers/sound/trix.c

• Lines: 34
• Date: Mon Aug 9 12:04:40 1999
• Orig file: v2.2.10/linux/drivers/sound/trix.c
• Orig date: Sun Mar 7 15:22:06 1999

diff -u --recursive --new-file v2.2.10/linux/drivers/sound/trix.c linux/drivers/sound/trix.c
@@ -42,6 +42,12 @@
 
 static int mpu = 0;
 
+#ifdef TRIX_JOYSTICK
+static int joystick=1;
+#else
+static int joystick=0;
+#endif
+
 static unsigned char trix_read(int addr)
 {
 	outb(((unsigned char) addr), 0x390);	/* MT-0002-PC ASIC address */
@@ -196,9 +202,8 @@
 
 	if (ret)
 	{
-#ifdef TRIX_ENABLE_JOYSTICK
-		trix_write(0x15, 0x80);
-#endif
+		if(joystick==1)
+			trix_write(0x15, 0x80);
 		request_region(0x390, 2, "AudioTrix");
 	}
 	return ret;
@@ -477,7 +482,7 @@
 MODULE_PARM(sb_irq,"i");
 MODULE_PARM(mpu_io,"i");
 MODULE_PARM(mpu_irq,"i");
-
+MODULE_PARM(joystick, "i");
 struct address_info config;
 struct address_info sb_config;
 struct address_info mpu_config;