patch-2.1.126 linux/drivers/sound/sb_common.c

• Lines: 50
• Date: Sat Oct 17 15:33:46 1998
• Orig file: v2.1.125/linux/drivers/sound/sb_common.c
• Orig date: Thu Sep 17 17:53:37 1998

diff -u --recursive --new-file v2.1.125/linux/drivers/sound/sb_common.c linux/drivers/sound/sb_common.c
@@ -10,7 +10,10 @@
  * Version 2 (June 1991). See the "COPYING" file distributed with this software
  * for more info.
  */
-
+/*
+ * Daniel J. Rodriksson: Modified sbintr to handle 8 and 16 bit interrupts
+ *                       for full duplex support ( only sb16 by now )
+ */
 #include <linux/config.h>
 #include <linux/delay.h>
 #include <asm/init.h>
@@ -140,7 +143,7 @@
 		if (!(src & 3))
 			return;	/* Not a DSP interrupt */
 	}
-	if (devc->intr_active)
+	if (devc->intr_active && (!devc->fullduplex || (src & 0x01)))
 	{
 		switch (devc->irq_mode)
 		{
@@ -165,7 +168,17 @@
 				/* printk(KERN_WARN "Sound Blaster: Unexpected interrupt\n"); */
 				;
 		}
-	}
+    } else if (devc->intr_active_2 && (src & 0x02)) {
+        switch (devc->irq_mode_2)
+        {
+            case IMODE_OUTPUT:
+                DMAbuf_outputintr (devc->dev, 1);
+                break;
+            case IMODE_INPUT:
+                DMAbuf_inputintr (devc->dev);
+                break;
+        }
+    }
 	/*
 	 * Acknowledge interrupts 
 	 */
@@ -954,8 +967,7 @@
 		if (!(devc->caps & SB_NO_AUDIO && devc->caps & SB_NO_MIDI) && devc->irq > 0)
 		{
 			free_irq(devc->irq, devc);
-			if (devc->my_mixerdev)
-				sound_unload_mixerdev(devc->my_mixerdev);
+			sound_unload_mixerdev(devc->my_mixerdev);
 			/* We don't have to do this bit any more the UART401 is its own
 				master  -- Krzysztof Halasa */
 			/* But we have to do it, if UART401 is not detected */